diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-22 09:20:03 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-22 09:20:03 +0200 |
| commit | a456fbfeed62794a5b31839b37417d40c0890c71 (patch) | |
| tree | b52be81d028cc2207016da637c178146936fdbbc /pkgs/top-level/python-packages.nix | |
| parent | 43bbecea5e1dd1cfc163b790c1f388a563442ed1 (diff) | |
| parent | d3baf946b767ce64e6a352af0bf6cad1851c4a74 (diff) | |
| download | nixpkgs-a456fbfeed62794a5b31839b37417d40c0890c71.tar nixpkgs-a456fbfeed62794a5b31839b37417d40c0890c71.tar.gz nixpkgs-a456fbfeed62794a5b31839b37417d40c0890c71.tar.bz2 nixpkgs-a456fbfeed62794a5b31839b37417d40c0890c71.tar.lz nixpkgs-a456fbfeed62794a5b31839b37417d40c0890c71.tar.xz nixpkgs-a456fbfeed62794a5b31839b37417d40c0890c71.tar.zst nixpkgs-a456fbfeed62794a5b31839b37417d40c0890c71.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index adebb9ac392..93a2aea0973 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -848,6 +848,8 @@ in { phonopy = callPackage ../development/python-modules/phonopy { }; + phik = callPackage ../development/python-modules/phik {}; + piccata = callPackage ../development/python-modules/piccata {}; pims = callPackage ../development/python-modules/pims { }; @@ -1037,7 +1039,9 @@ in { pyschedule = callPackage ../development/python-modules/pyschedule { }; - pyside = callPackage ../development/python-modules/pyside { }; + pyside = callPackage ../development/python-modules/pyside { + inherit (pkgs) mesa; + }; pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { inherit (pkgs) libxml2 libxslt; # Do not need the Python bindings. @@ -3798,6 +3802,8 @@ in { memory_profiler = callPackage ../development/python-modules/memory_profiler { }; + mesa = callPackage ../development/python-modules/mesa { }; + metaphone = callPackage ../development/python-modules/metaphone { }; mezzanine = callPackage ../development/python-modules/mezzanine { }; @@ -4326,7 +4332,8 @@ in { ppft = callPackage ../development/python-modules/ppft { }; - praw = callPackage ../development/python-modules/praw { }; + praw = if isPy3k then callPackage ../development/python-modules/praw { } + else callPackage ../development/python-modules/praw/6.3.nix { }; prawcore = callPackage ../development/python-modules/prawcore { }; @@ -6342,6 +6349,9 @@ in { pyprof2calltree = callPackage ../development/python-modules/pyprof2calltree { }; hcloud = callPackage ../development/python-modules/hcloud { }; + + managesieve = callPackage ../development/python-modules/managesieve { }; + }); in fix' (extends overrides packages) |