diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-11-12 14:32:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-12 14:32:50 +0100 |
| commit | 4619637d74c59dcb205d7867de5b745c3cfa921e (patch) | |
| tree | d78898816889e183065a0ab8702556787c2c30c9 /pkgs/top-level | |
| parent | a93fd10968034710099d2344e9a620411bc7b8db (diff) | |
| parent | 1b5a8a2cc6504379519e044c749ee55184408928 (diff) | |
Merge pull request #72712 from NixOS/staging-next
Staging next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 13 |
2 files changed, 17 insertions, 8 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b02908feea836..40b7347664ff4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12879,9 +12879,13 @@ in libxmi = callPackage ../development/libraries/libxmi { }; - libxml2 = callPackage ../development/libraries/libxml2 { }; + libxml2 = callPackage ../development/libraries/libxml2 { + python = if stdenv.isDarwin then python2 else python3; + }; - libxml2Python = pkgs.buildEnv { # slightly hacky + libxml2Python = let + libxml2 = python2Packages.libxml2; + in pkgs.buildEnv { # slightly hacky name = "libxml2+py-${res.libxml2.version}"; paths = with libxml2; [ dev bin py ]; inherit (libxml2) passthru; @@ -12899,7 +12903,9 @@ in libxmp = callPackage ../development/libraries/libxmp { }; - libxslt = callPackage ../development/libraries/libxslt { }; + libxslt = callPackage ../development/libraries/libxslt { + python = if stdenv.isDarwin then python2 else python3; + }; libixp_hg = callPackage ../development/libraries/libixp-hg { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 30efca26ee5d2..2321821a536e1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3738,10 +3738,9 @@ in { libplist = disabledIf isPy3k (toPythonModule (pkgs.libplist.override{python2Packages=self; })).py; - libxml2 = toPythonModule (pkgs.libxml2.override{pythonSupport=true; python2=python;}).py; + libxml2 = (toPythonModule (pkgs.libxml2.override{pythonSupport=true; inherit python;})).py; - libxslt = disabledIf isPy3k - (toPythonModule (pkgs.libxslt.override{pythonSupport=true; python2=python; inherit (self) libxml2;})).py; + libxslt = (toPythonModule (pkgs.libxslt.override{pythonSupport=true; inherit python; inherit (self) libxml2;})).py; limits = callPackage ../development/python-modules/limits { }; @@ -5059,9 +5058,13 @@ in { spark_parser = callPackage ../development/python-modules/spark_parser { }; - sphinx = callPackage ../development/python-modules/sphinx { }; + sphinx = if isPy3k then + callPackage ../development/python-modules/sphinx { } + else + callPackage ../development/python-modules/sphinx/2.nix { }; - sphinx_1_7_9 = (callPackage ../development/python-modules/sphinx { }) + # Only exists for a Haskell package. + sphinx_1_7_9 = (callPackage ../development/python-modules/sphinx/2.nix { }) .overridePythonAttrs (oldAttrs: rec { version = "1.7.9"; src = oldAttrs.src.override { |