nix: updated to 18.03 packages.

- new nix structure
- adjusted build problems
- new generated python-packages.nix
- drop setuptools
- release.nix update

pkgs/README.rst

@@ -0,0 +1,28 b''
+
+==============================
+ Generate the Nix expressions
+==============================
+
+Details can be found in the repository of `RhodeCode Enterprise CE`_ inside of
+the file `docs/contributing/dependencies.rst`.
+
+Start the environment as follows:
+
+.. code:: shell
+
+   nix-shell pkgs/shell-generate.nix
+
+
+Python dependencies
+===================
+
+.. code:: shell
+
+   pip2nix generate --licenses
+   # or faster
+   nix-shell pkgs/shell-generate.nix --command "pip2nix generate --licenses"
+
+
+.. Links
+
+.. _RhodeCode Enterprise CE: https://code.rhodecode.com/rhodecode-enterprise-ce

pkgs/nix-common/pip2nix.nix

@@ -0,0 +1,17 b''
+{ pkgs
+, pythonPackages
+}:
+
+rec {
+  pip2nix-src = pkgs.fetchzip {
+    url = https://github.com/johbo/pip2nix/archive/51e6fdae34d0e8ded9efeef7a8601730249687a6.tar.gz;
+    sha256 = "02a4jjgi7lsvf8mhrxsd56s9a3yg20081rl9bgc2m84w60v2gbz2";
+  };
+
+  pip2nix = import pip2nix-src {
+    inherit
+      pkgs
+      pythonPackages;
+  };
+
+}

pkgs/overlays.nix

@@ -0,0 +1,37 b''
+self: super: {
+  # bump GIT version
+  git = super.lib.overrideDerivation super.git (oldAttrs: {
+    name = "git-2.16.4";
+    src = self.fetchurl {
+      url = "https://www.kernel.org/pub/software/scm/git/git-2.16.4.tar.xz";
+      sha256 = "0cnmidjvbdf81mybcvxvl0c2r2x2nvq2jj2dl59dmrc7qklv0sbf";
+    };
+
+    patches = [
+      ./git_patches/docbook2texi.patch
+      ./git_patches/symlinks-in-bin.patch
+      ./git_patches/git-sh-i18n.patch
+      ./git_patches/ssh-path.patch
+    ];
+
+  });
+
+  # Override subversion derivation to
+  #  - activate python bindings
+  subversion =
+  let
+    subversionWithPython = super.subversion.override {
+      httpSupport = true;
+      pythonBindings = true;
+      python = self.python27Packages.python;
+    };
+  in
+    super.lib.overrideDerivation subversionWithPython (oldAttrs: {
+      name = "subversion-1.9.7";
+      src = self.fetchurl {
+        url = "https://www.apache.org/dist/subversion/subversion-1.9.7.tar.gz";
+        sha256 = "0g3cs2h008z8ymgkhbk54jp87bjh7y049rn42igj881yi2f20an7";
+      };
+  });
+
+}

pkgs/shell-generate.nix

@@ -0,0 +1,41 b''
+{ pkgs ? (import <nixpkgs> {})
+, pythonPackages ? "python27Packages"
+}:
+
+with pkgs.lib;
+
+let _pythonPackages = pythonPackages; in
+let
+  pythonPackages = getAttr _pythonPackages pkgs;
+
+  pip2nix = import ./nix-common/pip2nix.nix {
+    inherit
+      pkgs
+      pythonPackages;
+  };
+
+in
+
+pkgs.stdenv.mkDerivation {
+  name = "pip2nix-generated";
+  buildInputs = [
+    pip2nix.pip2nix
+    pythonPackages.pip-tools
+    pkgs.apr
+    pkgs.aprutil
+  ];
+
+  shellHook = ''
+    runHook preShellHook
+    echo "Setting SVN_* variables"
+    export SVN_LIBRARY_PATH=${pkgs.subversion}/lib
+    export SVN_HEADER_PATH=${pkgs.subversion.dev}/include
+    runHook postShellHook
+  '';
+
+  preShellHook = ''
+    echo "Starting Generate Shell"
+    # Custom prompt to distinguish from other dev envs.
+    export PS1="\n\[\033[1;32m\][Generate-shell:\w]$\[\033[0m\] "
+  '';
+}

