wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-05 16:31:47 +02:00
Code Activity

Fix things

Browse source
This commit is contained in:
John Ericson 2024-07-01 14:36:46 -04:00
parent 4727d5c3c5
commit 4d6bc61b8d
16 changed files with 258 additions and 497 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/libutil/package.nix
View file

@ -18,25 +18,12 @@
# Configuration Options
, versionSuffix ? ""
# Check test coverage of Nix. Probably want to use with at least
# one of `doCheck` or `doInstallCheck` enabled.
, withCoverageChecks ? false
}:
let
inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix;
mkDerivation =
if withCoverageChecks
then
# TODO support `finalAttrs` args function in
# `releaseTools.coverageAnalysis`.
argsFun:
releaseTools.coverageAnalysis (let args = argsFun args; in args)
else stdenv.mkDerivation;
in
mkMesonDerivation (finalAttrs: {
@ -45,6 +32,8 @@ mkMesonDerivation (finalAttrs: {
workDir = ./.;
fileset = fileset.unions [
../../build-utils-meson
./build-utils-meson
../../.version
./.version
./meson.build
@ -78,12 +67,14 @@ mkMesonDerivation (finalAttrs: {
];
preConfigure =
# TODO: change release process to add `pre` in `.version`, remove it before tagging, and restore after.
# "Inline" .version so it's not a symlink, and includes the suffix.
# Do the meson utils, without modification.
#
# TODO: change release process to add `pre` in `.version`, remove it
# before tagging, and restore after.
''
chmod u+w ./.version
echo ${version} > ../../.version
cp -r ${../../build-utils-meson} build-utils-meson
'';
mesonFlags = [
@ -103,8 +94,7 @@ mkMesonDerivation (finalAttrs: {
separateDebugInfo = !stdenv.hostPlatform.isStatic;
# TODO Always true after https://github.com/NixOS/nixpkgs/issues/318564
strictDeps = !withCoverageChecks;
strictDeps = true;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
@ -112,8 +102,4 @@ mkMesonDerivation (finalAttrs: {
platforms = lib.platforms.unix ++ lib.platforms.windows;
};
} // lib.optionalAttrs withCoverageChecks {
lcovFilter = [ "*/boost/*" "*-tab.*" ];
hardeningDisable = [ "fortify" ];
})