pythonDocs: add meta.maintainers, subgroup attrset by doctype

pkgs/development/interpreters/python/docs/2.6-html.nix

@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }

pkgs/development/interpreters/python/docs/2.6-pdf-a4.nix

@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }

pkgs/development/interpreters/python/docs/2.6-pdf-letter.nix

@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }

pkgs/development/interpreters/python/docs/2.6-text.nix

@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }

pkgs/development/interpreters/python/docs/2.7-html.nix

@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }

pkgs/development/interpreters/python/docs/2.7-pdf-a4.nix

@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }

pkgs/development/interpreters/python/docs/2.7-pdf-letter.nix

@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }

pkgs/development/interpreters/python/docs/2.7-text.nix

@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }

pkgs/development/interpreters/python/docs/3.0-html.nix

@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }

pkgs/development/interpreters/python/docs/3.0-pdf-a4.nix

@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }

pkgs/development/interpreters/python/docs/3.0-pdf-letter.nix

@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }

pkgs/development/interpreters/python/docs/3.0-text.nix

@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }

pkgs/development/interpreters/python/docs/3.1-html.nix

@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }

pkgs/development/interpreters/python/docs/3.1-pdf-a4.nix

@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }

pkgs/development/interpreters/python/docs/3.1-pdf-letter.nix

@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }

pkgs/development/interpreters/python/docs/3.1-text.nix

@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }

pkgs/development/interpreters/python/docs/3.2-html.nix

@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }

pkgs/development/interpreters/python/docs/3.2-pdf-a4.nix

@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }

pkgs/development/interpreters/python/docs/3.2-pdf-letter.nix

@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }

pkgs/development/interpreters/python/docs/3.2-text.nix

@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }

pkgs/development/interpreters/python/docs/3.3-html.nix

@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }

pkgs/development/interpreters/python/docs/3.3-pdf-a4.nix

@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }

pkgs/development/interpreters/python/docs/3.3-pdf-letter.nix

@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }

pkgs/development/interpreters/python/docs/3.3-text.nix

@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }

pkgs/development/interpreters/python/docs/default.nix

