fix pythondocs (missing lib, doc instead of docs)

This commit is contained in:
Florian Friesdorf 2013-03-05 12:28:30 +01:00
parent ad31fcad52
commit 2e21e4fadc
28 changed files with 103 additions and 103 deletions

View File

@ -1,6 +1,6 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation rec {
name = "python26-docs-html-2.6.8";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "09kznik9ahmnrqw9gkr7mjv3b3zr258f2fm27n12hrrwwsaszkni";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
mkdir -p $out/share/doc
cp -R ./ $out/share/doc/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];

View File

@ -1,6 +1,6 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation rec {
name = "python26-docs-pdf-a4-2.6.8";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "07k8n9zhd59s1yn8ahsizkaqnv969p0f2c2acxgxrxhhyy842pp8";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
mkdir -p $out/share/doc
cp -R ./ $out/share/doc/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];

View File

@ -1,6 +1,6 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation rec {
name = "python26-docs-pdf-letter-2.6.8";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "01r87m8hb7f9ql4j9zcjcrr9150nsk23sj8cy02vygr83sc1ldmq";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
mkdir -p $out/share/doc
cp -R ./ $out/share/doc/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];

View File

@ -1,6 +1,6 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation rec {
name = "python26-docs-text-2.6.8";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "05wsdh6ilgkclgak09fq7fsx5kflkmqq8dyxi2rpydx289cw3a8c";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
mkdir -p $out/share/doc
cp -R ./ $out/share/doc/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];

View File

@ -1,6 +1,6 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation rec {
name = "python27-docs-html-2.7.3";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1hg92n0mzl9w6j33b2h0bf2vy6fsxnpxfdc3qw760vcm0y00155j";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
mkdir -p $out/share/doc
cp -R ./ $out/share/doc/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];

View File

@ -1,6 +1,6 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation rec {
name = "python27-docs-pdf-a4-2.7.3";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "13da88panq5b6qfhf8k4dgqgxkg4ydcac5cx69a3f35s1w90xdjr";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
mkdir -p $out/share/doc
cp -R ./ $out/share/doc/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];

View File

@ -1,6 +1,6 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation rec {
name = "python27-docs-pdf-letter-2.7.3";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0x41phsdrpivhzkchswsliyx3a10n7gzc9irkrw6rz22j81bfydg";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
mkdir -p $out/share/doc
cp -R ./ $out/share/doc/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];

View File

@ -1,6 +1,6 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation rec {
name = "python27-docs-text-2.7.3";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1rxlb3jhh3892y65i45nk1y2lx981fr22a5hmfkp9gvjvdykjnzp";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
mkdir -p $out/share/doc
cp -R ./ $out/share/doc/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];

View File

@ -1,6 +1,6 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation rec {
name = "python30-docs-html-3.0.1";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0ybjnhg8qfr9kc4axm5xlghkz9dmsg6b1caj6m4gz28q89vggv3c";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
mkdir -p $out/share/doc
cp -R ./ $out/share/doc/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];

View File

@ -1,6 +1,6 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation rec {
name = "python30-docs-pdf-a4-3.0.1";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1qgcydqxxhy317lkzzs2v5as4hcwcblir8y3mdr173qsg51iggra";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
mkdir -p $out/share/doc
cp -R ./ $out/share/doc/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];

View File

@ -1,6 +1,6 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation rec {
name = "python30-docs-pdf-letter-3.0.1";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1x59q0k6fv55vvpsgr5xcq66k5zsd0f142cp6aa4rb6c81i31yml";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
mkdir -p $out/share/doc
cp -R ./ $out/share/doc/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];

View File

@ -1,6 +1,6 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation rec {
name = "python30-docs-text-3.0.1";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "12qlh9ywbnw50wk5siq7lmhr935dd16q3vjbii6gfv0g80b1byzx";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
mkdir -p $out/share/doc
cp -R ./ $out/share/doc/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];

View File

