diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 56 | ||||
| -rw-r--r-- | pkgs/top-level/php-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 8 |
4 files changed, 25 insertions, 45 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b62a6c88843e..48ce54528611 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -705,7 +705,7 @@ mapAliases ({ ### N ### ncdu_2 = ncdu; # Added 2022-07-22 - + nestopia = throw "nestopia was forked; use nestopia-ue instead"; # Added 2024-01-24 net_snmp = throw "'net_snmp' has been renamed to/replaced by 'net-snmp'"; # Converted to throw 2023-09-10 netbox_3_3 = throw "netbox 3.3 series has been removed as it was EOL"; # Added 2023-09-02 netbox_3_5 = throw "netbox 3.5 series has been removed as it was EOL"; # Added 2024-01-22 @@ -789,6 +789,7 @@ mapAliases ({ openmpt123 = libopenmpt; # Added 2021-09-05 openssl_3_0 = openssl_3; # Added 2022-06-27 openvpn_24 = throw "openvpn_24 has been removed, because it went EOL. 2.5.x or newer is still available"; # Added 2023-01-23 + optparse-bash = throw "'optparse-bash' (GitHub: nk412/optparse) has been removed. Use 'argparse' instead"; # Added 2024-01-12 orchis = orchis-theme; # Added 2021-06-09 oni2 = throw "oni2 was removed, because it is unmaintained and was abandoned years ago."; #Added 2024-01-15 oroborus = throw "oroborus was removed, because it was abandoned years ago."; #Added 2023-09-10 @@ -1149,6 +1150,7 @@ mapAliases ({ xdg_utils = xdg-utils; # Added 2021-02-01 xineLib = xine-lib; # Added 2021-04-27 xineUI = xine-ui; # Added 2021-04-27 + xonsh-unwrapped = throw "'xonsh-unwrapped' was incorporated into xonsh code; call xonsh directly instead."; # Added 2024-01-20 xtrt = throw "xtrt has been removed due to being abandoned"; # Added 2023-05-25 xulrunner = firefox-unwrapped; # Added 2023-11-03 xvfb_run = xvfb-run; # Added 2021-05-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64747f415b8f..c4c173ccab16 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -258,8 +258,6 @@ with pkgs; ariang = callPackage ../servers/ariang { }; - mov-cli = callPackage ../applications/video/mov-cli { }; - ani-cli = callPackage ../applications/video/ani-cli { }; dra-cla = callPackage ../applications/video/dra-cla { }; @@ -744,9 +742,7 @@ with pkgs; inherit (darwin) DarwinTools; }; - mix2nix = callPackage ../development/tools/mix2nix { - elixir = elixir_1_14; - }; + mix2nix = callPackage ../development/tools/mix2nix { }; n98-magerun = callPackage ../development/tools/misc/n98-magerun { }; @@ -2770,8 +2766,6 @@ with pkgs; mupen64plus = callPackage ../applications/emulators/mupen64plus { }; - nestopia = callPackage ../applications/emulators/nestopia { }; - np2kai = callPackage ../applications/emulators/np2kai { }; nuked-md = callPackage ../applications/emulators/nuked-md { }; @@ -4700,10 +4694,7 @@ with pkgs; cloudbrute = callPackage ../tools/security/cloudbrute { }; - cloudflared = callPackage ../applications/networking/cloudflared { - # https://github.com/cloudflare/cloudflared/issues/1054 - buildGoModule = buildGo120Module; - }; + cloudflared = callPackage ../applications/networking/cloudflared { }; cloudflare-dyndns = callPackage ../applications/networking/cloudflare-dyndns { }; @@ -4945,8 +4936,6 @@ with pkgs; csview = callPackage ../tools/text/csview { }; - csvkit = callPackage ../tools/text/csvkit { }; - csvquote = callPackage ../tools/text/csvquote { }; csvtool = callPackage ../development/ocaml-modules/csv/csvtool.nix { }; @@ -5608,9 +5597,7 @@ with pkgs; gscan2pdf = callPackage ../applications/graphics/gscan2pdf { }; - gsctl = callPackage ../applications/misc/gsctl { - buildGoModule = buildGo119Module; # go 1.20 build failure - }; + gsctl = callPackage ../applications/misc/gsctl { }; gsocket = callPackage ../tools/networking/gsocket { }; @@ -7059,10 +7046,7 @@ with pkgs; m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { }; - mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { - stdenv = clangStdenv; - protobuf = pkgs.protobuf_21.overrideDerivation (_: { stdenv = clangStdenv; }); - }; + mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { }; openbangla-keyboard = libsForQt5.callPackage ../applications/misc/openbangla-keyboard { withIbusSupport = true; }; @@ -7798,7 +7782,11 @@ with pkgs; stratis-cli = callPackage ../tools/filesystems/stratis-cli { }; - strawberry = libsForQt5.callPackage ../applications/audio/strawberry { }; + strawberry-qt5 = libsForQt5.callPackage ../applications/audio/strawberry { }; + + strawberry-qt6 = qt6Packages.callPackage ../applications/audio/strawberry { }; + + strawberry = strawberry-qt5; schleuder = callPackage ../tools/security/schleuder { }; @@ -8251,8 +8239,6 @@ with pkgs; faraday-cli = callPackage ../tools/security/faraday-cli { }; - farge = callPackage ../tools/misc/farge { }; - fastlane = callPackage ../tools/admin/fastlane { }; fatresize = callPackage ../tools/filesystems/fatresize { }; @@ -10816,7 +10802,7 @@ with pkgs; memtest86plus = callPackage ../tools/misc/memtest86+ { }; - mbutil = python3Packages.callPackage ../applications/misc/mbutil { }; + mbutil = python310Packages.callPackage ../applications/misc/mbutil { }; mcabber = callPackage ../applications/networking/instant-messengers/mcabber { }; @@ -11605,6 +11591,8 @@ with pkgs; openresolv = callPackage ../tools/networking/openresolv { }; + openrefine = callPackage ../applications/science/misc/openrefine { jdk = jdk17; }; + openrgb = libsForQt5.callPackage ../applications/misc/openrgb { }; openrgb-with-all-plugins = openrgb.withPlugins [ @@ -13324,8 +13312,6 @@ with pkgs; snmpcheck = callPackage ../tools/networking/snmpcheck { }; - sniffglue = callPackage ../tools/networking/sniffglue { }; - snobol4 = callPackage ../development/interpreters/snobol4 { }; snort = callPackage ../applications/networking/ids/snort { }; @@ -15141,8 +15127,6 @@ with pkgs; haskellPackages = haskell.packages.ghc810; }; - yj = callPackage ../development/tools/yj { }; - yaydl = callPackage ../tools/video/yaydl { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -15402,9 +15386,6 @@ with pkgs; rush = callPackage ../shells/rush { }; - xonsh = callPackage ../shells/xonsh/wrapper.nix { }; - xonsh-unwrapped = callPackage ../shells/xonsh { }; - zsh = callPackage ../shells/zsh { }; nix-zsh-completions = callPackage ../shells/zsh/nix-zsh-completions { }; @@ -20881,7 +20862,7 @@ with pkgs; crocoddyl = callPackage ../development/libraries/crocoddyl { }; - crossguid = pin-to-gcc12-if-gcc13 (callPackage ../development/libraries/crossguid { }); + crossguid = callPackage ../development/libraries/crossguid { }; cryptopp = callPackage ../development/libraries/crypto++ { }; @@ -24348,8 +24329,6 @@ with pkgs; buildPythonPackage buildPythonApplication setuptools pycsdr pydigiham; }; - optparse-bash = callPackage ../development/libraries/optparse-bash { }; - oras = callPackage ../development/tools/oras { }; orcania = callPackage ../development/libraries/orcania { }; @@ -25231,8 +25210,6 @@ with pkgs; tdlib = callPackage ../development/libraries/tdlib { }; - tecla = callPackage ../development/libraries/tecla { }; - tectonic = callPackage ../tools/typesetting/tectonic/wrapper.nix { }; tectonic-unwrapped = callPackage ../tools/typesetting/tectonic { @@ -28765,6 +28742,7 @@ with pkgs; ubootOdroidC2 ubootOdroidXU3 ubootOlimexA64Olinuxino + ubootOlimexA64Teres1 ubootOrangePi3 ubootOrangePiPc ubootOrangePiZeroPlus2H5 @@ -28997,8 +28975,6 @@ with pkgs; bakoma_ttf = callPackage ../data/fonts/bakoma-ttf { }; - banana-cursor = callPackage ../data/icons/banana-cursor { }; - barlow = callPackage ../data/fonts/barlow { }; base16-schemes = callPackage ../data/themes/base16-schemes { }; @@ -41999,9 +41975,7 @@ with pkgs; yazi = callPackage ../applications/file-managers/yazi { inherit (darwin.apple_sdk.frameworks) Foundation; }; - ssl-proxy = callPackage ../tools/networking/ssl-proxy { - buildGoModule = buildGo119Module; # build fails with 1.20 - }; + ssl-proxy = callPackage ../tools/networking/ssl-proxy { }; code-maat = callPackage ../development/tools/code-maat {}; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index c3ff83d20c83..345ed56b95e7 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -343,6 +343,8 @@ lib.makeScope pkgs.newScope (self: with self; { xdebug = callPackage ../development/php-packages/xdebug { }; yaml = callPackage ../development/php-packages/yaml { }; + + zstd = callPackage ../development/php-packages/zstd { }; } // lib.optionalAttrs config.allowAliases { php-spx = throw "php-spx is deprecated, use spx instead"; } // ( diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d39b8ccd751f..ea3544c6d20b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8182,6 +8182,8 @@ self: super: with self; { name-that-hash = callPackage ../development/python-modules/name-that-hash { }; + nameko = callPackage ../development/python-modules/nameko { }; + nampa = callPackage ../development/python-modules/nampa { }; nanoid = callPackage ../development/python-modules/nanoid { }; @@ -10428,6 +10430,8 @@ self: super: with self; { pyemd = callPackage ../development/python-modules/pyemd { }; + pyemvue = callPackage ../development/python-modules/pyemvue { }; + pyenchant = callPackage ../development/python-modules/pyenchant { inherit (pkgs) enchant2; }; @@ -16324,9 +16328,7 @@ self: super: with self; { inherit (pkgs) graphviz; }; - xformers = callPackage ../development/python-modules/xformers { - openai-triton = self.openai-triton-cuda; - }; + xformers = callPackage ../development/python-modules/xformers { }; xgboost = callPackage ../development/python-modules/xgboost { inherit (pkgs) xgboost; |