diff options
| -rw-r--r-- | flake.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/make-tarball.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/release.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/flake.nix b/flake.nix index e2346f99c7a..197b6e2056e 100644 --- a/flake.nix +++ b/flake.nix @@ -30,7 +30,7 @@ }); }; - checks.tarball = jobs.tarball; + checks.x86_64-linux.tarball = jobs.tarball; htmlDocs = { nixpkgsManual = jobs.manual; @@ -42,7 +42,7 @@ legacyPackages = forAllSystems (system: import ./. { inherit system; }); nixosModules = { - notDetected = ./nixos/modules/installer/scan/not-detected.nix; + notDetected = import ./nixos/modules/installer/scan/not-detected.nix; }; }; } 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; }; |