From 94f2013c0cc006cec80f42b8d956f6022db571a2 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 13 Mar 2013 13:09:58 +0100 Subject: [PATCH] pythonDocs: recurseIntoAttrs does not recurse, bypass problem --- pkgs/development/interpreters/python/docs/default.nix | 4 ++++ pkgs/development/interpreters/python/docs/generate.sh | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/docs/default.nix b/pkgs/development/interpreters/python/docs/default.nix index 7e3ff6abbe9..16ade3af3f9 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 554bf79e334..bebefc10ccd 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 <