public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #43042 from grahamc/fix-release

Browse Source 
Revert "pkgs/top-level/release.nix.nix: Use fetchGit if possible"
This commit is contained in:
Graham Christensen 2018-07-04 16:18:38 -04:00 committed by GitHub
commit d21baa5a73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/top-level/release.nix
View File

@ -8,11 +8,7 @@
$ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux $ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux
*/ */
{ nixpkgs ? { nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
if builtins.pathExists ../../.git then
fetchGit ../..
else
{ outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
, officialRelease ? false , officialRelease ? false
# The platforms for which we build Nixpkgs. # The platforms for which we build Nixpkgs.
, supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ] , supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]