diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 66 |
1 files changed, 38 insertions, 28 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 434d94509ab..16ee7ddc6fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -433,6 +433,10 @@ with pkgs; devour = callPackage ../tools/X11/devour {}; + didyoumean = callPackage ../tools/misc/didyoumean { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; + diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins; dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh; @@ -721,8 +725,8 @@ with pkgs; installShellFiles = callPackage ../build-support/install-shell-files {}; - # See doc/builders/special/invalidateFetcherByDrvHash.section.md or - # https://nixos.org/manual/nixpkgs/unstable/#sec-pkgs-invalidateFetcherByDrvHash + # See doc/builders/testers.chapter.md or + # https://nixos.org/manual/nixpkgs/unstable/#tester-invalidateFetcherByDrvHash invalidateFetcherByDrvHash = f: args: let drvPath = (f args).drvPath; @@ -1436,13 +1440,12 @@ with pkgs; ### APPLICATIONS/EMULATORS/YUZU - yuzu-mainline = import ../applications/emulators/yuzu { + yuzu-mainline = callPackage ../applications/emulators/yuzu { branch = "mainline"; - inherit libsForQt5 fetchFromGitHub; }; - yuzu-ea = import ../applications/emulators/yuzu { + + yuzu-ea = callPackage ../applications/emulators/yuzu { branch = "early-access"; - inherit libsForQt5 fetchFromGitHub; }; ### APPLICATIONS/EMULATORS/COMMANDERX16 @@ -7926,21 +7929,13 @@ with pkgs; libnids = callPackage ../tools/networking/libnids { }; - rakshasa-rtorrent = recurseIntoAttrs - (callPackage ../tools/networking/p2p/rakshasa-rtorrent { - callPackage = newScope pkgs.rakshasa-rtorrent; - }); - - rtorrent = rakshasa-rtorrent.rtorrent; - libtorrent = rakshasa-rtorrent.libtorrent; - - jesec-rtorrent = recurseIntoAttrs - (callPackage ../tools/networking/p2p/jesec-rtorrent { - callPackage = newScope pkgs.jesec-rtorrent; - }); + rtorrent = callPackage ../applications/networking/p2p/rakshasa-rtorrent { + libtorrent = callPackage ../applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix { }; + }; - rtorrent-jesec = jesec-rtorrent.rtorrent; - libtorrent-jesec = jesec-rtorrent.libtorrent; + jesec-rtorrent = callPackage ../applications/networking/p2p/jesec-rtorrent { + libtorrent = callPackage ../applications/networking/p2p/jesec-rtorrent/libtorrent.nix { }; + }; libmpack = callPackage ../development/libraries/libmpack { }; @@ -15804,8 +15799,15 @@ with pkgs; parse-cli-bin = callPackage ../development/tools/parse-cli-bin { }; - patchelf = callPackage ../development/tools/misc/patchelf { }; + patchelf = if with stdenv.buildPlatform; isAarch64 && isMusl then + patchelf_0_13 + else + patchelf_0_14; patchelf_0_9 = callPackage ../development/tools/misc/patchelf/0.9.nix { }; + patchelf_0_13 = callPackage ../development/tools/misc/patchelf/0.13.nix { + patchelf = patchelf_0_14; + }; + patchelf_0_14 = callPackage ../development/tools/misc/patchelf { }; patchelfUnstable = lowPrio (callPackage ../development/tools/misc/patchelf/unstable.nix { }); @@ -16341,8 +16343,6 @@ with pkgs; zydis = callPackage ../development/libraries/zydis { }; - winpdb = callPackage ../development/tools/winpdb { }; - grabserial = callPackage ../development/tools/grabserial { }; mypy = with python3Packages; toPythonApplication mypy; @@ -17729,7 +17729,7 @@ with pkgs; hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { }; - hydra-check = with python3.pkgs; toPythonApplication hydra-check; + hydra-check = with python310.pkgs; toPythonApplication hydra-check; hyena = callPackage ../development/libraries/hyena { }; @@ -20698,8 +20698,6 @@ with pkgs; tclx = callPackage ../development/libraries/tclx { }; - ntdb = callPackage ../development/libraries/ntdb { }; - tdb = callPackage ../development/libraries/tdb {}; tdlib = callPackage ../development/libraries/tdlib { }; @@ -23953,6 +23951,8 @@ with pkgs; comfortaa = callPackage ../data/fonts/comfortaa {}; + comic-mono = callPackage ../data/fonts/comic-mono { }; + comic-neue = callPackage ../data/fonts/comic-neue { }; comic-relief = callPackage ../data/fonts/comic-relief {}; @@ -24131,8 +24131,6 @@ with pkgs; gsettings-desktop-schemas = callPackage ../development/libraries/gsettings-desktop-schemas { }; - gnome-breeze = callPackage ../data/themes/gnome-breeze { }; - gnome-icon-theme = callPackage ../data/icons/gnome-icon-theme { }; go-font = callPackage ../data/fonts/go-font { }; @@ -25841,6 +25839,8 @@ with pkgs; espeakedit = callPackage ../applications/audio/espeak/edit.nix { }; + espeakup = callPackage ../applications/accessibility/espeakup { }; + etebase-server = with python3Packages; toPythonApplication etebase-server; etesync-dav = callPackage ../applications/misc/etesync-dav {}; @@ -31157,8 +31157,16 @@ with pkgs; keeperrl = callPackage ../games/keeperrl { }; + ### GAMES/LGAMES + + barrage = callPackage ../games/lgames/barrage { }; + lbreakout2 = callPackage ../games/lgames/lbreakout2 { }; + lbreakouthd = callPackage ../games/lgames/lbreakouthd { }; + + lpairs2 = callPackage ../games/lgames/lpairs2 { }; + ltris = callPackage ../games/lgames/ltris { }; lunar-client = callPackage ../games/lunar-client { }; @@ -33505,6 +33513,8 @@ with pkgs; acpilight = callPackage ../misc/acpilight { }; + alpnpass = callPackage ../applications/networking/alpnpass { }; + android-file-transfer = libsForQt5.callPackage ../tools/filesystems/android-file-transfer { }; antimicrox = libsForQt5.callPackage ../tools/misc/antimicrox { }; |