commit ef3757db635bc361be81049eaaa4b4d3bfd0785d · pyrox.dev/nixpkgs

pyrox.dev / nixpkgs

lol

fork atom

Merge pull request #13057 from FRidh/pyxml

pyxml: move to pythonPackages

Frederik Rietdijk 10 years ago ef3757db 4cb9f662

+3 -1

2 changed files

expand all

unified split

pkgs

top-level

all-packages.nix

python-packages.nix

+1 -1

pkgs/top-level/all-packages.nix

··· 9226 9226 9227 9227 pysideShiboken = pythonPackages.pysideShiboken; 9228 9228 9229 - pyxml = callPackage ../development/python-modules/pyxml { }; 9229 + pyxml = pythonPackages.pyxml; 9230 9230 9231 9231 rbtools = pythonPackages.rbtools; 9232 9232

pkgs/top-level/python-packages.nix

··· 177 177 178 178 pysideTools = callPackage ../development/python-modules/pyside/tools.nix { }; 179 179 180 + pyxml = if !isPy3k then callPackage ../development/python-modules/pyxml{ } else throw "pyxml not supported for interpreter ${python.executable}"; 181 + 180 182 sip = callPackage ../development/python-modules/sip { }; 181 183 182 184 sip_4_16 = callPackage ../development/python-modules/sip/4.16.nix { };