diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 16 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 85 | ||||
| -rw-r--r-- | pkgs/top-level/linux-kernels.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/python-aliases.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 34 | ||||
| -rw-r--r-- | pkgs/top-level/release-python.nix | 11 |
7 files changed, 93 insertions, 69 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d12c09c93e90b..18e920573046d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -87,6 +87,7 @@ mapAliases ({ aucdtect = throw "aucdtect: Upstream no longer provides download urls"; # Added 2020-12-26 avldrums-lv2 = x42-avldrums; # Added 2020-03-29 avxsynth = throw "avxsynth was removed because it was broken"; # Added 2021-05-18 + aws-okta = throw "aws-okta is on indefinite hiatus. See https://github.com/segmentio/aws-okta/issues/278"; # Added 2022-04-05; azureus = throw "azureus is now known as vuze and the version in nixpkgs was really outdated"; # Added 2021-08-02 ### B ### @@ -102,6 +103,8 @@ mapAliases ({ bcat = throw "bcat has been removed because upstream is dead"; # Added 2021-08-22 beret = throw "beret has been removed"; # Added 2021-11-16 bin_replace_string = throw "bin_replace_string has been removed: deleted by upstream"; # Added 2022-01-07 + bird2 = bird; # Added 2022-02-21 + bird6 = throw "bird6 was dropped. Use bird instead, which has support for both ipv4/ipv6"; # Added 2022-02-21 bitbucket-cli = throw "bitbucket-cli has been removed: abandoned by upstream"; # Added 2022-03-21 bitsnbots = throw "bitsnbots has been removed because it was broken and upstream missing"; # Added 2021-08-22 blastem = throw "blastem has been removed from nixpkgs as it would still require python2"; # Added 2022-01-01 @@ -112,10 +115,9 @@ mapAliases ({ brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # Added 2021-01-24 bridge_utils = throw "'bridge_utils' has been renamed to/replaced by 'bridge-utils'"; # Converted to throw 2022-02-22 bro = zeek; # Added 2019-09-29 - bird2 = bird; # Added 2022-02-21 - bird6 = throw "bird6 was dropped. Use bird instead, which has support for both ipv4/ipv6"; # Added 2022-02-21 btrfsProgs = throw "'btrfsProgs' has been renamed to/replaced by 'btrfs-progs'"; # Converted to throw 2022-02-22 bud = throw "bud has been removed: abandoned by upstream"; # Added 2022-03-14 + buttersink = throw "buttersink has been removed: abandoned by upstream"; # Added 2022-04-05 # bitwarden_rs renamed to vaultwarden with release 1.21.0 (2021-04-30) bitwarden_rs = vaultwarden; @@ -179,6 +181,7 @@ mapAliases ({ compton-git = throw "'compton-git' has been renamed to/replaced by 'compton'"; # Converted to throw 2022-02-22 concurrencykit = libck; # Added 2021-03 conntrack_tools = throw "'conntrack_tools' has been renamed to/replaced by 'conntrack-tools'"; # Converted to throw 2022-02-22 + container-linux-config-transpiler = throw "container-linux-config-transpiler is deprecated and archived by upstream"; # Added 2022-04-05 cool-old-term = throw "'cool-old-term' has been renamed to/replaced by 'cool-retro-term'"; # Converted to throw 2022-02-22 corsmisc = throw "corsmisc has been removed (upstream is gone)"; # Added 2022-01-24 couchdb = throw "couchdb was removed from nixpkgs, use couchdb3 instead"; # Added 2021-03-03 @@ -474,6 +477,7 @@ mapAliases ({ hal-flash = throw "hal-flash has been removed as Adobe Flash Player is now deprecated"; # Added 2021-02-07 hawkthorne = throw "hawkthorne has been removed because it depended on a broken version of love"; # Added 2022-01-15 + heapster = throw "Heapster is now retired. See https://github.com/kubernetes-retired/heapster/blob/master/docs/deprecation.md"; # Added 2022-04-05 heimdalFull = throw "'heimdalFull' has been renamed to/replaced by 'heimdal'"; # Converted to throw 2022-02-22 heme = throw "heme has been removed: upstream is gone"; # added 2022-02-06 hepmc = hepmc2; # Added 2019-08-05 @@ -504,6 +508,7 @@ mapAliases ({ intecture-agent = throw "intecture-agent has been removed, because it was no longer maintained upstream"; # added 2021-12-15 intecture-auth = throw "intecture-auth has been removed, because it was no longer maintained upstream"; # added 2021-12-15 intecture-cli = throw "intecture-cli has been removed, because it was no longer maintained upstream"; # added 2021-12-15 + interfacer = throw "interfacer is deprecated and archived by upstream"; # Added 2022-04-05 inter-ui = inter; # Added 2021-03-27 iops = throw "iops was removed: upstream is gone"; # Added 2022-02-06 iproute = iproute2; # moved from top-level 2021-03-14 @@ -562,6 +567,8 @@ mapAliases ({ kramdown-rfc2629 = rubyPackages.kramdown-rfc2629; # Added 2021-03-23 krename-qt5 = throw "'krename-qt5' has been renamed to/replaced by 'krename'"; # Converted to throw 2022-02-22 krita-beta = krita; # moved from top-level 2021-12-23 + kube-aws = throw "kube-aws is deprecated and archived by upstream"; # Added 2022-04-05 + kubeless = throw "kubeless is deprecated and archived by upstream"; # Added 2022-04-05 kvm = throw "'kvm' has been renamed to/replaced by 'qemu_kvm'"; # Converted to throw 2022-02-22 ### L ### @@ -971,6 +978,7 @@ mapAliases ({ proglodyte-wasm = throw "proglodyte-wasm has been removed from nixpkgs, because it is unmaintained since 5 years with zero github stars"; # Added 2021-06-30 proj_5 = throw "Proj-5 has been removed from nixpkgs, use proj instead"; # Added 2021-04-12 prometheus-cups-exporter = throw "outdated and broken by design; removed by developer"; # Added 2021-03-16 + prometheus-mesos-exporter = throw "prometheus-mesos-exporter is deprecated and archived by upstream"; # Added 2022-04-05 proxytunnel = throw "proxytunnel has been removed from nixpkgs, because it has not been update upstream since it was added to nixpkgs in 2008 and has therefore bitrotted."; # added 2021-12-15 pulseaudioLight = throw "'pulseaudioLight' has been renamed to/replaced by 'pulseaudio'"; # Converted to throw 2022-02-22 pulseeffects = throw "Use pulseeffects-legacy if you use PulseAudio and easyeffects if you use PipeWire"; # Added 2021-02-13 @@ -1157,6 +1165,7 @@ mapAliases ({ tahoelafs = throw "'tahoelafs' has been renamed to/replaced by 'tahoe-lafs'"; # Converted to throw 2022-02-22 tangogps = foxtrotgps; # Added 2020-01-26 tdm = throw "tdm has been removed because nobody can figure out how to fix OpenAL integration. Use precompiled binary and `steam-run` instead"; + teleconsole = throw "teleconsole is archived by upstream"; # Added 2022-04-05 telepathy-qt = throw "telepathy-qt no longer supports Qt 4. Please use libsForQt5.telepathy instead"; # Added 2020-07-02 telepathy_farstream = throw "'telepathy_farstream' has been renamed to/replaced by 'telepathy-farstream'"; # Converted to throw 2022-02-22 telepathy_gabble = throw "'telepathy_gabble' has been renamed to/replaced by 'telepathy-gabble'"; # Converted to throw 2022-02-22 @@ -1401,6 +1410,9 @@ mapAliases ({ targetLlvmLibraries = targetPackages.llvmPackages_git.libraries; }); + # Added 2022-01-28 + zeroc-ice-36 = throw "Unmaintained, doesn't build w/glibc-2.34"; + /* If these are in the scope of all-packages.nix, they cause collisions between mixed versions of qt. See: https://github.com/NixOS/nixpkgs/pull/101369 */ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4558c4612c598..52a898518b1f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -201,6 +201,8 @@ with pkgs; aesfix = callPackage ../tools/security/aesfix { }; + aeskeyfind = callPackage ../tools/security/aeskeyfind { }; + astrolog = callPackage ../applications/science/astronomy/astrolog { }; atkinson-hyperlegible = callPackage ../data/fonts/atkinson-hyperlegible { }; @@ -670,9 +672,9 @@ with pkgs; }; nghttp2 = buildPackages.nghttp2.override { fetchurl = stdenv.fetchurlBoot; - inherit zlib pkg-config openssl; - c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; }; - libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; }; + inherit pkg-config; + enableApp = false; # curl just needs libnghttp2 + enableTests = false; # avoids bringing `cunit` and `tzdata` into scope }; }); }; @@ -1541,8 +1543,6 @@ with pkgs; aws-nuke = callPackage ../tools/admin/aws-nuke { }; - aws-okta = callPackage ../tools/security/aws-okta { }; - aws-rotate-key = callPackage ../tools/admin/aws-rotate-key { }; aws-sam-cli = callPackage ../development/tools/aws-sam-cli { }; @@ -1723,8 +1723,6 @@ with pkgs; codeql = callPackage ../development/tools/analysis/codeql { }; - container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { }; - fedora-backgrounds = callPackage ../data/misc/fedora-backgrounds { }; ccextractor = callPackage ../applications/video/ccextractor { }; @@ -2482,8 +2480,6 @@ with pkgs; bustle = haskellPackages.bustle; - buttersink = callPackage ../tools/filesystems/buttersink { }; - bwm_ng = callPackage ../tools/networking/bwm-ng { }; bwbasic = callPackage ../development/interpreters/bwbasic { }; @@ -9077,6 +9073,10 @@ with pkgs; pleroma = callPackage ../servers/pleroma { }; + plfit = callPackage ../tools/misc/plfit { + python = null; + }; + ploticus = callPackage ../tools/graphics/ploticus { libpng = libpng12; }; @@ -10425,8 +10425,6 @@ with pkgs; teamviewer = libsForQt515.callPackage ../applications/networking/remote/teamviewer { }; - teleconsole = callPackage ../tools/misc/teleconsole { }; - telegraf = callPackage ../servers/monitoring/telegraf { }; teleport = callPackage ../servers/teleport {}; @@ -11211,7 +11209,9 @@ with pkgs; }; unbound-full = unbound.override { + python = python3; withSystemd = true; + withPythonModule = true; withDoH = true; withECS = true; withDNSCrypt = true; @@ -13287,18 +13287,18 @@ with pkgs; inherit (darwin) apple_sdk; }; - rust_1_58 = callPackage ../development/compilers/rust/1_58.nix { + rust_1_59 = callPackage ../development/compilers/rust/1_59.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; llvm_13 = llvmPackages_13.libllvm; }; - rust = rust_1_58; + rust = rust_1_59; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { }; - rustPackages_1_58 = rust_1_58.packages.stable; - rustPackages = rustPackages_1_58; + rustPackages_1_59 = rust_1_59.packages.stable; + rustPackages = rustPackages_1_59; inherit (rustPackages) cargo clippy rustc rustPlatform; @@ -15362,8 +15362,6 @@ with pkgs; krew = callPackage ../development/tools/krew { }; - kube-aws = callPackage ../development/tools/kube-aws { }; - kube-hunter = callPackage ../tools/security/kube-hunter { }; kubeaudit = callPackage ../tools/security/kubeaudit { }; @@ -15520,6 +15518,8 @@ with pkgs; pythonPackages = python3Packages; }; + nix-bisect = callPackage ../development/tools/misc/nix-bisect { }; + nix-build-uncached = callPackage ../development/tools/misc/nix-build-uncached { }; nexus = callPackage ../development/tools/repository-managers/nexus { @@ -17132,7 +17132,7 @@ with pkgs; gmp5 = callPackage ../development/libraries/gmp/5.1.x.nix { }; gmp6 = callPackage ../development/libraries/gmp/6.x.nix { }; gmp = gmp6; - gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; }); + gmpxx = gmp.override { cxx = true; }; #GMP ex-satellite, so better keep it near gmp mpfr = callPackage ../development/libraries/mpfr { }; @@ -18919,7 +18919,7 @@ with pkgs; libusb1 = callPackage ../development/libraries/libusb1 { inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) IOKit; + inherit (darwin.apple_sdk.frameworks) IOKit Security; # TODO: remove once `udev` is `systemdMinimal` everywhere. udev = systemdMinimal; }; @@ -18951,7 +18951,7 @@ with pkgs; libva-minimal = libva.override { minimal = true; }; libva-utils = callPackage ../development/libraries/libva/utils.nix { }; - libva1 = callPackage ../development/libraries/libva/1.0.0.nix { }; + libva1 = callPackage ../development/libraries/libva/1.nix { }; libva1-minimal = libva1.override { minimal = true; }; libvarlink = callPackage ../development/libraries/libvarlink { }; @@ -20724,7 +20724,10 @@ with pkgs; wxGTK30-gtk2 = wxGTK30.override { withGtk2 = true; }; wxGTK30-gtk3 = wxGTK30.override { withGtk2 = false; }; - wxmac = callPackage ../development/libraries/wxwidgets/wxmac30.nix { }; + wxmac = callPackage ../development/libraries/wxwidgets/wxmac30.nix { + inherit (darwin.stubs) derez rez setfile; + inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel WebKit; + }; wxGTK31 = callPackage ../development/libraries/wxwidgets/wxGTK31.nix { inherit (darwin.stubs) setfile; @@ -21395,8 +21398,6 @@ with pkgs; hasura-cli = callPackage ../servers/hasura/cli.nix { }; - heapster = callPackage ../servers/monitoring/heapster { }; - hbase = callPackage ../servers/hbase {}; headphones = callPackage ../servers/headphones {}; @@ -21999,7 +22000,6 @@ with pkgs; prometheus-knot-exporter = callPackage ../servers/monitoring/prometheus/knot-exporter.nix { }; prometheus-lnd-exporter = callPackage ../servers/monitoring/prometheus/lnd-exporter.nix { }; prometheus-mail-exporter = callPackage ../servers/monitoring/prometheus/mail-exporter.nix { }; - prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { }; prometheus-mikrotik-exporter = callPackage ../servers/monitoring/prometheus/mikrotik-exporter.nix { }; prometheus-minio-exporter = callPackage ../servers/monitoring/prometheus/minio-exporter { }; prometheus-modemmanager-exporter = callPackage ../servers/monitoring/prometheus/modemmanager-exporter.nix { }; @@ -22934,6 +22934,9 @@ with pkgs; enableDmeventd = true; enableCmdlib = true; }; + lvm2_vdo = lvm2_dmeventd.override { + enableVDO = true; + }; maddy = callPackage ../servers/maddy { }; @@ -23366,18 +23369,12 @@ with pkgs; withTimesyncd = false; withTpm2Tss = false; withUserDb = false; - glib = null; - libgcrypt = null; - lvm2 = null; - libfido2 = null; - p11-kit = null; }; systemdStage1 = systemdMinimal.override { pname = "systemd-stage-1"; withCryptsetup = true; withFido2 = true; withTpm2Tss = true; - inherit lvm2 libfido2 p11-kit; }; systemdStage1Network = systemdStage1.override { pname = "systemd-stage-1-network"; @@ -23509,11 +23506,11 @@ with pkgs; util-linuxCurses = util-linux; - util-linuxMinimal = if stdenv.isLinux then appendToName "minimal" (util-linux.override { + util-linuxMinimal = if stdenv.isLinux then util-linux.override { nlsSupport = false; ncurses = null; systemd = null; - }) else util-linux; + } else util-linux; v4l-utils = qt5.callPackage ../os-specific/linux/v4l-utils { }; @@ -23521,6 +23518,8 @@ with pkgs; vndr = callPackage ../development/tools/vndr { }; + vdo = callPackage ../os-specific/linux/vdo { }; + windows = callPackages ../os-specific/windows {}; wirelesstools = callPackage ../os-specific/linux/wireless-tools { }; @@ -24380,8 +24379,6 @@ with pkgs; hasklig = callPackage ../data/fonts/hasklig {}; - interfacer = callPackage ../development/tools/interfacer { }; - maligned = callPackage ../development/tools/maligned { }; inter = callPackage ../data/fonts/inter { }; @@ -26193,9 +26190,7 @@ with pkgs; }; # Git with SVN support, but without GUI. - gitSVN = lowPrio (appendToName "with-svn" (git.override { - svnSupport = true; - })); + gitSVN = lowPrio (git.override { svnSupport = true; }); git-doc = lib.addMetaAttrs { description = "Additional documentation for Git"; @@ -26205,11 +26200,11 @@ with pkgs; ''; } gitFull.doc; - gitMinimal = appendToName "minimal" (git.override { + gitMinimal = git.override { withManual = false; pythonSupport = false; withpcre2 = false; - }); + }; gitRepo = callPackage ../applications/version-management/git-repo { }; @@ -27147,8 +27142,6 @@ with pkgs; kubectl-tree = callPackage ../applications/networking/cluster/kubectl-tree { }; - kubeless = callPackage ../applications/networking/cluster/kubeless { }; - kubelogin = callPackage ../applications/networking/cluster/kubelogin { }; kubelogin-oidc = callPackage ../applications/networking/cluster/kubelogin-oidc { }; @@ -30476,10 +30469,6 @@ with pkgs; zeroc-ice-cpp11 = zeroc-ice.override { cpp11 = true; }; - zeroc-ice-36 = callPackage ../development/libraries/zeroc-ice/3.6.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; - zeronet = callPackage ../applications/networking/p2p/zeronet { }; zexy = callPackage ../applications/audio/pd-plugins/zexy { @@ -31014,6 +31003,8 @@ with pkgs; btanks = callPackage ../games/btanks { }; + bugdom = callPackage ../games/bugdom { }; + bzflag = callPackage ../games/bzflag { inherit (darwin.apple_sdk.frameworks) Carbon CoreServices; }; @@ -33414,10 +33405,10 @@ with pkgs; ghostscript = callPackage ../misc/ghostscript { }; - ghostscriptX = appendToName "with-X" (ghostscript.override { + ghostscriptX = ghostscript.override { cupsSupport = true; x11Support = true; - }); + }; glava = callPackage ../applications/misc/glava {}; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 26e4b3229a27c..ca80ea02ffc04 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -317,6 +317,8 @@ in { ena = callPackage ../os-specific/linux/ena {}; + kvdo = callPackage ../os-specific/linux/kvdo {}; + liquidtux = callPackage ../os-specific/linux/liquidtux {}; v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 255ba4eb47848..62394a00c6d4c 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -982,6 +982,14 @@ let ocsigen-toolkit = callPackage ../development/ocaml-modules/ocsigen-toolkit { }; + ocsipersist = callPackage ../development/ocaml-modules/ocsipersist {}; + + ocsipersist-lib = callPackage ../development/ocaml-modules/ocsipersist/lib.nix { }; + + ocsipersist-pgsql = callPackage ../development/ocaml-modules/ocsipersist/pgsql.nix { }; + + ocsipersist-sqlite = callPackage ../development/ocaml-modules/ocsipersist/sqlite.nix { }; + octavius = callPackage ../development/ocaml-modules/octavius { }; odate = callPackage ../development/ocaml-modules/odate { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 0abf2b5898648..db0b456d905dd 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -35,6 +35,7 @@ in mapAliases ({ anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 asyncio-nats-client = nats-py; # added 2022-02-08 + bitcoin-price-api = throw "bitcoin-price-api has been removed, it was using setuptools 2to3 translation feautre, which has been removed in setuptools 58"; # added 2022-02-15 blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29 bt_proximity = bt-proximity; # added 2021-07-02 carrot = throw "carrot has been removed, as its development was discontinued in 2012"; # added 2022-01-18 @@ -48,6 +49,8 @@ mapAliases ({ diff_cover = diff-cover; # added 2021-07-02 discogs_client = discogs-client; # added 2021-07-02 djangorestframework-jwt = drf-jwt; # added 2021-07-20 + django_2 = throw "Django 2 has reached it's projected EOL in 2022/04 and has therefore been removed."; # added 2022-03-05 + django_appconf = django-appconf; # added 2022-03-03 django_environ = django-environ; # added 2021-12-25 django_extensions = django-extensions; # added 2022-01-09 django_redis = django-redis; # added 2021-10-11 @@ -72,6 +75,7 @@ mapAliases ({ lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04 Markups = markups; # added 2022-02-14 MechanicalSoup = mechanicalsoup; # added 2021-06-01 + nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16 pam = python-pam; # added 2020-09-07. PasteDeploy = pastedeploy; # added 2021-10-07 powerlineMemSegment = powerline-mem-segment; # added 2021-10-08 @@ -87,6 +91,7 @@ mapAliases ({ pytest_6 = pytest; # added 2022-02-10 pytestcov = pytest-cov; # added 2021-01-04 pytest-pep8 = pytestpep8; # added 2021-01-04 + pytest-pythonpath = throw "pytest-pythonpath is obsolete as of pytest 7.0.0 and has been removed"; # added 2022-03-09 pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 pytestquickcheck = pytest-quickcheck; # added 2021-07-20 pytestrunner = pytest-runner; # added 2021-01-04 @@ -118,6 +123,7 @@ mapAliases ({ tensorflow-bin_2 = tensorflow-bin; # added 2021-11-25 tensorflow-build_2 = tensorflow-build; # added 2021-11-25 tensorflow-estimator_2 = tensorflow-estimator; # added 2021-11-25 + tensorflow-tensorboard = tensorboard; # added 2022-03-06 tensorflow-tensorboard_2 = tensorflow-tensorboard; # added 2021-11-25 tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05 WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 01fd6c39c4c7d..5b9d803323232 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1238,8 +1238,6 @@ in { bitcoinlib = callPackage ../development/python-modules/bitcoinlib { }; - bitcoin-price-api = callPackage ../development/python-modules/bitcoin-price-api { }; - bitcoin-utils-fork-minimal = callPackage ../development/python-modules/bitcoin-utils-fork-minimal { }; bitcoinrpc = callPackage ../development/python-modules/bitcoinrpc { }; @@ -2236,7 +2234,6 @@ in { django = self.django_3; # Current LTS - django_2 = callPackage ../development/python-modules/django/2.nix { }; django_3 = callPackage ../development/python-modules/django/3.nix { }; # Current latest @@ -2246,7 +2243,7 @@ in { django-anymail = callPackage ../development/python-modules/django-anymail { }; - django_appconf = callPackage ../development/python-modules/django_appconf { }; + django-appconf = callPackage ../development/python-modules/django-appconf { }; django-auth-ldap = callPackage ../development/python-modules/django-auth-ldap { }; @@ -2898,6 +2895,8 @@ in { findimports = callPackage ../development/python-modules/findimports { }; + findpython = callPackage ../development/python-modules/findpython { }; + fingerprints = callPackage ../development/python-modules/fingerprints { }; finitude = callPackage ../development/python-modules/finitude { }; @@ -3727,6 +3726,8 @@ in { hatasmota = callPackage ../development/python-modules/hatasmota { }; + hatchling = callPackage ../development/python-modules/hatchling { }; + haversine = callPackage ../development/python-modules/haversine { }; hawkauthlib = callPackage ../development/python-modules/hawkauthlib { }; @@ -5535,7 +5536,8 @@ in { nghttp2 = (toPythonModule (pkgs.nghttp2.override { inherit (self) python cython setuptools; inherit (pkgs) ncurses; - enablePython = true; + enableApp = false; # build only libnghttp2 ... + enablePython = true; # ... and its Python bindings })).python; nibabel = callPackage ../development/python-modules/nibabel { }; @@ -5610,8 +5612,6 @@ in { nose-cov = callPackage ../development/python-modules/nose-cov { }; - nose-cover3 = callPackage ../development/python-modules/nose-cover3 { }; - nose-cprof = callPackage ../development/python-modules/nose-cprof { }; nose-exclude = callPackage ../development/python-modules/nose-exclude { }; @@ -6384,6 +6384,10 @@ in { plexwebsocket = callPackage ../development/python-modules/plexwebsocket { }; + plfit = toPythonModule (pkgs.plfit.override { + inherit (self) python; + }); + plone-testing = callPackage ../development/python-modules/plone-testing { }; plotly = callPackage ../development/python-modules/plotly { }; @@ -7061,9 +7065,7 @@ in { pygetwindow = callPackage ../development/python-modules/pygetwindow { }; - pygit2 = callPackage ../development/python-modules/pygit2 { - libgit2 = pkgs.libgit2_1_3_0; - }; + pygit2 = callPackage ../development/python-modules/pygit2 { }; PyGithub = callPackage ../development/python-modules/pyGithub { }; @@ -7982,8 +7984,6 @@ in { pytest-pylint = callPackage ../development/python-modules/pytest-pylint { }; - pytest-pythonpath = callPackage ../development/python-modules/pytest-pythonpath { }; - pytest-qt = callPackage ../development/python-modules/pytest-qt { }; pytest-quickcheck = callPackage ../development/python-modules/pytest-quickcheck { }; @@ -9433,6 +9433,8 @@ in { sockjs-tornado = callPackage ../development/python-modules/sockjs-tornado { }; + socksio = callPackage ../development/python-modules/socksio { }; + socksipy-branch = callPackage ../development/python-modules/socksipy-branch { }; soco = callPackage ../development/python-modules/soco { }; @@ -9897,6 +9899,8 @@ in { tensorboard-plugin-wit = callPackage ../development/python-modules/tensorboard-plugin-wit { }; + tensorboard = callPackage ../development/python-modules/tensorboard { }; + tensorboardx = callPackage ../development/python-modules/tensorboardx { }; tensorflow-bin = callPackage ../development/python-modules/tensorflow/bin.nix { @@ -9929,8 +9933,6 @@ in { tensorflow = self.tensorflow-build; - tensorflow-tensorboard = callPackage ../development/python-modules/tensorflow-tensorboard { }; - tensorflowWithCuda = self.tensorflow.override { cudaSupport = true; }; @@ -10202,7 +10204,9 @@ in { trimesh = callPackage ../development/python-modules/trimesh { }; - trio = callPackage ../development/python-modules/trio { }; + trio = callPackage ../development/python-modules/trio { + inherit (pkgs) coreutils; + }; trio-asyncio = callPackage ../development/python-modules/trio-asyncio { }; diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index d90be7f3bb4c9..f341857222014 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -35,11 +35,12 @@ let name = "python-tested"; meta.description = "Release-critical packages from the python package sets"; constituents = [ - jobs.remarshal.x86_64-linux # Used in pkgs.formats helper - jobs.python39Packages.colorama.x86_64-linux # Used in nixos test-driver - jobs.python39Packages.ptpython.x86_64-linux # Used in nixos test-driver - jobs.python39Packages.requests.x86_64-linux # Almost ubiquous package - jobs.python39Packages.sphinx.x86_64-linux # Document creation for many packages + jobs.remarshal.x86_64-linux # Used in pkgs.formats helper + jobs.python39Packages.buildcatrust.x86_64-linux # Used in pkgs.cacert + jobs.python39Packages.colorama.x86_64-linux # Used in nixos test-driver + jobs.python39Packages.ptpython.x86_64-linux # Used in nixos test-driver + jobs.python39Packages.requests.x86_64-linux # Almost ubiquous package + jobs.python39Packages.sphinx.x86_64-linux # Document creation for many packages ]; }; |