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

asciidoc: Pin to Python 2

Browse Source
This commit is contained in:
Aneesh Agrawal 2016-09-26 11:36:27 -04:00
parent ff980cc553
commit 777a6cafd9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

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

@ -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;
});