diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-02-16 22:53:27 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-02-16 22:53:27 +0100 |
| commit | ef3757db635bc361be81049eaaa4b4d3bfd0785d (patch) | |
| tree | 6d51e4ef25c694796a232b4614dbf3ddf9f5cad4 /pkgs | |
| parent | 4cb9f662ce8eae9477febdb70ba5f217496a731f (diff) | |
| parent | b58f84f236538113eaec27e17c3218e6e039b4ab (diff) | |
| download | nixlib-ef3757db635bc361be81049eaaa4b4d3bfd0785d.tar nixlib-ef3757db635bc361be81049eaaa4b4d3bfd0785d.tar.gz nixlib-ef3757db635bc361be81049eaaa4b4d3bfd0785d.tar.bz2 nixlib-ef3757db635bc361be81049eaaa4b4d3bfd0785d.tar.lz nixlib-ef3757db635bc361be81049eaaa4b4d3bfd0785d.tar.xz nixlib-ef3757db635bc361be81049eaaa4b4d3bfd0785d.tar.zst nixlib-ef3757db635bc361be81049eaaa4b4d3bfd0785d.zip | |
Merge pull request #13057 from FRidh/pyxml
pyxml: move to pythonPackages
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fae36c212c6e..00f3b0fd0d3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9226,7 +9226,7 @@ let pysideShiboken = pythonPackages.pysideShiboken; - pyxml = callPackage ../development/python-modules/pyxml { }; + pyxml = pythonPackages.pyxml; rbtools = pythonPackages.rbtools; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6ca2baeb35cd..cfb92eb5b8a7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -177,6 +177,8 @@ in modules // { pysideTools = callPackage ../development/python-modules/pyside/tools.nix { }; + pyxml = if !isPy3k then callPackage ../development/python-modules/pyxml{ } else throw "pyxml not supported for interpreter ${python.executable}"; + sip = callPackage ../development/python-modules/sip { }; sip_4_16 = callPackage ../development/python-modules/sip/4.16.nix { }; |