diff options
author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-12-18 10:18:14 -0500 |
---|---|---|
committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-12-18 10:18:14 -0500 |
commit | da8f155b2a5d481770172e25bfdc6e9fc2da8c1b (patch) | |
tree | 23aaf94336fd9c120f904374afbe19547b08cf03 /pkgs/top-level/python2-packages.nix | |
parent | f7775a4c2c9cd5b24890194a4644ae06a4d4fd1c (diff) | |
parent | da4ef05326bce443effc500b33a97a2f370a54ff (diff) | |
download | nixpkgs-da8f155b2a5d481770172e25bfdc6e9fc2da8c1b.tar nixpkgs-da8f155b2a5d481770172e25bfdc6e9fc2da8c1b.tar.gz nixpkgs-da8f155b2a5d481770172e25bfdc6e9fc2da8c1b.tar.bz2 nixpkgs-da8f155b2a5d481770172e25bfdc6e9fc2da8c1b.tar.lz nixpkgs-da8f155b2a5d481770172e25bfdc6e9fc2da8c1b.tar.xz nixpkgs-da8f155b2a5d481770172e25bfdc6e9fc2da8c1b.tar.zst nixpkgs-da8f155b2a5d481770172e25bfdc6e9fc2da8c1b.zip |
Merge branch 'master' into staging-next
Conflicts: pkgs/development/python-modules/sphinxext-opengraph/default.nix
Diffstat (limited to 'pkgs/top-level/python2-packages.nix')
-rw-r--r-- | pkgs/top-level/python2-packages.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 210be5eb2ae..5efc4005373 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -396,6 +396,8 @@ with self; with super; { pip = callPackage ../development/python-modules/pip/20.nix { }; + platformdirs = callPackage ../development/python-modules/platformdirs/2.nix { }; + pluggy = callPackage ../development/python-modules/pluggy/0.nix { }; postorius = disabled super.postorius; |