diff options
author | Robert Schütz <nix@dotlambda.de> | 2022-01-11 23:40:02 +0000 |
---|---|---|
committer | Robert Schütz <nix@dotlambda.de> | 2022-01-16 18:39:59 +0000 |
commit | d5cceedbd13767b1770c0baac001167f3bf6d5ae (patch) | |
tree | efde5320c59f39bc8924eb0e7b2dfcaebe52388e /pkgs/top-level | |
parent | 9356c3472c3c0a31fb5d6b9640ef7c958f76795c (diff) | |
download | nixpkgs-d5cceedbd13767b1770c0baac001167f3bf6d5ae.tar nixpkgs-d5cceedbd13767b1770c0baac001167f3bf6d5ae.tar.gz nixpkgs-d5cceedbd13767b1770c0baac001167f3bf6d5ae.tar.bz2 nixpkgs-d5cceedbd13767b1770c0baac001167f3bf6d5ae.tar.lz nixpkgs-d5cceedbd13767b1770c0baac001167f3bf6d5ae.tar.xz nixpkgs-d5cceedbd13767b1770c0baac001167f3bf6d5ae.tar.zst nixpkgs-d5cceedbd13767b1770c0baac001167f3bf6d5ae.zip |
python,pythonPackages: make aliases
Since aliases are disallowed in nixpkgs, this makes usage of Python 2 which is EOL more explicit.
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 3 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 23 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/release.nix | 6 |
4 files changed, 15 insertions, 21 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8b90cbf2b7e..e894bed7d38 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -817,8 +817,11 @@ mapAliases ({ pyrex095 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-12 pyrex096 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-12 pyrit = throw "pyrit has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-01 + python = python2; # added 2022-01-11 python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead."; # added 2021-03-08 python-swiftclient = swiftclient; # added 2021-09-09 + pythonFull = python2Full; # added 2022-01-11 + pythonPackages = python.pkgs; # added 2022-01-11 quagga = throw "quagga is no longer maintained upstream"; # added 2021-04-22 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e73d300fd21..3ade9523149 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4660,7 +4660,7 @@ with pkgs; diffutils = callPackage ../tools/text/diffutils { }; dir2opus = callPackage ../tools/audio/dir2opus { - inherit (pythonPackages) mutagen python wrapPython; + inherit (python2Packages) mutagen python wrapPython; }; dirdiff = callPackage ../tools/text/dirdiff { @@ -10696,7 +10696,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) OpenCL; }; - wakatime = pythonPackages.callPackage ../tools/misc/wakatime { }; + wakatime = python2Packages.callPackage ../tools/misc/wakatime { }; weather = callPackage ../applications/misc/weather { }; @@ -13652,7 +13652,6 @@ with pkgs; # Python interpreters. All standard library modules are included except for tkinter, which is # available as `pythonPackages.tkinter` and can be used as any other Python package. # When switching these sets, please update docs at ../../doc/languages-frameworks/python.md - python = python2; python2 = python27; python3 = python39; pypy = pypy2; @@ -13661,11 +13660,6 @@ with pkgs; # Python interpreter that is build with all modules, including tkinter. # These are for compatibility and should not be used inside Nixpkgs. - pythonFull = python.override { - self = pythonFull; - pythonAttr = "pythonFull"; - x11Support = true; - }; python2Full = python2.override { self = python2Full; pythonAttr = "python2Full"; @@ -13702,7 +13696,6 @@ with pkgs; }; # pythonPackages further below, but assigned here because they need to be in sync - pythonPackages = python.pkgs; python2Packages = python2.pkgs; python3Packages = python3.pkgs; @@ -21685,7 +21678,7 @@ with pkgs; qpid-cpp = callPackage ../servers/amqp/qpid-cpp { boost = boost155; - inherit (pythonPackages) buildPythonPackage qpid-python; + inherit (python2Packages) buildPythonPackage qpid-python; }; qremotecontrol-server = callPackage ../servers/misc/qremotecontrol-server { }; @@ -29017,9 +29010,7 @@ with pkgs; topydo = callPackage ../applications/misc/topydo {}; - torchat = callPackage ../applications/networking/instant-messengers/torchat { - inherit (pythonPackages) wrapPython wxPython; - }; + torchat = callPackage ../applications/networking/instant-messengers/torchat { }; torrential = callPackage ../applications/networking/p2p/torrential { }; @@ -31701,7 +31692,7 @@ with pkgs; useMpi = true; }); - neuron-full = neuron-mpi.override { inherit python; }; + neuron-full = neuron-mpi.override { python = python2; }; mrbayes = callPackage ../applications/science/biology/mrbayes { }; @@ -33204,7 +33195,7 @@ with pkgs; nix-script = callPackage ../tools/nix/nix-script {}; - nix-template-rpm = callPackage ../build-support/templaterpm { inherit (pythonPackages) python toposort; }; + nix-template-rpm = callPackage ../build-support/templaterpm { inherit (python2Packages) python toposort; }; nix-top = callPackage ../tools/package-management/nix-top { }; @@ -33255,7 +33246,7 @@ with pkgs; disnix = callPackage ../tools/package-management/disnix { }; dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or { - inherit (pythonPackages) supervisor; + inherit (python2Packages) supervisor; }); dydisnix = callPackage ../tools/package-management/disnix/dydisnix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eef542e8def..c653a54a9fc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2746,14 +2746,14 @@ in { fastjet = toPythonModule (pkgs.fastjet.override { withPython = true; - inherit python; + inherit (self) python; }); fastjsonschema = callPackage ../development/python-modules/fastjsonschema { }; fastnlo_toolkit = toPythonModule (pkgs.fastnlo_toolkit.override { withPython = true; - inherit python; + inherit (self) python; }); fastnumbers = callPackage ../development/python-modules/fastnumbers { }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 13526349dfc..62d2d5ed8c1 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -54,7 +54,7 @@ let jobs.openssl.x86_64-darwin jobs.pandoc.x86_64-darwin jobs.postgresql.x86_64-darwin - jobs.python.x86_64-darwin + jobs.python2.x86_64-darwin jobs.python3.x86_64-darwin jobs.ruby.x86_64-darwin jobs.rustc.x86_64-darwin @@ -99,7 +99,7 @@ let jobs.go.x86_64-linux jobs.linux.x86_64-linux jobs.pandoc.x86_64-linux - jobs.python.x86_64-linux + jobs.python2.x86_64-linux jobs.python3.x86_64-linux # Needed by contributors to test PRs (by inclusion of the PR template) jobs.nixpkgs-review.x86_64-linux @@ -134,7 +134,7 @@ let jobs.stdenv.x86_64-darwin jobs.cargo.x86_64-darwin jobs.go.x86_64-darwin - jobs.python.x86_64-darwin + jobs.python2.x86_64-darwin jobs.python3.x86_64-darwin jobs.nixpkgs-review.x86_64-darwin jobs.nix-info.x86_64-darwin |