about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSandro Jäckel <sandro.jaeckel@gmail.com>2021-07-27 14:22:45 +0200
committerJonathan Ringer <jonringer@users.noreply.github.com>2021-07-27 08:16:20 -0700
commit2008472e41c80492c82b5a71688bec602ec5bc9c (patch)
treedbe1685a3496eed9212e430afe2cd2a6d7cc5080
parente10b6e7e3bcca7f3b6af707923b6c8338c7c6633 (diff)
downloadnixlib-2008472e41c80492c82b5a71688bec602ec5bc9c.tar
nixlib-2008472e41c80492c82b5a71688bec602ec5bc9c.tar.gz
nixlib-2008472e41c80492c82b5a71688bec602ec5bc9c.tar.bz2
nixlib-2008472e41c80492c82b5a71688bec602ec5bc9c.tar.lz
nixlib-2008472e41c80492c82b5a71688bec602ec5bc9c.tar.xz
nixlib-2008472e41c80492c82b5a71688bec602ec5bc9c.tar.zst
nixlib-2008472e41c80492c82b5a71688bec602ec5bc9c.zip
python39Packages: remove two more aliases
-rw-r--r--pkgs/development/python-modules/lz4/default.nix (renamed from pkgs/development/python-modules/python-lz4/default.nix)0
-rw-r--r--pkgs/top-level/python-aliases.nix2
-rw-r--r--pkgs/top-level/python-packages.nix7
3 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix
index 180264f102d0..180264f102d0 100644
--- a/pkgs/development/python-modules/python-lz4/default.nix
+++ b/pkgs/development/python-modules/lz4/default.nix
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 294c90f66566..1726c3798e2f 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -60,6 +60,8 @@ mapAliases ({
   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
+  python-lz4 = lz4; # added 2018-06-01
+  python-pam = pam; # added 2020-09-07.
   pytest_xdist = pytest-xdist; # added 2021-01-04
   python_simple_hipchat = python-simple-hipchat; # added 2021-07-21
   qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 32fe5cb07298..e2d85d8ca674 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4260,7 +4260,7 @@ in {
 
   lyricwikia = callPackage ../development/python-modules/lyricwikia { };
 
-  lz4 = self.python-lz4; # alias 2018-12-05
+  lz4 = callPackage ../development/python-modules/lz4 { };
 
   lzstring = callPackage ../development/python-modules/lzstring { };
 
@@ -5085,9 +5085,6 @@ in {
 
   palettable = callPackage ../development/python-modules/palettable { };
 
-  # Alias. Added 2020-09-07.
-  pam = self.python-pam;
-
   pamela = callPackage ../development/python-modules/pamela { };
 
   pamqp = callPackage ../development/python-modules/pamqp { };
@@ -7069,8 +7066,6 @@ in {
 
   python-ly = callPackage ../development/python-modules/python-ly { };
 
-  python-lz4 = callPackage ../development/python-modules/python-lz4 { };
-
   python-lzf = callPackage ../development/python-modules/python-lzf { };
 
   python-lzo = callPackage ../development/python-modules/python-lzo {