diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-09-16 12:34:32 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-09-16 12:34:32 +0200 |
| commit | 03fa6965ad7738bec6bb606deebf3a337f6ab291 (patch) | |
| tree | 1e1e419cfafae2d502891c34ca180580f21975cb /pkgs/build-support | |
| parent | a31365d831c5b73e2414d7e14c8612ef7972466e (diff) | |
| parent | 6712e0111a7ce563f86535b012d28ee658e6e5dc (diff) | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/buildenv/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/build-support/vm/default.nix | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index 47e2c1b904c36..41a1e67ef428b 100644 --- a/pkgs/build-support/buildenv/default.nix +++ b/pkgs/build-support/buildenv/default.nix @@ -4,7 +4,8 @@ { buildPackages, runCommand, lib }: -{ name +lib.makeOverridable +({ name , # The manifest file (if any). A symlink $out/manifest will be # created to it. @@ -68,4 +69,4 @@ runCommand name '' ${buildPackages.perl}/bin/perl -w ${./builder.pl} eval "$postBuild" - '' + '') diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index b7d9203a0b639..d886e9a56fa4a 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1687,10 +1687,6 @@ rec { url = mirror://ubuntu/dists/trusty/universe/binary-amd64/Packages.bz2; sha256 = "558637eeb8e340b871653e2060effe36e064677eca4eae62d9e4138dd402a610"; }) - (fetchurl { - url = mirror://ubuntu/dists/trusty-updates/main/binary-amd64/Packages.bz2; - sha256 = "03vd582p8b78s8sq6hz3nynn9vr7syccmn77i5mzayvsadb74cfy"; - }) ]; urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; |