Merge remote-tracking branch 'origin/master' into hardened-stdenv

20 files changed, 55 insertions, 401 deletions

diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix
index 96b44ddc17f3..548b7bcecbc7 100644
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@@ -53,8 +53,8 @@ let
     ++ optional zlibSupport zlib;
 
   mkPaths = paths: {
-    C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p.dev or p}/include") paths);
-    LIBRARY_PATH = concatStringsSep ":" (map (p: "${p.lib or (p.out or p)}/lib") paths);
+    C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths;
+    LIBRARY_PATH = makeLibraryPath paths;
   };
 
   # Build the basic Python interpreter without modules that have
@@ -119,7 +119,7 @@ let
       '';
       license = stdenv.lib.licenses.psfl;
       platforms = stdenv.lib.platforms.all;
-      maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric ];
+      maintainers = with stdenv.lib.maintainers; [ chaoflow domenkozar ];
       # If you want to use Python 2.6, remove "broken = true;" at your own
       # risk.  Python 2.6 has known security vulnerabilities is not receiving
       # security updates as of October 2013.
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index f1ae897ea4ac..2e94cb6874e0 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -102,8 +102,8 @@ let
   propagatedBuildInputs = optional stdenv.isDarwin configd;
 
   mkPaths = paths: {
-    C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p.dev or p}/include") paths);
-    LIBRARY_PATH = concatStringsSep ":" (map (p: "${p.lib or (p.out or p)}/lib") paths);
+    C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths;
+    LIBRARY_PATH = makeLibraryPath paths;
   };
 
   # Build the basic Python interpreter without modules that have
@@ -173,7 +173,7 @@ let
       '';
       license = stdenv.lib.licenses.psfl;
       platforms = stdenv.lib.platforms.all;
-      maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric ];
+      maintainers = with stdenv.lib.maintainers; [ chaoflow domenkozar ];
     };
   };
 
diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix
deleted file mode 100644
index c0b5d3401ddd..000000000000
--- a/pkgs/development/interpreters/python/3.2/default.nix
+++ /dev/null
@@ -1,105 +0,0 @@
-{ stdenv, fetchurl
-, bzip2
-, db
-, gdbm
-, libX11, xproto
-, ncurses
-, openssl
-, readline
-, sqlite
-, tcl, tk
-, zlib
-, callPackage
-, self
-}:
-
-assert readline != null -> ncurses != null;
-
-with stdenv.lib;
-
-let
-  majorVersion = "3.2";
-  version = "${majorVersion}.6";
-
-  buildInputs = filter (p: p != null) [
-    zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
-  ];
-in
-stdenv.mkDerivation {
-  name = "python3-${version}";
-  pythonVersion = majorVersion;
-  inherit majorVersion version;
-
-  src = fetchurl {
-    url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
-    sha256 = "1p3vvvh3qw8avq959hdl6bq5d6r7mbhrnigqzgx6mllzh40va4hx";
-  };
-
-  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
-
-  preConfigure = ''
-    for i in /usr /sw /opt /pkg; do	# improve purity
-      substituteInPlace ./setup.py --replace $i /no-such-path
-    done
-    ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''}
-
-    configureFlagsArray=( --enable-shared --with-threads --with-wide-unicode
-                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${p.dev or p}/include") buildInputs)}"
-                          LDFLAGS="${concatStringsSep " " (map (p: "-L${p.lib or (p.out or p)}/lib") buildInputs)}"
-                          LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
-                        )
-  '';
-
-  setupHook = ./setup-hook.sh;
-
-  postInstall = ''
-    # needed for some packages, especially packages that backport functionality
-    # to 2.x from 3.x
-    for item in $out/lib/python${majorVersion}/test/*; do
-      if [[ "$item" != */test_support.py* ]]; then
-        rm -rf "$item"
-      else
-        echo $item
-      fi
-    done
-    touch $out/lib/python${majorVersion}/test/__init__.py
-    ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}"
-    paxmark E $out/bin/python${majorVersion}
-  '';
-
-  passthru = rec {
-    zlibSupport = zlib != null;
-    sqliteSupport = sqlite != null;
-    dbSupport = db != null;
-    buildEnv = callPackage ../wrapper.nix { python = self; };
-    readlineSupport = readline != null;
-    opensslSupport = openssl != null;
-    tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null);
-    libPrefix = "python${majorVersion}";
-    executable = "python3.2m";
-    isPy3 = true;
-    isPy32 = true;
-    is_py3k = true;  # deprecated
-    sitePackages = "lib/${libPrefix}/site-packages";
-    interpreter = "${self}/bin/${executable}";
-  };
-
-  enableParallelBuilding = true;
-
-  meta = {
-    homepage = "http://python.org";
-    description = "a high-level dynamically-typed programming language";
-    longDescription = ''
-      Python is a remarkably powerful dynamic programming language that
-      is used in a wide variety of application domains. Some of its key
-      distinguishing features include: clear, readable syntax; strong
-      introspection capabilities; intuitive object orientation; natural
-      expression of procedural code; full modularity, supporting
-      hierarchical packages; exception-based error handling; and very
-      high level dynamic data types.
-    '';
-    license = stdenv.lib.licenses.psfl;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ simons chaoflow cstrahan ];
-  };
-}
diff --git a/pkgs/development/interpreters/python/3.2/setup-hook.sh b/pkgs/development/interpreters/python/3.2/setup-hook.sh
deleted file mode 100644
index e8215ef9877c..000000000000
--- a/pkgs/development/interpreters/python/3.2/setup-hook.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-addPythonPath() {
-    addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.2/site-packages
-}
-
-toPythonPath() {
-    local paths="$1"
-    local result=
-    for i in $paths; do
-        p="$i/lib/python3.2/site-packages"
-        result="${result}${result:+:}$p"
-    done
-    echo $result
-}
-
-envHooks+=(addPythonPath)
diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix
index a46ef7c056b2..3c4580a061f1 100644
--- a/pkgs/development/interpreters/python/3.3/default.nix
+++ b/pkgs/development/interpreters/python/3.3/default.nix
@@ -32,6 +32,8 @@ stdenv.mkDerivation {
   pythonVersion = majorVersion;
   inherit majorVersion version;
 
+  inherit buildInputs;
+
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
     sha256 = "0gsxpgd5p4mwd01gw501vsyahncyw3h9836ypkr3y32kgazy89jj";
@@ -46,8 +48,8 @@ stdenv.mkDerivation {
     ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''}
 
     configureFlagsArray=( --enable-shared --with-threads
-                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${p.dev or p}/include") buildInputs)}"
-                          LDFLAGS="${concatStringsSep " " (map (p: "-L${p.lib or (p.out or p)}/lib") buildInputs)}"
+                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}"
+                          LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}"
                           LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
                         )
   '';
@@ -102,6 +104,6 @@ stdenv.mkDerivation {
     '';
     license = stdenv.lib.licenses.psfl;
     platforms = with stdenv.lib.platforms; linux ++ darwin;
-    maintainers = with stdenv.lib.maintainers; [ simons chaoflow cstrahan ];
+    maintainers = with stdenv.lib.maintainers; [ chaoflow cstrahan ];
   };
 }
diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix
index 8d87c6abfbb4..b36eda67867b 100644
--- a/pkgs/development/interpreters/python/3.4/default.nix
+++ b/pkgs/development/interpreters/python/3.4/default.nix
@@ -27,24 +27,36 @@ let
   fullVersion = "${version}";
 
   buildInputs = filter (p: p != null) [
-    zlib bzip2 lzma gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
-  ];
+    zlib
+    bzip2
+    lzma
+    gdbm
+    sqlite
+    db
+    readline
+    ncurses
+    openssl
+    tcl
+    tk
+    libX11
+    xproto
+  ] ++ optionals stdenv.isDarwin [ CF configd ];
 in
 stdenv.mkDerivation {
   name = "python3-${fullVersion}";
   pythonVersion = majorVersion;
   inherit majorVersion version;
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CF configd ];
+  inherit buildInputs;
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz";
     sha256 = "18kb5c29w04rj4gyz3jngm72sy8izfnbjlm6ajv6rv2m061d75x7";
   };
 
-  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
+  NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";
 
-  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  prePatch = optionalString stdenv.isDarwin ''
     substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
   '';
 
@@ -58,8 +70,8 @@ stdenv.mkDerivation {
      ''}
 
     configureFlagsArray=( --enable-shared --with-threads
-                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${p.dev or p}/include") buildInputs)}"
-                          LDFLAGS="${concatStringsSep " " (map (p: "-L${p.lib or (p.out or p)}/lib") buildInputs)}"
+                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}"
+                          LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}"
                           LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
                         )
   '';
