top-level: Less indirection for lib in release*.nix

2017-04-17 17:13:01 -04:00
parent 213d29f6b7
commit b477851f34
5 changed files with 8 additions and 11 deletions
@@ -3,14 +3,14 @@
   $ hydra-eval-jobs pkgs/top-level/release-python.nix
 */

-{ nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
+{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
 , officialRelease ? false
 , # The platforms for which we build Nixpkgs.
  supportedSystems ? [ "x86_64-linux" ]
 }:

-with import ../../lib;
 with import ./release-lib.nix {inherit supportedSystems; };
+with lib;

 let
  packagePython = mapAttrs (name: value: