diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 36 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 12 |
3 files changed, 24 insertions, 34 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dd23505b159c..f06a9f16d661 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -230,6 +230,8 @@ mapAliases ({ docker-machine = throw "'docker-machine' has been removed, because the upstream project was archived"; # Added 2023-12-27 docker-machine-kvm = throw "'docker-machine-kvm' has been removed, because 'docker-machine' was archived upstream and removed"; # Added 2023-12-27 docker-machine-xhyve = throw "'docker-machine-xhyve' has been removed, because 'docker-machine' was archived upstream and removed"; # Added 2023-12-27 + dogecoin = throw "'dogecoin' has been removed, as it was broken and unmaintained"; # Added 2024-03-11 + dogecoind = throw "'dogecoind' has been removed, as it was broken and unmaintained"; # Added 2024-03-11 dolphin-emu-beta = dolphin-emu; # Added 2023-02-11 dolphinEmu = dolphin-emu; # Added 2021-11-10 dolphinEmuMaster = dolphin-emu-beta; # Added 2021-11-10 @@ -447,6 +449,7 @@ mapAliases ({ gr-rds = throw "'gr-rds' has been renamed to/replaced by 'gnuradio3_7.pkgs.rds'"; # Converted to throw 2023-09-10 grub2_full = grub2; # Added 2022-11-18 grub = throw "grub1 was removed after not being maintained upstream for a decade. Please switch to another bootloader"; # Added 2023-04-11 + gtkcord4 = dissent; # Added 2024-03-10 guile-disarchive = disarchive; # Added 2023-10-27 guile-lint = throw "'guile-lint' has been removed, please use 'guild lint' instead"; # Added 2023-10-16 @@ -909,11 +912,12 @@ mapAliases ({ # soon: throw "'pinentry' has been removed. Pick an appropriate variant like 'pinentry-curses' or 'pinentry-gnome3'"; pinentry = pinentry-all // { curses = pinentry-curses; + emacs = pinentry-emacs; + gnome3 = pinentry-gnome3; gtk2 = pinentry-gtk2; - gnome2 = pinentry-gnome3; qt = pinentry-qt; - emacs = pinentry-emacs; - flavors = [ "curses" "gtk2" "gnome2" "qt" "emacs" ]; + tty = pinentry-tty; + flavors = [ "curses" "emacs" "gnome3" "gtk2" "qt" "tty" ]; }; # added 2024-01-15 pinentry_curses = throw "'pinentry_curses' has been renamed to/replaced by 'pinentry-curses'"; # Converted to throw 2023-09-10 pinentry_emacs = throw "'pinentry_emacs' has been renamed to/replaced by 'pinentry-emacs'"; # Converted to throw 2023-09-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc891f79c0f5..3b87e9a1271b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -107,7 +107,7 @@ with pkgs; Please be informed that this pseudo-package is not the only part of Nixpkgs that fails to evaluate. You should not evaluate entire Nixpkgs without some special measures to handle failing - packages, like using pkgs/top-level/release-attrpaths.nix. + packages, like using pkgs/top-level/release-attrpaths-superset.nix. ''; tests = callPackages ../test { }; @@ -278,8 +278,6 @@ with pkgs; asitop = pkgs.python3Packages.callPackage ../os-specific/darwin/asitop { }; - asn = callPackage ../applications/networking/asn { }; - asnmap = callPackage ../tools/security/asnmap { }; astrolog = callPackage ../applications/science/astronomy/astrolog { }; @@ -7093,6 +7091,8 @@ with pkgs; certstrap = callPackage ../tools/security/certstrap { }; + cffconvert = python3Packages.toPythonApplication python3Packages.cffconvert; + cfssl = callPackage ../tools/security/cfssl { }; cfs-zen-tweaks = callPackage ../os-specific/linux/cfs-zen-tweaks { }; @@ -9791,9 +9791,7 @@ with pkgs; kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { }; - kube-router = callPackage ../applications/networking/cluster/kube-router { - buildGoModule = buildGo120Module; - }; + kube-router = callPackage ../applications/networking/cluster/kube-router { }; kubedock = callPackage ../development/tools/kubedock { }; @@ -11987,6 +11985,7 @@ with pkgs; pinentry-gtk2 pinentry-gnome3 pinentry-qt + pinentry-tty pinentry-all; pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { @@ -12215,7 +12214,8 @@ with pkgs; prototypejs = callPackage ../development/libraries/prototypejs { }; proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix { - inherit (darwin.apple_sdk.frameworks) Foundation AppKit; + inherit (darwin.apple_sdk_11_0.frameworks) Foundation AppKit; + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; proxychains = callPackage ../tools/networking/proxychains { }; @@ -16748,7 +16748,7 @@ with pkgs; rasm = callPackage ../development/compilers/rasm { }; replibyte = callPackage ../development/tools/database/replibyte { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; rgbds = callPackage ../development/compilers/rgbds { }; @@ -24230,10 +24230,6 @@ with pkgs; prime-server = callPackage ../development/libraries/prime-server { }; - primecount = callPackage ../applications/science/math/primecount { }; - - primesieve = callPackage ../applications/science/math/primesieve { }; - proj = callPackage ../development/libraries/proj { stdenv = if stdenv.cc.isClang then overrideLibcxx llvmPackages_13.stdenv else stdenv; }; @@ -30777,7 +30773,7 @@ with pkgs; dnglab = callPackage ../tools/graphics/dnglab { }; inherit (callPackage ../applications/virtualization/docker {}) - docker_20_10 docker_24 docker_25; + docker_24 docker_25; docker = docker_24; docker-client = docker.override { clientOnly = true; }; @@ -31068,8 +31064,6 @@ with pkgs; gspeech = callPackage ../applications/audio/gspeech { }; - gtkcord4 = callPackage ../applications/audio/gtkcord4 { }; - haruna = libsForQt5.callPackage ../applications/video/haruna { }; hdrmerge = libsForQt5.callPackage ../applications/graphics/hdrmerge { }; @@ -33614,8 +33608,6 @@ with pkgs; webkitgtk = webkitgtk_6_0; }; - nicotine-plus = callPackage ../applications/networking/soulseek/nicotine-plus { }; - nice-dcv-client = callPackage ../applications/networking/remote/nice-dcv-client { }; nixos-shell = callPackage ../tools/virtualization/nixos-shell { }; @@ -35784,6 +35776,7 @@ with pkgs; virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome2) libIDL; + jdk = openjdk17; }; virtualboxKvm = lowPrio (virtualbox.override { @@ -36216,8 +36209,6 @@ with pkgs; xdg-desktop-portal-xapp = callPackage ../development/libraries/xdg-desktop-portal-xapp { }; - xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { }; - xdg-utils = callPackage ../tools/X11/xdg-utils {}; xdgmenumaker = callPackage ../applications/misc/xdgmenumaker { }; @@ -36607,13 +36598,6 @@ with pkgs; buildGoModule = buildGo120Module; }; - dogecoin = libsForQt5.callPackage ../applications/blockchains/dogecoin { - withGui = true; - }; - dogecoind = callPackage ../applications/blockchains/dogecoin { - withGui = false; - }; - eclair = callPackage ../applications/blockchains/eclair { }; electrs = callPackage ../applications/blockchains/electrs { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2fed59c03d0e..545fe4a7dae3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1987,6 +1987,8 @@ self: super: with self; { cf-xarray = callPackage ../development/python-modules/cf-xarray { }; + cffconvert = callPackage ../development/python-modules/cffconvert { }; + cffi = callPackage ../development/python-modules/cffi { }; cffsubr = callPackage ../development/python-modules/cffsubr { }; @@ -4937,6 +4939,8 @@ self: super: with self; { gpsoauth = callPackage ../development/python-modules/gpsoauth { }; + gpuctypes = callPackage ../development/python-modules/gpuctypes { }; + gpustat = callPackage ../development/python-modules/gpustat { }; gpxpy = callPackage ../development/python-modules/gpxpy { }; @@ -11171,10 +11175,6 @@ self: super: with self; { pyomo = callPackage ../development/python-modules/pyomo { }; - pyp = callPackage ../development/python-modules/pyp { - inherit (pkgs) jq; - }; - pypng = callPackage ../development/python-modules/pypng { }; phonemizer = callPackage ../development/python-modules/phonemizer { }; @@ -11323,7 +11323,7 @@ self: super: with self; { pyqt6-sip = callPackage ../development/python-modules/pyqt/pyqt6-sip.nix { }; - pyqt6-webengine = callPackage ../development/python-modules/pyqt6-webengine.nix { }; + pyqt6-webengine = callPackage ../development/python-modules/pyqt6-webengine { }; pyqt3d = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt3d { inherit (self) buildPythonPackage pyqt5 pyqt-builder python pythonOlder @@ -14765,6 +14765,8 @@ self: super: with self; { tinydb = callPackage ../development/python-modules/tinydb { }; + tinygrad = callPackage ../development/python-modules/tinygrad { }; + tinyobjloader-py = callPackage ../development/python-modules/tinyobjloader-py { }; tinyrecord = callPackage ../development/python-modules/tinyrecord { }; |