public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #18982 from aneeshusa/pin-packages-to-python2-part2

Browse Source 
Pin packages to python2 part2
This commit is contained in:
Frederik Rietdijk 2016-09-26 18:33:26 +02:00 committed by GitHub
commit d5fd65df4e
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/version-management/mercurial/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pythonPackages, makeWrapper, docutils, unzip { stdenv, fetchurl, python2Packages, makeWrapper, docutils, unzip
, guiSupport ? false, tk ? null , guiSupport ? false, tk ? null
, ApplicationServices, cf-private }: , ApplicationServices, cf-private }:
@ -6,7 +6,7 @@ let
# if you bump version, update pkgs.tortoisehg too or ping maintainer # if you bump version, update pkgs.tortoisehg too or ping maintainer
version = "3.9.1"; version = "3.9.1";
name = "mercurial-${version}"; name = "mercurial-${version}";
inherit (pythonPackages) curses docutils hg-git dulwich python; inherit (python2Packages) curses docutils hg-git dulwich python;
in in
stdenv.mkDerivation { stdenv.mkDerivation {

4
pkgs/development/interpreters/spidermonkey/17.0.nix
View File

@ -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 { stdenv.mkDerivation rec {
version = "17.0.0"; version = "17.0.0";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ nspr ]; propagatedBuildInputs = [ nspr ];
buildInputs = [ pkgconfig perl python zip libffi readline ]; buildInputs = [ pkgconfig perl python2 zip libffi readline ];
postUnpack = "sourceRoot=\${sourceRoot}/js/src"; postUnpack = "sourceRoot=\${sourceRoot}/js/src";

6
pkgs/tools/typesetting/asciidoc/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, python { fetchurl, stdenv, python2
, enableStandardFeatures ? false , enableStandardFeatures ? false
, sourceHighlight ? null , sourceHighlight ? null
@ -148,7 +148,7 @@ stdenv.mkDerivation rec {
sha256 = "1w71nk527lq504njmaf0vzr93pgahkgzzxzglrq6bay8cw2rvnvq"; sha256 = "1w71nk527lq504njmaf0vzr93pgahkgzzxzglrq6bay8cw2rvnvq";
}; };
buildInputs = [ python unzip ]; buildInputs = [ python2 unzip ];
# install filters early, so their shebangs are patched too # install filters early, so their shebangs are patched too
patchPhase = with stdenv.lib; '' patchPhase = with stdenv.lib; ''
@ -247,7 +247,7 @@ stdenv.mkDerivation rec {
-i a2x.py -i a2x.py
'' + '' '' + ''
for n in $(find "$out" . -name \*.py); do 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" chmod +x "$n"
done done

6
pkgs/top-level/all-packages.nix
View File

@ -931,18 +931,18 @@ in
appdata-tools = callPackage ../tools/misc/appdata-tools { }; appdata-tools = callPackage ../tools/misc/appdata-tools { };
asciidoc = callPackage ../tools/typesetting/asciidoc { asciidoc = callPackage ../tools/typesetting/asciidoc {
inherit (pythonPackages) matplotlib numpy aafigure recursivePthLoader; inherit (python2Packages) matplotlib numpy aafigure recursivePthLoader;
w3m = w3m-batch; w3m = w3m-batch;
enableStandardFeatures = false; enableStandardFeatures = false;
}; };
asciidoc-full = appendToName "full" (asciidoc.override { asciidoc-full = appendToName "full" (asciidoc.override {
inherit (pythonPackages) pygments; inherit (python2Packages) pygments;
enableStandardFeatures = true; enableStandardFeatures = true;
}); });
asciidoc-full-with-plugins = appendToName "full-with-plugins" (asciidoc.override { asciidoc-full-with-plugins = appendToName "full-with-plugins" (asciidoc.override {
inherit (pythonPackages) pygments; inherit (python2Packages) pygments;
enableStandardFeatures = true; enableStandardFeatures = true;
enableExtraPlugins = true; enableExtraPlugins = true;
}); });