From 5a8816103218d3ced3e2b4b22bb49fba9d811afe Mon Sep 17 00:00:00 2001 From: Thomas Gebert Date: Sat, 21 Dec 2024 20:29:11 -0500 Subject: [PATCH] bigpemu: init at 1.17 --- pkgs/by-name/bi/bigpemu/package.nix | 13 +++-- pkgs/top-level/all-packages.nix | 79 ++++++++++++++--------------- 2 files changed, 45 insertions(+), 47 deletions(-) diff --git a/pkgs/by-name/bi/bigpemu/package.nix b/pkgs/by-name/bi/bigpemu/package.nix index 7d7ad20e4dcfa..eb90ea8a654f9 100644 --- a/pkgs/by-name/bi/bigpemu/package.nix +++ b/pkgs/by-name/bi/bigpemu/package.nix @@ -6,7 +6,7 @@ glui, libGLU, libGL, - buildFHSUserEnv, + buildFHSEnv, }: let @@ -40,17 +40,20 @@ let dontPatchELF = true; - meta = with lib; { + meta = { description = "Atari Jaguar Emulator (BigPEmu) by Richard Whitehouse"; homepage = "https://www.richwhitehouse.com/jaguar/index.php"; - license = licenses.unfree; - maintainers = [ maintainers.tombert ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ + tombert + hughobrien + ]; platforms = [ "x86_64-linux" ]; }; }; in -buildFHSUserEnv { +buildFHSEnv { name = "bigpemu"; targetPkgs = pkgs: [ SDL2 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40e1d074a5c4f..27d706ce16a6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -925,7 +925,6 @@ with pkgs; }; aegisub = callPackage ../by-name/ae/aegisub/package.nix ({ - boost = boost179; luajit = luajit.override { enable52Compat = true; }; wxGTK = wxGTK32; } // (config.aegisub or {})); @@ -1440,9 +1439,6 @@ with pkgs; winetricks = callPackage ../applications/emulators/wine/winetricks.nix { }; - bigpemu = callPackage ../by-name/bi/bigpemu/package.nix { - buildFHSUserEnv = buildFHSEnv; - }; zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { }; zsnes2 = pkgsi686Linux.callPackage ../applications/emulators/zsnes/2.x.nix { }; @@ -1665,10 +1661,6 @@ with pkgs; inherit (callPackages ../data/fonts/arphic {}) arphic-ukai arphic-uming; - asciinema-agg = callPackage ../tools/misc/asciinema-agg { - inherit (darwin.apple_sdk.frameworks) Security; - }; - asymptote = libsForQt5.callPackage ../tools/graphics/asymptote { }; atomicparsley = callPackage ../tools/video/atomicparsley { @@ -2157,8 +2149,6 @@ with pkgs; clingcon = callPackage ../applications/science/logic/potassco/clingcon.nix { }; - clprover = callPackage ../applications/science/logic/clprover/clprover.nix { }; - coloredlogs = with python3Packages; toPythonApplication coloredlogs; czkawka-full = czkawka.wrapper.override { @@ -2293,17 +2283,7 @@ with pkgs; electronplayer = callPackage ../applications/video/electronplayer/electronplayer.nix { }; - element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { - inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; - }; - element-desktop-wayland = writeScriptBin "element-desktop" '' - #!/bin/sh - NIXOS_OZONE_WL=1 exec ${element-desktop}/bin/element-desktop "$@" - ''; - - element-web-unwrapped = callPackage ../applications/networking/instant-messengers/element/element-web.nix { }; - - element-web = callPackage ../applications/networking/instant-messengers/element/element-web-wrapper.nix { + element-web = callPackage ../by-name/el/element-web/package.nix { conf = config.element-web.conf or { }; }; @@ -2610,8 +2590,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit Security; }; - odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter { }; - pastel = callPackage ../applications/misc/pastel { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -3527,7 +3505,7 @@ with pkgs; }; dapl-native = callPackage ../development/interpreters/dzaima-apl { buildNativeImage = true; - jdk = graalvm-ce; + jdk = graalvmPackages.graalvm-ce; }; gnucap-full = gnucap.withPlugins(p: [ p.verilog ]); @@ -3807,8 +3785,6 @@ with pkgs; iaito = libsForQt5.callPackage ../tools/security/iaito { }; - jamulus = libsForQt5.callPackage ../applications/audio/jamulus { }; - icemon = libsForQt5.callPackage ../applications/networking/icemon { }; icepeak = haskell.lib.compose.justStaticExecutables haskellPackages.icepeak; @@ -6524,10 +6500,9 @@ with pkgs; openjdk = jdk; openjdk_headless = jdk_headless; - graalvmCEPackages = recurseIntoAttrs (callPackage ../development/compilers/graalvm/community-edition { }); - graalvm-ce = graalvmCEPackages.graalvm-ce; + graalvmPackages = recurseIntoAttrs (callPackage ../development/compilers/graalvm { }); buildGraalvmNativeImage = (callPackage ../build-support/build-graalvm-native-image { - graalvmDrv = graalvm-ce; + graalvmDrv = graalvmPackages.graalvm-ce; }).override; openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { @@ -7161,7 +7136,7 @@ with pkgs; dbqn-native = dbqn.override { buildNativeImage = true; - jdk = graalvm-ce; + jdk = graalvmPackages.graalvm-ce; }; cliscord = callPackage ../misc/cliscord { @@ -8902,10 +8877,7 @@ with pkgs; dbus-sharp-glib-1_0 = callPackage ../development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix { }; dbus-sharp-glib-2_0 = callPackage ../development/libraries/dbus-sharp-glib { }; - makeDBusConf = { suidHelper, serviceDirectories, apparmor ? "disabled" }: - callPackage ../development/libraries/dbus/make-dbus-conf.nix { - inherit suidHelper serviceDirectories apparmor; - }; + makeDBusConf = callPackage ../development/libraries/dbus/make-dbus-conf.nix { }; dee = callPackage ../development/libraries/dee { autoreconfHook = buildPackages.autoreconfHook269; @@ -11234,6 +11206,11 @@ with pkgs; go = buildPackages.go_1_23; }; + go_1_24 = callPackage ../development/compilers/go/1.24.nix { }; + buildGo124Module = callPackage ../build-support/go/module.nix { + go = buildPackages.go_1_24; + }; + ### DEVELOPMENT / HARE hareHook = callPackage ../by-name/ha/hare/hook.nix { }; @@ -12122,7 +12099,6 @@ with pkgs; tt-rss = callPackage ../servers/tt-rss { }; inherit (callPackages ../servers/web-apps/matomo {}) matomo - matomo_5 matomo-beta; unpackerr = callPackage ../servers/unpackerr { @@ -13949,7 +13925,12 @@ with pkgs; jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix { }; + inherit + ({ + freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix { }; + }) + freeoffice + ; inherit (xorg) xlsfonts; @@ -14185,8 +14166,6 @@ with pkgs; singularity-overriden-nixos ; - slack = callPackage ../applications/networking/instant-messengers/slack { }; - sosreport = python3Packages.callPackage ../applications/logging/sosreport { }; inherit (callPackages ../development/libraries/wlroots {}) @@ -14964,7 +14943,15 @@ with pkgs; smtube = libsForQt5.callPackage ../applications/video/smtube { }; - softmaker-office = callPackage ../applications/office/softmaker/softmaker_office.nix { }; + inherit + ({ + softmaker-office = callPackage ../applications/office/softmaker/softmaker-office.nix { }; + softmaker-office-nx = callPackage ../applications/office/softmaker/softmaker-office-nx.nix { }; + }) + softmaker-office + softmaker-office-nx + ; + synapse-bt = callPackage ../applications/networking/p2p/synapse-bt { inherit (darwin.apple_sdk.frameworks) CoreServices Security; @@ -15046,6 +15033,10 @@ with pkgs; obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {}); wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix { }; + okms-cli = callPackage ../by-name/ok/okms-cli/package.nix { + buildGoModule = buildGo123Module; + }; + omegat = callPackage ../applications/misc/omegat.nix { }; openambit = qt5.callPackage ../applications/misc/openambit { }; @@ -16416,8 +16407,6 @@ with pkgs; pycoin = with python3Packages; toPythonApplication pycoin; - solana-validator = callPackage ../applications/blockchains/solana-validator { }; - snarkos = callPackage ../applications/blockchains/snarkos { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -18752,7 +18741,9 @@ with pkgs; sieveshell = with python3.pkgs; toPythonApplication managesieve; - sunshine = callPackage ../servers/sunshine { }; + sunshine = callPackage ../by-name/su/sunshine/package.nix { + boost = boost185; + }; jami = qt6Packages.callPackage ../applications/networking/instant-messengers/jami { # TODO: remove once `udev` is `systemdMinimal` everywhere. @@ -18829,4 +18820,8 @@ with pkgs; libpostalWithData = callPackage ../by-name/li/libpostal/package.nix { withData = true; }; + + clash-verge-rev = callPackage ../by-name/cl/clash-verge-rev/package.nix { + libsoup = libsoup_3; + }; }