default.nix

@@ -4,163 +4,168 b''
 # derivation. For advanced tweaks to pimp up the development environment we use
 # "shell.nix" so that it does not have to clutter this file.
 
-{ pkgs ? (import <nixpkgs> {})
-, pythonPackages ? "python27Packages"
+args@
+{ pythonPackages ? "python27Packages"
 , pythonExternalOverrides ? self: super: {}
-, doCheck ? true
+, doCheck ? false
+, ...
 }:
 
-let pkgs_ = pkgs; in
+let pkgs_ = (import <nixpkgs> {}); in
 
 let
-  pkgs = pkgs_.overridePackages (self: super: {
-    # bump GIT version
-    git = pkgs.lib.overrideDerivation pkgs_.git (oldAttrs: {
-      name = "git-2.16.4";
-      src = pkgs.fetchurl {
-        url = "https://www.kernel.org/pub/software/scm/git/git-2.16.4.tar.xz";
-        sha256 = "0cnmidjvbdf81mybcvxvl0c2r2x2nvq2jj2dl59dmrc7qklv0sbf";
-      };
-
-      patches = [
-        ./pkgs/git_patches/docbook2texi.patch
-        ./pkgs/git_patches/symlinks-in-bin.patch
-        ./pkgs/git_patches/git-sh-i18n.patch
-        ./pkgs/git_patches/ssh-path.patch
-      ];
-
-    });
 
-    # Override subversion derivation to
-    #  - activate python bindings
-    subversion = let
-      subversionWithPython = super.subversion.override {
-        httpSupport = true;
-        pythonBindings = true;
-        python = self.python27Packages.python;
-      };
-
-    in
+  # TODO: Currently we ignore the passed in pkgs, instead we should use it
+  # somehow as a base and apply overlays to it.
+  pkgs = import <nixpkgs> {
+    overlays = [
+      (import ./pkgs/overlays.nix)
+    ];
+    inherit (pkgs_)
+      system;
+  };
 
-    pkgs.lib.overrideDerivation subversionWithPython (oldAttrs: {
-      name = "subversion-1.9.7";
-      src = pkgs.fetchurl {
-        url = "https://www.apache.org/dist/subversion/subversion-1.9.7.tar.gz";
-        sha256 = "0g3cs2h008z8ymgkhbk54jp87bjh7y049rn42igj881yi2f20an7";
-      };
-
-    });
-
-  });
+  # Works with the new python-packages, still can fallback to the old
+  # variant.
+  basePythonPackagesUnfix = basePythonPackages.__unfix__ or (
+    self: basePythonPackages.override (a: { inherit self; }));
 
-  inherit (pkgs.lib) fix extends;
-  basePythonPackages = with builtins; if isAttrs pythonPackages
-    then pythonPackages
-    else getAttr pythonPackages pkgs;
+  # Evaluates to the last segment of a file system path.
+  basename = path: with pkgs.lib; last (splitString "/" path);
 
-  elem = builtins.elem;
-  basename = path: with pkgs.lib; last (splitString "/" path);
-  startsWith = prefix: full: let
-    actualPrefix = builtins.substring 0 (builtins.stringLength prefix) full;
-  in actualPrefix == prefix;
-
+  # source code filter used as arugment to builtins.filterSource.
   src-filter = path: type: with pkgs.lib;
     let
       ext = last (splitString "." path);
     in
-      !elem (basename path) [".hg" ".git" "__pycache__" ".eggs"
-        "node_modules" "build" "data" "tmp"] &&
-      !elem ext ["egg-info" "pyc"] &&
-      !startsWith "result" path;
+      !builtins.elem (basename path) [
+        ".git" ".hg" "__pycache__" ".eggs" ".idea" ".dev"
+        "bower_components" "node_modules"
+        "build" "data" "result" "tmp"] &&
+      !builtins.elem ext ["egg-info" "pyc"] &&
+      # TODO: johbo: This check is wrong, since "path" contains an absolute path,
+      # it would still be good to restore it since we want to ignore "result-*".
+      !hasPrefix "result" path;
 
+  sources =
+    let
+      inherit (pkgs.lib) all isString attrValues;
+      sourcesConfig = pkgs.config.rc.sources or {};
+    in
+      # Ensure that sources are configured as strings. Using a path
+      # would result in a copy into the nix store.
+      assert all isString (attrValues sourcesConfig);
+      sourcesConfig;
+
+  version = builtins.readFile "${rhodecode-vcsserver-src}/vcsserver/VERSION";
   rhodecode-vcsserver-src = builtins.filterSource src-filter ./.;
 
-  pythonGeneratedPackages = self: basePythonPackages.override (a: {
-    inherit self;
-  }) // (scopedImport {
-    self = self;
-    super = basePythonPackages;
-    inherit pkgs;
-    inherit (pkgs) fetchurl fetchgit;
-  } ./pkgs/python-packages.nix);
-
-  pythonOverrides = import ./pkgs/python-packages-overrides.nix {
-    inherit basePythonPackages pkgs;
-  };
-
-  version = builtins.readFile ./vcsserver/VERSION;
-
   pythonLocalOverrides = self: super: {
-    rhodecode-vcsserver = super.rhodecode-vcsserver.override (attrs: {
-      inherit doCheck version;
+    rhodecode-vcsserver =
+      let
+        releaseName = "RhodeCodeVCSServer-${version}";
+      in super.rhodecode-vcsserver.override (attrs: {
+      inherit
+        doCheck
+        version;
 
       name = "rhodecode-vcsserver-${version}";
-      releaseName = "RhodeCodeVCSServer-${version}";
+      releaseName = releaseName;
       src = rhodecode-vcsserver-src;
       dontStrip = true; # prevent strip, we don't need it.
 
-      propagatedBuildInputs = attrs.propagatedBuildInputs ++ ([
-        pkgs.git
-        pkgs.subversion
-      ]);
-
-      # TODO: johbo: Make a nicer way to expose the parts. Maybe
-      # pkgs/default.nix?
+      # expose following attributed outside
       passthru = {
         pythonPackages = self;
       };
 
-      # Add VCSServer bin directory to path so that tests can find 'vcsserver'.
+      propagatedBuildInputs =
+        attrs.propagatedBuildInputs or [] ++ [
+        pkgs.git
+        pkgs.subversion
+      ];
+
+      # Add bin directory to path so that tests can find 'vcsserver'.
       preCheck = ''
         export PATH="$out/bin:$PATH"
       '';
 
-      # put custom attrs here
+      # custom check phase for testing
       checkPhase = ''
         runHook preCheck
-        PYTHONHASHSEED=random py.test -p no:sugar -vv --cov-config=.coveragerc --cov=vcsserver --cov-report=term-missing vcsserver
+        PYTHONHASHSEED=random py.test -vv -p no:sugar -r xw --cov-config=.coveragerc --cov=vcsserver --cov-report=term-missing vcsserver
         runHook postCheck
       '';
 
+      postCheck = ''
+        echo "Cleanup of vcsserver/tests"
+        rm -rf $out/lib/${self.python.libPrefix}/site-packages/vcsserver/tests
+      '';
+
       postInstall = ''
-        echo "Writing meta information for rccontrol to nix-support/rccontrol"
+        echo "Writing vcsserver meta information for rccontrol to nix-support/rccontrol"
         mkdir -p $out/nix-support/rccontrol
         cp -v vcsserver/VERSION $out/nix-support/rccontrol/version
-        echo "DONE: Meta information for rccontrol written"
+        echo "DONE: vcsserver meta information for rccontrol written"
+
+        mkdir -p $out/etc
+        cp configs/production.ini $out/etc
+        echo "DONE: saved vcsserver production.ini into $out/etc"
 
         # python based programs need to be wrapped
+        mkdir -p $out/bin
+        ln -s ${self.python}/bin/python $out/bin
         ln -s ${self.pyramid}/bin/* $out/bin/
         ln -s ${self.gunicorn}/bin/gunicorn $out/bin/
 
         # Symlink version control utilities
-        #
         # We ensure that always the correct version is available as a symlink.
         # So that users calling them via the profile path will always use the
         # correct version.
-        ln -s ${self.python}/bin/python $out/bin
+
         ln -s ${pkgs.git}/bin/git $out/bin
         ln -s ${self.mercurial}/bin/hg $out/bin
         ln -s ${pkgs.subversion}/bin/svn* $out/bin
+        echo "DONE: created symlinks into $out/bin"
 
         for file in $out/bin/*;
         do
           wrapProgram $file \
-            --set PATH $PATH \
-            --set PYTHONPATH $PYTHONPATH \
+            --prefix PATH : $PATH \
+            --prefix PYTHONPATH : $PYTHONPATH \
             --set PYTHONHASHSEED random
         done
+        echo "DONE: vcsserver binary wrapping"
 
       '';
 
     });
   };
 
+  basePythonPackages = with builtins;
+    if isAttrs pythonPackages then
+      pythonPackages
+    else
+      getAttr pythonPackages pkgs;
+
+  pythonGeneratedPackages = import ./pkgs/python-packages.nix {
+    inherit pkgs;
+    inherit (pkgs) fetchurl fetchgit fetchhg;
+  };
+
+  pythonVCSServerOverrides = import ./pkgs/python-packages-overrides.nix {
+    inherit pkgs basePythonPackages;
+  };
+
+
   # Apply all overrides and fix the final package set
-  myPythonPackages =
-    (fix
+  myPythonPackagesUnfix = with pkgs.lib;
     (extends pythonExternalOverrides
     (extends pythonLocalOverrides
-    (extends pythonOverrides
-             pythonGeneratedPackages))));
+    (extends pythonVCSServerOverrides
+    (extends pythonGeneratedPackages
+             basePythonPackagesUnfix))));
+
+  myPythonPackages = (pkgs.lib.fix myPythonPackagesUnfix);
 
 in myPythonPackages.rhodecode-vcsserver

pkgs/python-packages-overrides.nix

@@ -4,58 +4,49 b''
 # python-packages.nix. The main objective is to add needed dependencies of C
 # libraries and tweak the build instructions where needed.
 
-{ pkgs, basePythonPackages }:
+{ pkgs
+, basePythonPackages
+}:
 
 let
   sed = "sed -i";
+
 in
 
 self: super: {
 
-  beaker = super.beaker.override (attrs: {
+  "beaker" = super."beaker".override (attrs: {
     patches = [
-      ./patch-beaker-lock-func-debug.diff
-      ./patch-beaker-metadata-reuse.diff
+      ./patch_beaker/patch-beaker-lock-func-debug.diff
+      ./patch_beaker/patch-beaker-metadata-reuse.diff
     ];
   });
 
-  subvertpy = super.subvertpy.override (attrs: {
-    # TODO: johbo: Remove the "or" once we drop 16.03 support
-    SVN_PREFIX = "${pkgs.subversion.dev or pkgs.subversion}";
+  "hgsubversion" = super."hgsubversion".override (attrs: {
     propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
+      pkgs.sqlite
+      #basePythonPackages.sqlite3
+      self.mercurial
+    ];
+  });
+
+  "subvertpy" = super."subvertpy".override (attrs: {
+    SVN_PREFIX = "${pkgs.subversion.dev}";
+    propagatedBuildInputs = [
+      pkgs.apr.dev
       pkgs.aprutil
       pkgs.subversion
     ];
-    preBuild = pkgs.lib.optionalString pkgs.stdenv.isDarwin ''
-      ${sed} -e "s/'gcc'/'clang'/" setup.py
-    '';
   });
 
-  hgsubversion = super.hgsubversion.override (attrs: {
-    propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
-      pkgs.sqlite
-      basePythonPackages.sqlite3
+  "mercurial" = super."mercurial".override (attrs: {
+    propagatedBuildInputs = [
+      # self.python.modules.curses
     ];
   });
 
-  mercurial = super.mercurial.override (attrs: {
-    propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
-      self.python.modules.curses
-    ] ++ pkgs.lib.optional pkgs.stdenv.isDarwin
-      pkgs.darwin.apple_sdk.frameworks.ApplicationServices;
-  });
-
-  pyramid = super.pyramid.override (attrs: {
-    postFixup = ''
-      wrapPythonPrograms
-      # TODO: johbo: "wrapPython" adds this magic line which
-      # confuses pserve.
-      ${sed} '/import sys; sys.argv/d' $out/bin/.pserve-wrapped
-    '';
-  });
-
-  # Avoid that setuptools is replaced, this leads to trouble
-  # with buildPythonPackage.
-  setuptools = basePythonPackages.setuptools;
+  # Avoid that base packages screw up the build process
+  inherit (basePythonPackages)
+    setuptools;
 
 }

pkgs/python-packages.nix

@@ -1,873 +1,915 b''
-# Generated by pip2nix 0.4.0
+# Generated by pip2nix 0.8.0.dev1
 # See https://github.com/johbo/pip2nix
 
-{
-  atomicwrites = super.buildPythonPackage {
+{ pkgs, fetchurl, fetchgit, fetchhg }:
+
+self: super: {
+  "atomicwrites" = super.buildPythonPackage {
     name = "atomicwrites-1.1.5";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://files.pythonhosted.org/packages/a1/e1/2d9bc76838e6e6667fde5814aa25d7feb93d6fa471bf6816daac2596e8b2/atomicwrites-1.1.5.tar.gz";
-      sha256 = "240831ea22da9ab882b551b31d4225591e5e447a68c5e188db5b89ca1d487585";
+      sha256 = "11bm90fwm2avvf4f3ib8g925w7jr4m11vcsinn1bi6ns4bm32214";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  attrs = super.buildPythonPackage {
+  "attrs" = super.buildPythonPackage {
     name = "attrs-18.1.0";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://files.pythonhosted.org/packages/e4/ac/a04671e118b57bee87dabca1e0f2d3bda816b7a551036012d0ca24190e71/attrs-18.1.0.tar.gz";
-      sha256 = "e0d0eb91441a3b53dab4d9b743eafc1ac44476296a2053b6ca3af0b139faf87b";
+      sha256 = "0yzqz8wv3w1srav5683a55v49i0szkm47dyrnkd56fqs8j8ypl70";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  backports.shutil-get-terminal-size = super.buildPythonPackage {
+  "backports.shutil-get-terminal-size" = super.buildPythonPackage {
     name = "backports.shutil-get-terminal-size-1.0.0";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://files.pythonhosted.org/packages/ec/9c/368086faa9c016efce5da3e0e13ba392c9db79e3ab740b763fe28620b18b/backports.shutil_get_terminal_size-1.0.0.tar.gz";
-      sha256 = "713e7a8228ae80341c70586d1cc0a8caa5207346927e23d09dcbcaf18eadec80";
+      sha256 = "107cmn7g3jnbkp826zlj8rrj19fam301qvaqf0f3905f5217lgki";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  beaker = super.buildPythonPackage {
+  "beaker" = super.buildPythonPackage {
     name = "beaker-1.9.1";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [funcsigs];
+    propagatedBuildInputs = [
+      self."funcsigs"
+    ];
     src = fetchurl {
       url = "https://files.pythonhosted.org/packages/ca/14/a626188d0d0c7b55dd7cf1902046c2743bd392a7078bb53073e13280eb1e/Beaker-1.9.1.tar.gz";
-      sha256 = "32276ed686ab7203baf60520452903e35d1c3515f632683ea4a5881c8cd55921";
+      sha256 = "08arsn61r255lhz6hcpn2lsiqpg30clla805ysx06wmbhvb6w9rj";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  beautifulsoup4 = super.buildPythonPackage {
+  "beautifulsoup4" = super.buildPythonPackage {
     name = "beautifulsoup4-4.6.0";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://files.pythonhosted.org/packages/fa/8d/1d14391fdaed5abada4e0f63543fef49b8331a34ca60c88bd521bcf7f782/beautifulsoup4-4.6.0.tar.gz";
-      sha256 = "808b6ac932dccb0a4126558f7dfdcf41710dd44a4ef497a0bb59a77f9f078e89";
+      sha256 = "12cf0ygpz9srpfh9gx2f9ba0swa1rzypv3sm4r0hmjyw6b4nm2w0";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  configobj = super.buildPythonPackage {
+  "configobj" = super.buildPythonPackage {
     name = "configobj-5.0.6";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [six];
+    propagatedBuildInputs = [
+      self."six"
+    ];
     src = fetchurl {
       url = "https://files.pythonhosted.org/packages/64/61/079eb60459c44929e684fa7d9e2fdca403f67d64dd9dbac27296be2e0fab/configobj-5.0.6.tar.gz";
-      sha256 = "a2f5650770e1c87fb335af19a9b7eb73fc05ccf22144eb68db7d00cd2bcb0902";
+      sha256 = "00h9rcmws03xvdlfni11yb60bz3kxfvsj6dg6nrpzj71f03nbxd2";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  cov-core = super.buildPythonPackage {
+  "cov-core" = super.buildPythonPackage {
     name = "cov-core-1.15.0";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [coverage];
+    propagatedBuildInputs = [
+      self."coverage"
+    ];
     src = fetchurl {
       url = "https://files.pythonhosted.org/packages/4b/87/13e75a47b4ba1be06f29f6d807ca99638bedc6b57fa491cd3de891ca2923/cov-core-1.15.0.tar.gz";
-      sha256 = "4a14c67d520fda9d42b0da6134638578caae1d374b9bb462d8de00587dba764c";
+      sha256 = "0k3np9ymh06yv1ib96sb6wfsxjkqhmik8qfsn119vnhga9ywc52a";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  coverage = super.buildPythonPackage {
+  "coverage" = super.buildPythonPackage {
     name = "coverage-3.7.1";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://files.pythonhosted.org/packages/09/4f/89b06c7fdc09687bca507dc411c342556ef9c5a3b26756137a4878ff19bf/coverage-3.7.1.tar.gz";
-      sha256 = "d1aea1c4aa61b8366d6a42dd3650622fbf9c634ed24eaf7f379c8b970e5ed44e";
+      sha256 = "0knlbq79g2ww6xzsyknj9rirrgrgc983dpa2d9nkdf31mb2a3bni";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  decorator = super.buildPythonPackage {
+  "decorator" = super.buildPythonPackage {
     name = "decorator-4.1.2";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://files.pythonhosted.org/packages/bb/e0/f6e41e9091e130bf16d4437dabbac3993908e4d6485ecbc985ef1352db94/decorator-4.1.2.tar.gz";
-      sha256 = "7cb64d38cb8002971710c8899fbdfb859a23a364b7c99dab19d1f719c2ba16b5";
+      sha256 = "1d8npb11kxyi36mrvjdpcjij76l5zfyrz2f820brf0l0rcw4vdkw";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal { fullName = "new BSD License"; } ];
     };
   };
-  dulwich = super.buildPythonPackage {
+  "dulwich" = super.buildPythonPackage {
     name = "dulwich-0.13.0";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://files.pythonhosted.org/packages/84/95/732d280eee829dacc954e8109f97b47abcadcca472c2ab013e1635eb4792/dulwich-0.13.0.tar.gz";
-      sha256 = "8ed35334e22cf93e7dcfd5113d8e262041967fe4c3cead5e262c9102f3e63238";
+      sha256 = "0f1jwvrh549c4rgavkn3wizrch904s73s4fmrxykxy9cw8s57lwf";
     };
     meta = {
       license = [ pkgs.lib.licenses.gpl2Plus ];
     };
   };
-  enum34 = super.buildPythonPackage {
+  "enum34" = super.buildPythonPackage {
     name = "enum34-1.1.6";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://files.pythonhosted.org/packages/bf/3e/31d502c25302814a7c2f1d3959d2a3b3f78e509002ba91aea64993936876/enum34-1.1.6.tar.gz";
-      sha256 = "8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1";
+      sha256 = "1cgm5ng2gcfrkrm3hc22brl6chdmv67b9zvva9sfs7gn7dwc9n4a";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
-  funcsigs = super.buildPythonPackage {
+  "funcsigs" = super.buildPythonPackage {
     name = "funcsigs-1.0.2";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://files.pythonhosted.org/packages/94/4a/db842e7a0545de1cdb0439bb80e6e42dfe82aaeaadd4072f2263a4fbed23/funcsigs-1.0.2.tar.gz";
-      sha256 = "a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50";
+      sha256 = "0l4g5818ffyfmfs1a924811azhjj8ax9xd1cffr1mzd3ycn0zfx7";
     };
     meta = {
       license = [ { fullName = "ASL"; } pkgs.lib.licenses.asl20 ];
     };
   };
-  gevent = super.buildPythonPackage {
+  "gevent" = super.buildPythonPackage {
     name = "gevent-1.2.2";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [greenlet];
+    propagatedBuildInputs = [
+      self."greenlet"
+    ];
     src = fetchurl {
       url = "https://files.pythonhosted.org/packages/1b/92/b111f76e54d2be11375b47b213b56687214f258fd9dae703546d30b837be/gevent-1.2.2.tar.gz";
-      sha256 = "4791c8ae9c57d6f153354736e1ccab1e2baf6c8d9ae5a77a9ac90f41e2966b2d";
+      sha256 = "0bbbjvi423y9k9xagrcsimnayaqymg6f2dj76m9z3mjpkjpci4a7";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  gprof2dot = super.buildPythonPackage {
+  "gprof2dot" = super.buildPythonPackage {
     name = "gprof2dot-2017.9.19";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://files.pythonhosted.org/packages/9d/36/f977122502979f3dfb50704979c9ed70e6b620787942b089bf1af15f5aba/gprof2dot-2017.9.19.tar.gz";
-      sha256 = "cebc7aa2782fd813ead415ea1fae3409524343485eadc7fb60ef5bd1e810309e";
+      sha256 = "17ih23ld2nzgc3xwgbay911l6lh96jp1zshmskm17n1gg2i7mg6f";
     };
     meta = {
       license = [ { fullName = "GNU Lesser General Public License v3 or later (LGPLv3+)"; } { fullName = "LGPL"; } ];
     };
   };
-  greenlet = super.buildPythonPackage {
+  "greenlet" = super.buildPythonPackage {
     name = "greenlet-0.4.13";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://files.pythonhosted.org/packages/13/de/ba92335e9e76040ca7274224942282a80d54f85e342a5e33c5277c7f87eb/greenlet-0.4.13.tar.gz";
-      sha256 = "0fef83d43bf87a5196c91e73cb9772f945a4caaff91242766c5916d1dd1381e4";
+      sha256 = "1r412gfx25jrdiv444prmz5a8igrfabwnwqyr6b52ypq7ga87vqg";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  gunicorn = super.buildPythonPackage {
+  "gunicorn" = super.buildPythonPackage {
     name = "gunicorn-19.7.1";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://files.pythonhosted.org/packages/30/3a/10bb213cede0cc4d13ac2263316c872a64bf4c819000c8ccd801f1d5f822/gunicorn-19.7.1.tar.gz";
-      sha256 = "eee1169f0ca667be05db3351a0960765620dad53f53434262ff8901b68a1b622";
+      sha256 = "08mnl5l1p47q5wk38d7mafnhsqk50yba0l9kvc2vwrx61jgidqgf";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  hg-evolve = super.buildPythonPackage {
+  "hg-evolve" = super.buildPythonPackage {
     name = "hg-evolve-8.0.1";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://files.pythonhosted.org/packages/06/1a/c5c12d8f117426f05285a820ee5a23121882f5381104e86276b72598934f/hg-evolve-8.0.1.tar.gz";
-      sha256 = "49dc14fe7322b3ded107a96e47c1f0a75a19472d4b6b7ce80b670ab25c742aaf";
+      sha256 = "1brafifb42k71gl7qssb5m3ijnm7y30lfvm90z8xxcr2fgz19p29";
     };
     meta = {
       license = [ { fullName = "GPLv2+"; } ];
     };
   };
-  hgsubversion = super.buildPythonPackage {
+  "hgsubversion" = super.buildPythonPackage {
     name = "hgsubversion-1.9.2";
-    buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [mercurial subvertpy];
+    propagatedBuildInputs = [
+      self."mercurial"
+      self."subvertpy"
+    ];
     src = fetchurl {
       url = "https://files.pythonhosted.org/packages/05/80/3a3cef10dd65e86528ef8d7ac57a41ebc782d0f3c6cfa4fed021aa9fbee0/hgsubversion-1.9.2.tar.gz";
-      sha256 = "9fed1e68411130b0447d0bbd217183830f5f1eaaaa0d5aa7de24609895058998";
+      sha256 = "16490narhq14vskml3dam8g5y3w3hdqj3g8bgm2b0c0i85l1xvcz";
     };
     meta = {
       license = [ pkgs.lib.licenses.gpl1 ];
     };
   };