@@ -113,8 +125,8 @@ stdenv.mkDerivation {
       hierarchical packages; exception-based error handling; and very
       high level dynamic data types.
     '';
-    license = stdenv.lib.licenses.psfl;
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
-    maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric cstrahan ];
+    license = licenses.psfl;
+    platforms = with platforms; linux ++ darwin;
+    maintainers = with maintainers; [ chaoflow domenkozar cstrahan ];
   };
 }
diff --git a/pkgs/development/interpreters/python/3.5/default.nix b/pkgs/development/interpreters/python/3.5/default.nix
index 4bc39f4c2b3a..087b5988e26a 100644
--- a/pkgs/development/interpreters/python/3.5/default.nix
+++ b/pkgs/development/interpreters/python/3.5/default.nix
@@ -27,24 +27,36 @@ let
   fullVersion = "${version}";
 
   buildInputs = filter (p: p != null) [
-    zlib bzip2 lzma gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
-  ];
+    zlib
+    bzip2
+    lzma
+    gdbm
+    sqlite
+    db
+    readline
+    ncurses
+    openssl
+    tcl
+    tk
+    libX11
+    xproto
+  ] ++ optionals stdenv.isDarwin [ CF configd ];
 in
 stdenv.mkDerivation {
   name = "python3-${fullVersion}";
   pythonVersion = majorVersion;
   inherit majorVersion version;
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CF configd ];
+  inherit buildInputs;
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz";
     sha256 = "1j95yx32ggqx8jf13h3c8qfp34ixpyg8ipqcdjmn143d6q67rmf6";
   };
 
-  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
+  NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";
 
-  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  prePatch = optionalString stdenv.isDarwin ''
     substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
   '';
 
@@ -58,8 +70,8 @@ stdenv.mkDerivation {
      ''}
 
     configureFlagsArray=( --enable-shared --with-threads
-                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${p.dev or p}/include") buildInputs)}"
-                          LDFLAGS="${concatStringsSep " " (map (p: "-L${p.lib or (p.out or p)}/lib") buildInputs)}"
+                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}"
+                          LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}"
                           LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
                         )
   '';
@@ -113,8 +125,8 @@ stdenv.mkDerivation {
       hierarchical packages; exception-based error handling; and very
       high level dynamic data types.
     '';
-    license = stdenv.lib.licenses.psfl;
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
-    maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric cstrahan ];
+    license = licenses.psfl;
+    platforms = with platforms; linux ++ darwin;
+    maintainers = with maintainers; [ chaoflow domenkozar cstrahan ];
   };
 }
