From fbf93cd61b7ae9a61c33f9b9e7facfa5799209f6 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 4 Jul 2018 15:52:15 -0400 Subject: Revert "pkgs/top-level/release.nix.nix: Use fetchGit if possible" This reverts commit 67d0a57ef9eedde69192e08db77751c1c1062e0e. which caused evaluation errors in restricted eval mode, producing: error: access to URI '/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/eval-1-lassulus.ewr1.nix.ci' is forbidden in restricted mode --- pkgs/top-level/release.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 4b8d10a48eb..81f0874ca12 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -8,11 +8,7 @@ $ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux */ -{ nixpkgs ? - if builtins.pathExists ../../.git then - fetchGit ../.. - else - { 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" "x86_64-darwin" "aarch64-linux" ] -- cgit 1.4.1