colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 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 = { htmlDocs = {
nixpkgsManual = jobs.manual; nixpkgsManual = jobs.manual;
@ -42,7 +42,7 @@
legacyPackages = forAllSystems (system: import ./. { inherit system; }); legacyPackages = forAllSystems (system: import ./. { inherit system; });
nixosModules = { 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${ versionSuffix = "pre${
if nixpkgs ? lastModified if nixpkgs ? lastModified
then builtins.substring 0 8 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 ]; buildInputs = [ nix.out jq lib-tests ];
@ -28,7 +28,7 @@ releaseTools.sourceTarball {
eval "$preConfigure" eval "$preConfigure"
releaseName=nixpkgs-$VERSION$VERSION_SUFFIX releaseName=nixpkgs-$VERSION$VERSION_SUFFIX
echo -n $VERSION_SUFFIX > .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 "release name is $releaseName"
echo "git-revision is $(cat .git-revision)" echo "git-revision is $(cat .git-revision)"
''; '';