diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2021-03-25 13:26:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-25 13:26:35 +0100 |
| commit | 350f9bd822e1c5017482e6364dbafda36ff4157a (patch) | |
| tree | 41f6c6c5f7ff38584f5091004c40cec14f908b00 /pkgs/top-level | |
| parent | c0e881852006b132236cbf0301bd1939bb50867e (diff) | |
| parent | f0754b8ab8b4969ff49e2436c6c8f12120c13ad8 (diff) | |
Merge pull request #117570 from FRidh/python2alias
Python: be explicit on whether it is python2 or python3 that is used
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 459206d37bb2..3a7d1d60c6a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1609,7 +1609,7 @@ in b3sum = callPackage ../tools/security/b3sum {}; - backblaze-b2 = python.pkgs.callPackage ../development/tools/backblaze-b2 { }; + backblaze-b2 = callPackage ../development/tools/backblaze-b2 { }; bandwhich = callPackage ../tools/networking/bandwhich { inherit (darwin.apple_sdk.frameworks) Security; @@ -3138,9 +3138,7 @@ in librsync = librsync_0_9; }; - bud = callPackage ../tools/networking/bud { - inherit (pythonPackages) gyp; - }; + bud = callPackage ../tools/networking/bud { }; bump2version = python37Packages.callPackage ../applications/version-management/git-and-tools/bump2version { }; @@ -3390,9 +3388,7 @@ in skktools = callPackage ../tools/inputmethods/skk/skktools { }; skk-dicts = callPackage ../tools/inputmethods/skk/skk-dicts { }; - libkkc-data = callPackage ../data/misc/libkkc-data { - inherit (pythonPackages) marisa; - }; + libkkc-data = callPackage ../data/misc/libkkc-data { }; libkkc = callPackage ../tools/inputmethods/libkkc { }; @@ -4158,9 +4154,7 @@ in epsxe = callPackage ../misc/emulators/epsxe { }; - escrotum = callPackage ../tools/graphics/escrotum { - inherit (pythonPackages) buildPythonApplication pygtk numpy; - }; + escrotum = callPackage ../tools/graphics/escrotum { }; etcher = callPackage ../tools/misc/etcher { }; @@ -12552,7 +12546,7 @@ in jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - fedpkg = pythonPackages.callPackage ../development/tools/fedpkg { }; + fedpkg = callPackage ../development/tools/fedpkg { }; flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { }; flex = callPackage ../development/tools/parsing/flex { }; |