mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 11:10:03 +00:00
Code Issues Wiki Activity

Fix 'nix flake check'

Browse source
This commit is contained in:
Eelco Dolstra 2020-02-10 16:25:33 +01:00
parent 5c389f84d4
commit 64e5f4d53b
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
flake.nix
View file

@ -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;
};
};
}

4
pkgs/top-level/make-tarball.nix
View file

@ -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)"
'';

4
pkgs/top-level/release.nix
View file

@ -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; };