diff --git a/pkgs/development/interpreters/python/docs/3.0-html.nix b/pkgs/development/interpreters/python/docs/3.0-html.nix
deleted file mode 100644
index fb793da3e5ff..000000000000
--- a/pkgs/development/interpreters/python/docs/3.0-html.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was generated and will be overwritten by ./generate.sh
-
-{ stdenv, fetchurl, lib }:
-
-stdenv.mkDerivation rec {
-  name = "python30-docs-html-3.0.1";
-  src = fetchurl {
-    url = http://docs.python.org/ftp/python/doc/3.0.1/python-3.0.1-docs-html.tar.bz2;
-    sha256 = "0ybjnhg8qfr9kc4axm5xlghkz9dmsg6b1caj6m4gz28q89vggv3c";
-  };
-  installPhase = ''
-    mkdir -p $out/share/doc/python30
-    cp -R ./ $out/share/doc/python30/html
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.chaoflow ];
-  };
-}
diff --git a/pkgs/development/interpreters/python/docs/3.0-pdf-a4.nix b/pkgs/development/interpreters/python/docs/3.0-pdf-a4.nix
deleted file mode 100644
index e4b185a11c6b..000000000000
--- a/pkgs/development/interpreters/python/docs/3.0-pdf-a4.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was generated and will be overwritten by ./generate.sh
-
-{ stdenv, fetchurl, lib }:
-
-stdenv.mkDerivation rec {
-  name = "python30-docs-pdf-a4-3.0.1";
-  src = fetchurl {
-    url = http://docs.python.org/ftp/python/doc/3.0.1/python-3.0.1-docs-pdf-a4.tar.bz2;
-    sha256 = "1qgcydqxxhy317lkzzs2v5as4hcwcblir8y3mdr173qsg51iggra";
-  };
-  installPhase = ''
-    mkdir -p $out/share/doc/python30
-    cp -R ./ $out/share/doc/python30/pdf-a4
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.chaoflow ];
-  };
-}
diff --git a/pkgs/development/interpreters/python/docs/3.0-pdf-letter.nix b/pkgs/development/interpreters/python/docs/3.0-pdf-letter.nix
deleted file mode 100644
index 1373ae21284b..000000000000
--- a/pkgs/development/interpreters/python/docs/3.0-pdf-letter.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was generated and will be overwritten by ./generate.sh
-
-{ stdenv, fetchurl, lib }:
-
-stdenv.mkDerivation rec {
-  name = "python30-docs-pdf-letter-3.0.1";
-  src = fetchurl {
-    url = http://docs.python.org/ftp/python/doc/3.0.1/python-3.0.1-docs-pdf-letter.tar.bz2;
-    sha256 = "1x59q0k6fv55vvpsgr5xcq66k5zsd0f142cp6aa4rb6c81i31yml";
-  };
-  installPhase = ''
-    mkdir -p $out/share/doc/python30
-    cp -R ./ $out/share/doc/python30/pdf-letter
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.chaoflow ];
-  };
-}
diff --git a/pkgs/development/interpreters/python/docs/3.0-text.nix b/pkgs/development/interpreters/python/docs/3.0-text.nix
deleted file mode 100644
index c37fa99f7c5b..000000000000
--- a/pkgs/development/interpreters/python/docs/3.0-text.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was generated and will be overwritten by ./generate.sh
-
-{ stdenv, fetchurl, lib }:
-
-stdenv.mkDerivation rec {
-  name = "python30-docs-text-3.0.1";
-  src = fetchurl {
-    url = http://docs.python.org/ftp/python/doc/3.0.1/python-3.0.1-docs-text.tar.bz2;
-    sha256 = "12qlh9ywbnw50wk5siq7lmhr935dd16q3vjbii6gfv0g80b1byzx";
-  };
-  installPhase = ''
-    mkdir -p $out/share/doc/python30
-    cp -R ./ $out/share/doc/python30/text
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.chaoflow ];
-  };
-}
diff --git a/pkgs/development/interpreters/python/docs/3.1-html.nix b/pkgs/development/interpreters/python/docs/3.1-html.nix
deleted file mode 100644
index 625aa181c63f..000000000000
--- a/pkgs/development/interpreters/python/docs/3.1-html.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was generated and will be overwritten by ./generate.sh
-
-{ stdenv, fetchurl, lib }:
-
-stdenv.mkDerivation rec {
-  name = "python31-docs-html-3.1.5";
-  src = fetchurl {
-    url = http://docs.python.org/ftp/python/doc/3.1.5/python-3.1.5-docs-html.tar.bz2;
-    sha256 = "187shb92218k0i07hj9ak1kqbqjcxkivmwxlzj18v791l7x7qcpz";
-  };
-  installPhase = ''
-    mkdir -p $out/share/doc/python31
-    cp -R ./ $out/share/doc/python31/html
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.chaoflow ];
-  };
-}
diff --git a/pkgs/development/interpreters/python/docs/3.1-pdf-a4.nix b/pkgs/development/interpreters/python/docs/3.1-pdf-a4.nix
deleted file mode 100644
index 564103dd101a..000000000000
--- a/pkgs/development/interpreters/python/docs/3.1-pdf-a4.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was generated and will be overwritten by ./generate.sh
-
-{ stdenv, fetchurl, lib }:
-
-stdenv.mkDerivation rec {
-  name = "python31-docs-pdf-a4-3.1.5";
-  src = fetchurl {
-    url = http://docs.python.org/ftp/python/doc/3.1.5/python-3.1.5-docs-pdf-a4.tar.bz2;
-    sha256 = "0kbj6b43gnwlb1czkzmirasmc31j10plq0rlb9s9rh8phqnbmhx1";
-  };
-  installPhase = ''
-    mkdir -p $out/share/doc/python31
-    cp -R ./ $out/share/doc/python31/pdf-a4
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.chaoflow ];
-  };
-}
diff --git a/pkgs/development/interpreters/python/docs/3.1-pdf-letter.nix b/pkgs/development/interpreters/python/docs/3.1-pdf-letter.nix
deleted file mode 100644
index d6e3009f59c9..000000000000
--- a/pkgs/development/interpreters/python/docs/3.1-pdf-letter.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was generated and will be overwritten by ./generate.sh
-
-{ stdenv, fetchurl, lib }:
-
-stdenv.mkDerivation rec {
-  name = "python31-docs-pdf-letter-3.1.5";
-  src = fetchurl {
-    url = http://docs.python.org/ftp/python/doc/3.1.5/python-3.1.5-docs-pdf-letter.tar.bz2;
-    sha256 = "0s202vrjfa8dnp3vpfjb21bmqym9wyj8jn2glgwjzk63z6fwb60i";
-  };
-  installPhase = ''
-    mkdir -p $out/share/doc/python31
-    cp -R ./ $out/share/doc/python31/pdf-letter
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.chaoflow ];
-  };
-}
diff --git a/pkgs/development/interpreters/python/docs/3.1-text.nix b/pkgs/development/interpreters/python/docs/3.1-text.nix
deleted file mode 100644
index 3ce559e3ecc5..000000000000
--- a/pkgs/development/interpreters/python/docs/3.1-text.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was generated and will be overwritten by ./generate.sh
-
-{ stdenv, fetchurl, lib }:
-
-stdenv.mkDerivation rec {
-  name = "python31-docs-text-3.1.5";
-  src = fetchurl {
-    url = http://docs.python.org/ftp/python/doc/3.1.5/python-3.1.5-docs-text.tar.bz2;
-    sha256 = "1jsfgfgdi1i2l3lhdk7ss5gwrcg3qhhh8syfrwz8xrv2klmmmn9b";
-  };
-  installPhase = ''
-    mkdir -p $out/share/doc/python31
-    cp -R ./ $out/share/doc/python31/text
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.chaoflow ];
-  };
-}
diff --git a/pkgs/development/interpreters/python/docs/3.2-html.nix b/pkgs/development/interpreters/python/docs/3.2-html.nix
deleted file mode 100644
index 146901005489..000000000000
--- a/pkgs/development/interpreters/python/docs/3.2-html.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was generated and will be overwritten by ./generate.sh
-
-{ stdenv, fetchurl, lib }:
-
-stdenv.mkDerivation rec {
-  name = "python32-docs-html-3.2.3";
-  src = fetchurl {
-    url = http://docs.python.org/ftp/python/doc/3.2.3/python-3.2.3-docs-html.tar.bz2;
-    sha256 = "058pryg0gn0rlpswkj1z0xvpr39s3ymx3dwqfhhf83w0mlysdm0x";
-  };
-  installPhase = ''
-    mkdir -p $out/share/doc/python32
-    cp -R ./ $out/share/doc/python32/html
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.chaoflow ];
-  };
-}
diff --git a/pkgs/development/interpreters/python/docs/3.2-pdf-a4.nix b/pkgs/development/interpreters/python/docs/3.2-pdf-a4.nix
deleted file mode 100644
index 729101b2d012..000000000000
--- a/pkgs/development/interpreters/python/docs/3.2-pdf-a4.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was generated and will be overwritten by ./generate.sh
-
-{ stdenv, fetchurl, lib }:
-
-stdenv.mkDerivation rec {
-  name = "python32-docs-pdf-a4-3.2.3";
-  src = fetchurl {
-    url = http://docs.python.org/ftp/python/doc/3.2.3/python-3.2.3-docs-pdf-a4.tar.bz2;
-    sha256 = "1lw1sbk3nx70k2zxgjc36ryvyzlxndzsvhrxyzdy9sjfhasyd807";
-  };
-  installPhase = ''
-    mkdir -p $out/share/doc/python32
-    cp -R ./ $out/share/doc/python32/pdf-a4
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.chaoflow ];
-  };
-}
diff --git a/pkgs/development/interpreters/python/docs/3.2-pdf-letter.nix b/pkgs/development/interpreters/python/docs/3.2-pdf-letter.nix
deleted file mode 100644
index da9b0ce4dccb..000000000000
--- a/pkgs/development/interpreters/python/docs/3.2-pdf-letter.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was generated and will be overwritten by ./generate.sh
-
-{ stdenv, fetchurl, lib }:
-
-stdenv.mkDerivation rec {
-  name = "python32-docs-pdf-letter-3.2.3";
-  src = fetchurl {
-    url = http://docs.python.org/ftp/python/doc/3.2.3/python-3.2.3-docs-pdf-letter.tar.bz2;
-    sha256 = "199ibzslw3zrwjd49582vc5q6ghp5ig8zalvslawz0xkz1226wg2";
-  };
-  installPhase = ''
-    mkdir -p $out/share/doc/python32
-    cp -R ./ $out/share/doc/python32/pdf-letter
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.chaoflow ];
-  };
-}
diff --git a/pkgs/development/interpreters/python/docs/3.2-text.nix b/pkgs/development/interpreters/python/docs/3.2-text.nix
deleted file mode 100644
index 3ceef2431f73..000000000000
--- a/pkgs/development/interpreters/python/docs/3.2-text.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was generated and will be overwritten by ./generate.sh
-
-{ stdenv, fetchurl, lib }:
-
-stdenv.mkDerivation rec {
-  name = "python32-docs-text-3.2.3";
-  src = fetchurl {
-    url = http://docs.python.org/ftp/python/doc/3.2.3/python-3.2.3-docs-text.tar.bz2;
-    sha256 = "1jdc9rj2b4vsbvg5mq6vcdfa2b72avhhvjw7rn7k3kl521cvxs09";
-  };
-  installPhase = ''
-    mkdir -p $out/share/doc/python32
-    cp -R ./ $out/share/doc/python32/text
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.chaoflow ];
-  };
-}
diff --git a/pkgs/development/interpreters/python/docs/default.nix b/pkgs/development/interpreters/python/docs/default.nix
index 16ade3af3f95..8f5fc810fb71 100644
--- a/pkgs/development/interpreters/python/docs/default.nix
+++ b/pkgs/development/interpreters/python/docs/default.nix
@@ -7,15 +7,6 @@ pythonDocs = {
     python33 = import ./3.3-html.nix {
       inherit stdenv fetchurl lib;
     };
-    python32 = import ./3.2-html.nix {
-      inherit stdenv fetchurl lib;
-    };
-    python31 = import ./3.1-html.nix {
-      inherit stdenv fetchurl lib;
-    };
-    python30 = import ./3.0-html.nix {
-      inherit stdenv fetchurl lib;
-    };
     python27 = import ./2.7-html.nix {
       inherit stdenv fetchurl lib;
     };
@@ -28,15 +19,6 @@ pythonDocs = {
     python33 = import ./3.3-pdf-a4.nix {
       inherit stdenv fetchurl lib;
     };
-    python32 = import ./3.2-pdf-a4.nix {
-      inherit stdenv fetchurl lib;
-    };
-    python31 = import ./3.1-pdf-a4.nix {
-      inherit stdenv fetchurl lib;
-    };
-    python30 = import ./3.0-pdf-a4.nix {
-      inherit stdenv fetchurl lib;
-    };
     python27 = import ./2.7-pdf-a4.nix {
       inherit stdenv fetchurl lib;
     };
@@ -49,15 +31,6 @@ pythonDocs = {
     python33 = import ./3.3-pdf-letter.nix {
       inherit stdenv fetchurl lib;
     };
-    python32 = import ./3.2-pdf-letter.nix {
-      inherit stdenv fetchurl lib;
-    };
-    python31 = import ./3.1-pdf-letter.nix {
-      inherit stdenv fetchurl lib;
-    };
-    python30 = import ./3.0-pdf-letter.nix {
-      inherit stdenv fetchurl lib;
-    };
     python27 = import ./2.7-pdf-letter.nix {
       inherit stdenv fetchurl lib;
     };
@@ -70,15 +43,6 @@ pythonDocs = {
     python33 = import ./3.3-text.nix {
       inherit stdenv fetchurl lib;
     };
-    python32 = import ./3.2-text.nix {
-      inherit stdenv fetchurl lib;
-    };
-    python31 = import ./3.1-text.nix {
-      inherit stdenv fetchurl lib;
-    };
-    python30 = import ./3.0-text.nix {
-      inherit stdenv fetchurl lib;
-    };
     python27 = import ./2.7-text.nix {
       inherit stdenv fetchurl lib;
     };