diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-03-17 11:28:28 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-03-17 11:28:28 +0100 |
commit | b1eeae8cacf4e32f25781f9835312b545365468d (patch) | |
tree | b241b3c5394d6f62909296cd36c49924f0fef627 /pkgs/development/interpreters/python | |
parent | 516133a4fd078514f54dcd00c5b56f641e7bb9dc (diff) | |
parent | 8acaea6d5717866133ad00e3f6f05ef7b84be176 (diff) | |
download | nixlib-b1eeae8cacf4e32f25781f9835312b545365468d.tar nixlib-b1eeae8cacf4e32f25781f9835312b545365468d.tar.gz nixlib-b1eeae8cacf4e32f25781f9835312b545365468d.tar.bz2 nixlib-b1eeae8cacf4e32f25781f9835312b545365468d.tar.lz nixlib-b1eeae8cacf4e32f25781f9835312b545365468d.tar.xz nixlib-b1eeae8cacf4e32f25781f9835312b545365468d.tar.zst nixlib-b1eeae8cacf4e32f25781f9835312b545365468d.zip |
Merge branch 'master' into x-updates
Conflicts (easy): pkgs/desktops/xfce/core/xfdesktop.nix pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/pango/default.nix
Diffstat (limited to 'pkgs/development/interpreters/python')
-rw-r--r-- | pkgs/development/interpreters/python/docs/default.nix | 4 | ||||
-rwxr-xr-x | pkgs/development/interpreters/python/docs/generate.sh | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/python/docs/default.nix b/pkgs/development/interpreters/python/docs/default.nix index 7e3ff6abbe93..16ade3af3f95 100644 --- a/pkgs/development/interpreters/python/docs/default.nix +++ b/pkgs/development/interpreters/python/docs/default.nix @@ -3,6 +3,7 @@ let pythonDocs = { html = { + recurseForDerivations = true; python33 = import ./3.3-html.nix { inherit stdenv fetchurl lib; }; @@ -23,6 +24,7 @@ pythonDocs = { }; }; pdf_a4 = { + recurseForDerivations = true; python33 = import ./3.3-pdf-a4.nix { inherit stdenv fetchurl lib; }; @@ -43,6 +45,7 @@ pythonDocs = { }; }; pdf_letter = { + recurseForDerivations = true; python33 = import ./3.3-pdf-letter.nix { inherit stdenv fetchurl lib; }; @@ -63,6 +66,7 @@ pythonDocs = { }; }; text = { + recurseForDerivations = true; python33 = import ./3.3-text.nix { inherit stdenv fetchurl lib; }; diff --git a/pkgs/development/interpreters/python/docs/generate.sh b/pkgs/development/interpreters/python/docs/generate.sh index 554bf79e3344..bebefc10ccd0 100755 --- a/pkgs/development/interpreters/python/docs/generate.sh +++ b/pkgs/development/interpreters/python/docs/generate.sh @@ -16,7 +16,11 @@ pythonDocs = { EOF for type in $TYPES; do - echo " ${type/-/_} = {" >> default.nix + cat >>default.nix <<EOF + ${type/-/_} = { + recurseForDerivations = true; +EOF + for version in $VERSIONS; do major=$(echo -n ${version}| cut -d. -f1) minor=$(echo -n ${version}| cut -d. -f2) |