@ -1,6 +1,6 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation rec {
name = "python31-docs-html-3.1.5";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "187shb92218k0i07hj9ak1kqbqjcxkivmwxlzj18v791l7x7qcpz";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
mkdir -p $out/share/doc
cp -R ./ $out/share/doc/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];

View File

@ -1,6 +1,6 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation rec {
name = "python31-docs-pdf-a4-3.1.5";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0kbj6b43gnwlb1czkzmirasmc31j10plq0rlb9s9rh8phqnbmhx1";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
mkdir -p $out/share/doc
cp -R ./ $out/share/doc/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];

View File

@ -1,6 +1,6 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation rec {
name = "python31-docs-pdf-letter-3.1.5";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0s202vrjfa8dnp3vpfjb21bmqym9wyj8jn2glgwjzk63z6fwb60i";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
mkdir -p $out/share/doc
cp -R ./ $out/share/doc/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];

View File

@ -1,6 +1,6 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation rec {
name = "python31-docs-text-3.1.5";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1jsfgfgdi1i2l3lhdk7ss5gwrcg3qhhh8syfrwz8xrv2klmmmn9b";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
mkdir -p $out/share/doc
cp -R ./ $out/share/doc/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];

View File

@ -1,6 +1,6 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation rec {
name = "python32-docs-html-3.2.3";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "058pryg0gn0rlpswkj1z0xvpr39s3ymx3dwqfhhf83w0mlysdm0x";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
mkdir -p $out/share/doc
cp -R ./ $out/share/doc/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];

View File

@ -1,6 +1,6 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation rec {
name = "python32-docs-pdf-a4-3.2.3";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1lw1sbk3nx70k2zxgjc36ryvyzlxndzsvhrxyzdy9sjfhasyd807";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
mkdir -p $out/share/doc
cp -R ./ $out/share/doc/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];

View File

@ -1,6 +1,6 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation rec {
name = "python32-docs-pdf-letter-3.2.3";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "199ibzslw3zrwjd49582vc5q6ghp5ig8zalvslawz0xkz1226wg2";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
mkdir -p $out/share/doc
cp -R ./ $out/share/doc/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];

View File

@ -1,6 +1,6 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation rec {
name = "python32-docs-text-3.2.3";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1jdc9rj2b4vsbvg5mq6vcdfa2b72avhhvjw7rn7k3kl521cvxs09";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
mkdir -p $out/share/doc
cp -R ./ $out/share/doc/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];

View File

@ -1,6 +1,6 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation rec {
name = "python33-docs-html-3.3.0";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0vv24b9qi7gznv687ik0pa2w1rq9grqivy44znvj2ysjfg7mc2c1";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
mkdir -p $out/share/doc
cp -R ./ $out/share/doc/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];

View File

@ -1,6 +1,6 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation rec {
name = "python33-docs-pdf-a4-3.3.0";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1y6n13bxlw8a11khy3ynfbz8z0kpf2lvh32dvy8scyw3hrk6wdxp";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
mkdir -p $out/share/doc
cp -R ./ $out/share/doc/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];

View File

@ -1,6 +1,6 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation rec {
name = "python33-docs-pdf-letter-3.3.0";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0mcj1i47nx81fc9zk1cic4c4p139qjcqlzf4hnnkzvb3jcgy5z6k";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
mkdir -p $out/share/doc
cp -R ./ $out/share/doc/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];

View File

@ -1,6 +1,6 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation rec {
name = "python33-docs-text-3.3.0";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "10vk2fixg1aglqmsf89kn98rlirrbhnrk1285vzfbynf2iavxw0n";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
mkdir -p $out/share/doc
cp -R ./ $out/share/doc/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];

View File

