diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-02-10 16:25:33 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2020-02-10 16:26:33 +0100 |
| commit | 64e5f4d53b2740bffb16641f703b9cf0df58b84e (patch) | |
| tree | feedc314ed3bcf26b6234d21c847d0e029c1c604 /pkgs | |
| parent | 5c389f84d42538f41e3e9a73b5e6bee645d45ebf (diff) | |
| download | nixpkgs-64e5f4d53b2740bffb16641f703b9cf0df58b84e.tar nixpkgs-64e5f4d53b2740bffb16641f703b9cf0df58b84e.tar.gz nixpkgs-64e5f4d53b2740bffb16641f703b9cf0df58b84e.tar.bz2 nixpkgs-64e5f4d53b2740bffb16641f703b9cf0df58b84e.tar.lz nixpkgs-64e5f4d53b2740bffb16641f703b9cf0df58b84e.tar.xz nixpkgs-64e5f4d53b2740bffb16641f703b9cf0df58b84e.tar.zst nixpkgs-64e5f4d53b2740bffb16641f703b9cf0df58b84e.zip | |
Fix 'nix flake check'
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/make-tarball.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/release.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 7bb18e765f1..ff0b0568819 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -20,7 +20,7 @@ releaseTools.sourceTarball { versionSuffix = "pre${ if nixpkgs ? lastModified then builtins.substring 0 8 nixpkgs.lastModified - else toString nixpkgs.revCount}.${nixpkgs.shortRev}"; + else toString nixpkgs.revCount}.${nixpkgs.shortRev or "dirty"}"; buildInputs = [ nix.out jq lib-tests ]; @@ -28,7 +28,7 @@ releaseTools.sourceTarball { eval "$preConfigure" releaseName=nixpkgs-$VERSION$VERSION_SUFFIX echo -n $VERSION_SUFFIX > .version-suffix - echo -n ${nixpkgs.rev or nixpkgs.shortRev} > .git-revision + echo -n ${nixpkgs.rev or nixpkgs.shortRev or "dirty"} > .git-revision echo "release name is $releaseName" echo "git-revision is $(cat .git-revision)" ''; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index b8ce1fcbce5..78d70c0239a 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -14,9 +14,9 @@ , supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ] , limitedSupportedSystems ? [ "i686-linux" ] # Strip most of attributes when evaluating to spare memory usage -, scrubJobs ? true +, scrubJobs ? true # Attributes passed to nixpkgs. Don't build packages marked as unfree. -, nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } +, nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } }: with import ./release-lib.nix { inherit supportedSystems scrubJobs nixpkgsArgs; }; |