mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
Fix 'nix flake check'
This commit is contained in:
parent
5c389f84d4
commit
64e5f4d53b
|
@ -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;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -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)"
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -14,9 +14,9 @@
|
||||||
, supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]
|
, supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]
|
||||||
, limitedSupportedSystems ? [ "i686-linux" ]
|
, limitedSupportedSystems ? [ "i686-linux" ]
|
||||||
# Strip most of attributes when evaluating to spare memory usage
|
# 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.
|
# 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; };
|
with import ./release-lib.nix { inherit supportedSystems scrubJobs nixpkgsArgs; };
|
||||||
|
|
Loading…
Reference in a new issue