@ -1,85 +1,85 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
let
pythonDocs = {
html = {
python33 = import ./3.3-html.nix {
inherit stdenv fetchurl;
inherit stdenv fetchurl lib;
};
python32 = import ./3.2-html.nix {
inherit stdenv fetchurl;
inherit stdenv fetchurl lib;
};
python31 = import ./3.1-html.nix {
inherit stdenv fetchurl;
inherit stdenv fetchurl lib;
};
python30 = import ./3.0-html.nix {
inherit stdenv fetchurl;
inherit stdenv fetchurl lib;
};
python27 = import ./2.7-html.nix {
inherit stdenv fetchurl;
inherit stdenv fetchurl lib;
};
python26 = import ./2.6-html.nix {
inherit stdenv fetchurl;
inherit stdenv fetchurl lib;
};
};
pdf_a4 = {
python33 = import ./3.3-pdf-a4.nix {
inherit stdenv fetchurl;
inherit stdenv fetchurl lib;
};
python32 = import ./3.2-pdf-a4.nix {
inherit stdenv fetchurl;
inherit stdenv fetchurl lib;
};
python31 = import ./3.1-pdf-a4.nix {
inherit stdenv fetchurl;
inherit stdenv fetchurl lib;
};
python30 = import ./3.0-pdf-a4.nix {
inherit stdenv fetchurl;
inherit stdenv fetchurl lib;
};
python27 = import ./2.7-pdf-a4.nix {
inherit stdenv fetchurl;
inherit stdenv fetchurl lib;
};
python26 = import ./2.6-pdf-a4.nix {
inherit stdenv fetchurl;
inherit stdenv fetchurl lib;
};
};
pdf_letter = {
python33 = import ./3.3-pdf-letter.nix {
inherit stdenv fetchurl;
inherit stdenv fetchurl lib;
};
python32 = import ./3.2-pdf-letter.nix {
inherit stdenv fetchurl;
inherit stdenv fetchurl lib;
};
python31 = import ./3.1-pdf-letter.nix {
inherit stdenv fetchurl;
inherit stdenv fetchurl lib;
};
python30 = import ./3.0-pdf-letter.nix {
inherit stdenv fetchurl;
inherit stdenv fetchurl lib;
};
python27 = import ./2.7-pdf-letter.nix {
inherit stdenv fetchurl;
inherit stdenv fetchurl lib;
};
python26 = import ./2.6-pdf-letter.nix {
inherit stdenv fetchurl;
inherit stdenv fetchurl lib;
};
};
text = {
python33 = import ./3.3-text.nix {
inherit stdenv fetchurl;
inherit stdenv fetchurl lib;
};
python32 = import ./3.2-text.nix {
inherit stdenv fetchurl;
inherit stdenv fetchurl lib;
};
python31 = import ./3.1-text.nix {
inherit stdenv fetchurl;
inherit stdenv fetchurl lib;
};
python30 = import ./3.0-text.nix {
inherit stdenv fetchurl;
inherit stdenv fetchurl lib;
};
python27 = import ./2.7-text.nix {
inherit stdenv fetchurl;
inherit stdenv fetchurl lib;
};
python26 = import ./2.6-text.nix {
inherit stdenv fetchurl;
inherit stdenv fetchurl lib;
};
};
}; in pythonDocs

View File

@ -9,7 +9,7 @@ ${VERSIONS}
cat >default.nix <<EOF
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
let
pythonDocs = {
@ -42,7 +42,7 @@ for type in $TYPES; do
attrname=python${major}${minor}
cat >>default.nix <<EOF
${attrname} = import ./${major}.${minor}-${type}.nix {
inherit stdenv fetchurl;
inherit stdenv fetchurl lib;
};
EOF

View File

@ -1,6 +1,6 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation rec {
name = "pythonMAJORMINOR-docs-TYPE-VERSION";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "SHA";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/${name}
mkdir -p $out/share/doc
cp -R ./ $out/share/doc/${name}
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];

View File

@ -2892,7 +2892,7 @@ let
};
pythonDocs = recurseIntoAttrs (import ../development/interpreters/python/docs {
inherit stdenv fetchurl;
inherit stdenv fetchurl lib;
});
pythonLinkmeWrapper = callPackage ../development/interpreters/python/python-linkme-wrapper.nix { };