@@ -2,76 +2,84 @@
 
 let
 pythonDocs = {
-  python33_html = import ./3.3-html.nix {
+  html = {
-    inherit stdenv fetchurl;
+    python33 = import ./3.3-html.nix {
+      inherit stdenv fetchurl;
+    };
+    python32 = import ./3.2-html.nix {
+      inherit stdenv fetchurl;
+    };
+    python31 = import ./3.1-html.nix {
+      inherit stdenv fetchurl;
+    };
+    python30 = import ./3.0-html.nix {
+      inherit stdenv fetchurl;
+    };
+    python27 = import ./2.7-html.nix {
+      inherit stdenv fetchurl;
+    };
+    python26 = import ./2.6-html.nix {
+      inherit stdenv fetchurl;
+    };
   };
-  python33_pdf_a4 = import ./3.3-pdf-a4.nix {
+  pdf_a4 = {
-    inherit stdenv fetchurl;
+    python33 = import ./3.3-pdf-a4.nix {
+      inherit stdenv fetchurl;
+    };
+    python32 = import ./3.2-pdf-a4.nix {
+      inherit stdenv fetchurl;
+    };
+    python31 = import ./3.1-pdf-a4.nix {
+      inherit stdenv fetchurl;
+    };
+    python30 = import ./3.0-pdf-a4.nix {
+      inherit stdenv fetchurl;
+    };
+    python27 = import ./2.7-pdf-a4.nix {
+      inherit stdenv fetchurl;
+    };
+    python26 = import ./2.6-pdf-a4.nix {
+      inherit stdenv fetchurl;
+    };
   };
-  python33_pdf_letter = import ./3.3-pdf-letter.nix {
+  pdf_letter = {
-    inherit stdenv fetchurl;
+    python33 = import ./3.3-pdf-letter.nix {
+      inherit stdenv fetchurl;
+    };
+    python32 = import ./3.2-pdf-letter.nix {
+      inherit stdenv fetchurl;
+    };
+    python31 = import ./3.1-pdf-letter.nix {
+      inherit stdenv fetchurl;
+    };
+    python30 = import ./3.0-pdf-letter.nix {
+      inherit stdenv fetchurl;
+    };
+    python27 = import ./2.7-pdf-letter.nix {
+      inherit stdenv fetchurl;
+    };
+    python26 = import ./2.6-pdf-letter.nix {
+      inherit stdenv fetchurl;
+    };
   };
-  python33_text = import ./3.3-text.nix {
+  text = {
-    inherit stdenv fetchurl;
+    python33 = import ./3.3-text.nix {
-  };
+      inherit stdenv fetchurl;
-  python32_html = import ./3.2-html.nix {
+    };
-    inherit stdenv fetchurl;
+    python32 = import ./3.2-text.nix {
-  };
+      inherit stdenv fetchurl;
-  python32_pdf_a4 = import ./3.2-pdf-a4.nix {
+    };
-    inherit stdenv fetchurl;
+    python31 = import ./3.1-text.nix {
-  };
+      inherit stdenv fetchurl;
-  python32_pdf_letter = import ./3.2-pdf-letter.nix {
+    };
-    inherit stdenv fetchurl;
+    python30 = import ./3.0-text.nix {
-  };
+      inherit stdenv fetchurl;
-  python32_text = import ./3.2-text.nix {
+    };
-    inherit stdenv fetchurl;
+    python27 = import ./2.7-text.nix {
-  };
+      inherit stdenv fetchurl;
-  python31_html = import ./3.1-html.nix {
+    };
-    inherit stdenv fetchurl;
+    python26 = import ./2.6-text.nix {
-  };
+      inherit stdenv fetchurl;
-  python31_pdf_a4 = import ./3.1-pdf-a4.nix {
+    };
-    inherit stdenv fetchurl;
-  };
-  python31_pdf_letter = import ./3.1-pdf-letter.nix {
-    inherit stdenv fetchurl;
-  };
-  python31_text = import ./3.1-text.nix {
-    inherit stdenv fetchurl;
-  };
-  python30_html = import ./3.0-html.nix {
-    inherit stdenv fetchurl;
-  };
-  python30_pdf_a4 = import ./3.0-pdf-a4.nix {
-    inherit stdenv fetchurl;
-  };
-  python30_pdf_letter = import ./3.0-pdf-letter.nix {
-    inherit stdenv fetchurl;
-  };
-  python30_text = import ./3.0-text.nix {
-    inherit stdenv fetchurl;
-  };
-  python27_html = import ./2.7-html.nix {
-    inherit stdenv fetchurl;
-  };
-  python27_pdf_a4 = import ./2.7-pdf-a4.nix {
-    inherit stdenv fetchurl;
-  };
-  python27_pdf_letter = import ./2.7-pdf-letter.nix {
-    inherit stdenv fetchurl;
-  };
-  python27_text = import ./2.7-text.nix {
-    inherit stdenv fetchurl;
-  };
-  python26_html = import ./2.6-html.nix {
-    inherit stdenv fetchurl;
-  };
-  python26_pdf_a4 = import ./2.6-pdf-a4.nix {
-    inherit stdenv fetchurl;
-  };
-  python26_pdf_letter = import ./2.6-pdf-letter.nix {
-    inherit stdenv fetchurl;
-  };
-  python26_text = import ./2.6-text.nix {
-    inherit stdenv fetchurl;
   };
 }; in pythonDocs

pkgs/development/interpreters/python/docs/generate.sh

@@ -15,8 +15,9 @@ let
 pythonDocs = {
 EOF
 
-for version in $VERSIONS; do
+for type in $TYPES; do
-    for type in $TYPES; do
+    echo "  ${type/-/_} = {" >> default.nix
+    for version in $VERSIONS; do
         major=$(echo -n ${version}| cut -d. -f1)
         minor=$(echo -n ${version}| cut -d. -f2)
         outfile=${major}.${minor}-${type}.nix
@@ -38,16 +39,17 @@ for version in $VERSIONS; do
             -e "s,URL,${url}," \
             -e "s,SHA,${sha}," < template.nix > ${outfile}
 
-        attrname=python${major}${minor}_$(echo -n ${type} |sed -e "s,-,_,g")
+        attrname=python${major}${minor}
         cat >>default.nix <<EOF
-  ${attrname} = import ./${major}.${minor}-${type}.nix {
+    ${attrname} = import ./${major}.${minor}-${type}.nix {
-    inherit stdenv fetchurl;
+      inherit stdenv fetchurl;
-  };
+    };
 EOF
 
         echo "done."
         echo
     done
+    echo "  };" >> default.nix
 done
 
 echo "}; in pythonDocs" >> default.nix

pkgs/development/interpreters/python/docs/template.nix

@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }