diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-09-26 18:33:26 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-26 18:33:26 +0200 |
commit | d5fd65df4e84b2d06606c70a5e7ee39daf1ddc73 (patch) | |
tree | 1054fbededa61db01f899de77fc47e7be2a4affb | |
parent | 85c070e85a275f1e57397f49bb37643ebb6ea084 (diff) | |
parent | 9ad3c23b39e6766212fd04b6fcd35e68bb47f31e (diff) | |
download | nixlib-d5fd65df4e84b2d06606c70a5e7ee39daf1ddc73.tar nixlib-d5fd65df4e84b2d06606c70a5e7ee39daf1ddc73.tar.gz nixlib-d5fd65df4e84b2d06606c70a5e7ee39daf1ddc73.tar.bz2 nixlib-d5fd65df4e84b2d06606c70a5e7ee39daf1ddc73.tar.lz nixlib-d5fd65df4e84b2d06606c70a5e7ee39daf1ddc73.tar.xz nixlib-d5fd65df4e84b2d06606c70a5e7ee39daf1ddc73.tar.zst nixlib-d5fd65df4e84b2d06606c70a5e7ee39daf1ddc73.zip |
Merge pull request #18982 from aneeshusa/pin-packages-to-python2-part2
Pin packages to python2 part2
-rw-r--r-- | pkgs/applications/version-management/mercurial/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/interpreters/spidermonkey/17.0.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/typesetting/asciidoc/default.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 13385209019f..290d27b37368 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, makeWrapper, docutils, unzip +{ stdenv, fetchurl, python2Packages, makeWrapper, docutils, unzip , guiSupport ? false, tk ? null , ApplicationServices, cf-private }: @@ -6,7 +6,7 @@ let # if you bump version, update pkgs.tortoisehg too or ping maintainer version = "3.9.1"; name = "mercurial-${version}"; - inherit (pythonPackages) curses docutils hg-git dulwich python; + inherit (python2Packages) curses docutils hg-git dulwich python; in stdenv.mkDerivation { diff --git a/pkgs/development/interpreters/spidermonkey/17.0.nix b/pkgs/development/interpreters/spidermonkey/17.0.nix index d9cc7775d090..a2ecfb2ef97a 100644 --- a/pkgs/development/interpreters/spidermonkey/17.0.nix +++ b/pkgs/development/interpreters/spidermonkey/17.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, nspr, perl, python, zip, libffi, readline }: +{ stdenv, fetchurl, pkgconfig, nspr, perl, python2, zip, libffi, readline }: stdenv.mkDerivation rec { version = "17.0.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ nspr ]; - buildInputs = [ pkgconfig perl python zip libffi readline ]; + buildInputs = [ pkgconfig perl python2 zip libffi readline ]; postUnpack = "sourceRoot=\${sourceRoot}/js/src"; diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 59059c632b97..89ed36231a2a 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, python +{ fetchurl, stdenv, python2 , enableStandardFeatures ? false , sourceHighlight ? null @@ -148,7 +148,7 @@ stdenv.mkDerivation rec { sha256 = "1w71nk527lq504njmaf0vzr93pgahkgzzxzglrq6bay8cw2rvnvq"; }; - buildInputs = [ python unzip ]; + buildInputs = [ python2 unzip ]; # install filters early, so their shebangs are patched too patchPhase = with stdenv.lib; '' @@ -247,7 +247,7 @@ stdenv.mkDerivation rec { -i a2x.py '' + '' for n in $(find "$out" . -name \*.py); do - sed -i -e "s,^#![[:space:]]*.*/bin/env python,#!${python}/bin/python,g" "$n" + sed -i -e "s,^#![[:space:]]*.*/bin/env python,#!${python2}/bin/python,g" "$n" chmod +x "$n" done diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 434b0674c9a0..82d00ead086c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -931,18 +931,18 @@ in appdata-tools = callPackage ../tools/misc/appdata-tools { }; asciidoc = callPackage ../tools/typesetting/asciidoc { - inherit (pythonPackages) matplotlib numpy aafigure recursivePthLoader; + inherit (python2Packages) matplotlib numpy aafigure recursivePthLoader; w3m = w3m-batch; enableStandardFeatures = false; }; asciidoc-full = appendToName "full" (asciidoc.override { - inherit (pythonPackages) pygments; + inherit (python2Packages) pygments; enableStandardFeatures = true; }); asciidoc-full-with-plugins = appendToName "full-with-plugins" (asciidoc.override { - inherit (pythonPackages) pygments; + inherit (python2Packages) pygments; enableStandardFeatures = true; enableExtraPlugins = true; }); |