From 777a6cafd94bde45d327e2024b29250a66978bde Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal <aneeshusa@gmail.com> Date: Mon, 26 Sep 2016 11:36:27 -0400 Subject: [PATCH 1/3] asciidoc: Pin to Python 2 --- pkgs/tools/typesetting/asciidoc/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 59059c632b9..89ed36231a2 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 434b0674c9a..82d00ead086 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; }); From e6897a3fb44ba7ad763b9bddc2b130b9e8fba324 Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal <aneeshusa@gmail.com> Date: Mon, 26 Sep 2016 11:41:54 -0400 Subject: [PATCH 2/3] mercurial: Pin to Python 2 --- pkgs/applications/version-management/mercurial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 13385209019..290d27b3736 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 { From 9ad3c23b39e6766212fd04b6fcd35e68bb47f31e Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal <aneeshusa@gmail.com> Date: Mon, 26 Sep 2016 11:42:47 -0400 Subject: [PATCH 3/3] spidermonkey_17: Pin to Python 2 --- pkgs/development/interpreters/spidermonkey/17.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/spidermonkey/17.0.nix b/pkgs/development/interpreters/spidermonkey/17.0.nix index d9cc7775d09..a2ecfb2ef97 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";