diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-12-05 22:02:00 -0800 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-12-05 22:02:00 -0800 |
| commit | 5263fb820e7d21f5db9053659b183ffcaf398f5b (patch) | |
| tree | e129ad5b5e1cfc90026a294453f33b4d778cb66a /pkgs/top-level/python2-packages.nix | |
| parent | 423aff986c53d465175135ee72c3584c88394de9 (diff) | |
| parent | 2aaf7277718841775d6c69d7db86e8e8e1d1f678 (diff) | |
| download | nixpkgs-5263fb820e7d21f5db9053659b183ffcaf398f5b.tar nixpkgs-5263fb820e7d21f5db9053659b183ffcaf398f5b.tar.gz nixpkgs-5263fb820e7d21f5db9053659b183ffcaf398f5b.tar.bz2 nixpkgs-5263fb820e7d21f5db9053659b183ffcaf398f5b.tar.lz nixpkgs-5263fb820e7d21f5db9053659b183ffcaf398f5b.tar.xz nixpkgs-5263fb820e7d21f5db9053659b183ffcaf398f5b.tar.zst nixpkgs-5263fb820e7d21f5db9053659b183ffcaf398f5b.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/development/python-modules/django-rq/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/top-level/python2-packages.nix')
| -rw-r--r-- | pkgs/top-level/python2-packages.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index e6280310807..30a321b00f3 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -132,11 +132,6 @@ with self; with super; { gdcm = disabled super.gdcm; - gaia = disabledIf (isPyPy || isPy3k) (toPythonModule (pkgs.gaia.override { - pythonPackages = self; - pythonSupport = true; - })); # gaia isn't supported with python3 and it's not available from pypi - geant4 = disabled super.geant4; geopy = callPackage ../development/python-modules/geopy/2.nix { }; @@ -643,6 +638,8 @@ with self; with super; { typing = callPackage ../development/python-modules/typing { }; + tzlocal = callPackage ../development/python-modules/tzlocal/2.nix { }; + ujson = callPackage ../development/python-modules/ujson/2.nix { }; umemcache = callPackage ../development/python-modules/umemcache { }; |