max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2025-02-16 15:17:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/libexpr-c/package.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, stdenv , stdenv
, mkMesonDerivation
, releaseTools , releaseTools
, meson , meson
@ -12,41 +13,30 @@
# Configuration Options # Configuration Options
, versionSuffix ? "" , versionSuffix ? ""
# Check test coverage of Nix. Probably want to use with at least
# one of `doCheck` or `doInstallCheck` enabled.
, withCoverageChecks ? false
}: }:
let let
inherit (lib) fileset; inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix; 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 in
mkDerivation (finalAttrs: { mkMesonDerivation (finalAttrs: {
pname = "nix-expr-c"; pname = "nix-expr-c";
inherit version; inherit version;
src = fileset.toSource { workDir = ./.;
root = ./.; fileset = fileset.unions [
fileset = fileset.unions [ ../../build-utils-meson
./meson.build ./build-utils-meson
# ./meson.options ../../.version
(fileset.fileFilter (file: file.hasExt "cc") ./.) ./.version
(fileset.fileFilter (file: file.hasExt "hh") ./.) ./meson.build
(fileset.fileFilter (file: file.hasExt "h") ./.) # ./meson.options
]; (fileset.fileFilter (file: file.hasExt "cc") ./.)
}; (fileset.fileFilter (file: file.hasExt "hh") ./.)
(fileset.fileFilter (file: file.hasExt "h") ./.)
];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -65,8 +55,8 @@ mkDerivation (finalAttrs: {
# "Inline" .version so it's not a symlink, and includes the suffix. # "Inline" .version so it's not a symlink, and includes the suffix.
# Do the meson utils, without modification. # Do the meson utils, without modification.
'' ''
echo ${version} > .version chmod u+w ./.version
cp -r ${../../build-utils-meson} build-utils-meson echo ${version} > ../../.version
''; '';
mesonFlags = [ mesonFlags = [
@ -80,8 +70,7 @@ mkDerivation (finalAttrs: {
separateDebugInfo = !stdenv.hostPlatform.isStatic; separateDebugInfo = !stdenv.hostPlatform.isStatic;
# TODO Always true after https://github.com/NixOS/nixpkgs/issues/318564 strictDeps = true;
strictDeps = !withCoverageChecks;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie"; hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
@ -89,8 +78,4 @@ mkDerivation (finalAttrs: {
platforms = lib.platforms.unix ++ lib.platforms.windows; platforms = lib.platforms.unix ++ lib.platforms.windows;
}; };
} // lib.optionalAttrs withCoverageChecks {
lcovFilter = [ "*/boost/*" "*-tab.*" ];
hardeningDisable = [ "fortify" ];
}) })

55
src/libexpr/package.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, stdenv , stdenv
, mkMesonDerivation
, releaseTools , releaseTools
, meson , meson
@ -21,10 +22,6 @@
, versionSuffix ? "" , versionSuffix ? ""
# Check test coverage of Nix. Probably want to use with at least
# one of `doCheck` or `doInstallCheck` enabled.
, withCoverageChecks ? false
# Whether to use garbage collection for the Nix language evaluator. # Whether to use garbage collection for the Nix language evaluator.
# #
# If it is disabled, we just leak memory, but this is not as bad as it # If it is disabled, we just leak memory, but this is not as bad as it
@ -41,34 +38,27 @@ let
inherit (lib) fileset; inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix; 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 in
mkDerivation (finalAttrs: { mkMesonDerivation (finalAttrs: {
pname = "nix-expr"; pname = "nix-expr";
inherit version; inherit version;
src = fileset.toSource { workDir = ./.;
root = ./.; fileset = fileset.unions [
fileset = fileset.unions [ ../../build-utils-meson
./meson.build ./build-utils-meson
./meson.options ../../.version
./primops/meson.build ./.version
(fileset.fileFilter (file: file.hasExt "cc") ./.) ./meson.build
(fileset.fileFilter (file: file.hasExt "hh") ./.) ./meson.options
./lexer.l ./primops/meson.build
./parser.y (fileset.fileFilter (file: file.hasExt "cc") ./.)
(fileset.fileFilter (file: file.hasExt "nix") ./.) (fileset.fileFilter (file: file.hasExt "hh") ./.)
]; ./lexer.l
}; ./parser.y
(fileset.fileFilter (file: file.hasExt "nix") ./.)
];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -97,8 +87,8 @@ mkDerivation (finalAttrs: {
# "Inline" .version so it's not a symlink, and includes the suffix. # "Inline" .version so it's not a symlink, and includes the suffix.
# Do the meson utils, without modification. # Do the meson utils, without modification.
'' ''
echo ${version} > .version chmod u+w ./.version
cp -r ${../../build-utils-meson} build-utils-meson echo ${version} > ../../.version
''; '';
mesonFlags = [ mesonFlags = [
@ -118,8 +108,7 @@ mkDerivation (finalAttrs: {
separateDebugInfo = !stdenv.hostPlatform.isStatic; separateDebugInfo = !stdenv.hostPlatform.isStatic;
# TODO Always true after https://github.com/NixOS/nixpkgs/issues/318564 strictDeps = true;
strictDeps = !withCoverageChecks;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie"; hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
@ -127,8 +116,4 @@ mkDerivation (finalAttrs: {
platforms = lib.platforms.unix ++ lib.platforms.windows; platforms = lib.platforms.unix ++ lib.platforms.windows;
}; };
} // lib.optionalAttrs withCoverageChecks {
lcovFilter = [ "*/boost/*" "*-tab.*" ];
hardeningDisable = [ "fortify" ];
}) })

45
src/libfetchers/package.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, stdenv , stdenv
, mkMesonDerivation
, releaseTools , releaseTools
, meson , meson
@ -15,40 +16,28 @@
# Configuration Options # Configuration Options
, versionSuffix ? "" , versionSuffix ? ""
# Check test coverage of Nix. Probably want to use with with at least
# one of `doCheck` or `doInstallCheck` enabled.
, withCoverageChecks ? false
}: }:
let let
inherit (lib) fileset; inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix; 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 in
mkDerivation (finalAttrs: { mkMesonDerivation (finalAttrs: {
pname = "nix-fetchers"; pname = "nix-fetchers";
inherit version; inherit version;
src = fileset.toSource { workDir = ./.;
root = ./.; fileset = fileset.unions [
fileset = fileset.unions [ ../../build-utils-meson
./meson.build ./build-utils-meson
(fileset.fileFilter (file: file.hasExt "cc") ./.) ../../.version
(fileset.fileFilter (file: file.hasExt "hh") ./.) ./.version
]; ./meson.build
}; (fileset.fileFilter (file: file.hasExt "cc") ./.)
(fileset.fileFilter (file: file.hasExt "hh") ./.)
];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -72,8 +61,8 @@ mkDerivation (finalAttrs: {
# "Inline" .version so it's not a symlink, and includes the suffix. # "Inline" .version so it's not a symlink, and includes the suffix.
# Do the meson utils, without modification. # Do the meson utils, without modification.
'' ''
echo ${version} > .version chmod u+w ./.version
cp -r ${../../build-utils-meson} build-utils-meson echo ${version} > ../../.version
''; '';
env = lib.optionalAttrs (stdenv.isLinux && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux")) { env = lib.optionalAttrs (stdenv.isLinux && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux")) {
@ -86,7 +75,7 @@ mkDerivation (finalAttrs: {
# TODO `releaseTools.coverageAnalysis` in Nixpkgs needs to be updated # TODO `releaseTools.coverageAnalysis` in Nixpkgs needs to be updated
# to work with `strictDeps`. # to work with `strictDeps`.
strictDeps = !withCoverageChecks; strictDeps = true;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie"; hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
@ -94,8 +83,4 @@ mkDerivation (finalAttrs: {
platforms = lib.platforms.unix ++ lib.platforms.windows; platforms = lib.platforms.unix ++ lib.platforms.windows;
}; };
} // lib.optionalAttrs withCoverageChecks {
lcovFilter = [ "*-tab.*" ];
hardeningDisable = ["fortify"];
}) })

45
src/libflake/package.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, stdenv , stdenv
, mkMesonDerivation
, releaseTools , releaseTools
, meson , meson
@ -17,40 +18,28 @@
# Configuration Options # Configuration Options
, versionSuffix ? "" , versionSuffix ? ""
# Check test coverage of Nix. Probably want to use with with at least
# one of `doCheck` or `doInstallCheck` enabled.
, withCoverageChecks ? false
}: }:
let let
inherit (lib) fileset; inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix; 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 in
mkDerivation (finalAttrs: { mkMesonDerivation (finalAttrs: {
pname = "nix-flake"; pname = "nix-flake";
inherit version; inherit version;
src = fileset.toSource { workDir = ./.;
root = ./.; fileset = fileset.unions [
fileset = fileset.unions [ ../../build-utils-meson
./meson.build ./build-utils-meson
(fileset.fileFilter (file: file.hasExt "cc") ./.) ../../.version
(fileset.fileFilter (file: file.hasExt "hh") ./.) ./.version
]; ./meson.build
}; (fileset.fileFilter (file: file.hasExt "cc") ./.)
(fileset.fileFilter (file: file.hasExt "hh") ./.)
];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -72,8 +61,8 @@ mkDerivation (finalAttrs: {
# "Inline" .version so it's not a symlink, and includes the suffix. # "Inline" .version so it's not a symlink, and includes the suffix.
# Do the meson utils, without modification. # Do the meson utils, without modification.
'' ''
echo ${version} > .version chmod u+w ./.version
cp -r ${../../build-utils-meson} build-utils-meson echo ${version} > ../../.version
''; '';
env = lib.optionalAttrs (stdenv.isLinux && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux")) { env = lib.optionalAttrs (stdenv.isLinux && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux")) {
@ -86,7 +75,7 @@ mkDerivation (finalAttrs: {
# TODO `releaseTools.coverageAnalysis` in Nixpkgs needs to be updated # TODO `releaseTools.coverageAnalysis` in Nixpkgs needs to be updated
# to work with `strictDeps`. # to work with `strictDeps`.
strictDeps = !withCoverageChecks; strictDeps = true;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie"; hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
@ -94,8 +83,4 @@ mkDerivation (finalAttrs: {
platforms = lib.platforms.unix ++ lib.platforms.windows; platforms = lib.platforms.unix ++ lib.platforms.windows;
}; };
} // lib.optionalAttrs withCoverageChecks {
lcovFilter = [ "*-tab.*" ];
hardeningDisable = ["fortify"];
}) })

49
src/libstore-c/package.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, stdenv , stdenv
, mkMesonDerivation
, releaseTools , releaseTools
, meson , meson
@ -12,41 +13,30 @@
# Configuration Options # Configuration Options
, versionSuffix ? "" , versionSuffix ? ""
# Check test coverage of Nix. Probably want to use with at least
# one of `doCheck` or `doInstallCheck` enabled.
, withCoverageChecks ? false
}: }:
let let
inherit (lib) fileset; inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix; 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 in
mkDerivation (finalAttrs: { mkMesonDerivation (finalAttrs: {
pname = "nix-store-c"; pname = "nix-store-c";
inherit version; inherit version;
src = fileset.toSource { workDir = ./.;
root = ./.; fileset = fileset.unions [
fileset = fileset.unions [ ../../build-utils-meson
./meson.build ./build-utils-meson
# ./meson.options ../../.version
(fileset.fileFilter (file: file.hasExt "cc") ./.) ./.version
(fileset.fileFilter (file: file.hasExt "hh") ./.) ./meson.build
(fileset.fileFilter (file: file.hasExt "h") ./.) # ./meson.options
]; (fileset.fileFilter (file: file.hasExt "cc") ./.)
}; (fileset.fileFilter (file: file.hasExt "hh") ./.)
(fileset.fileFilter (file: file.hasExt "h") ./.)
];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -65,8 +55,8 @@ mkDerivation (finalAttrs: {
# "Inline" .version so it's not a symlink, and includes the suffix. # "Inline" .version so it's not a symlink, and includes the suffix.
# Do the meson utils, without modification. # Do the meson utils, without modification.
'' ''
echo ${version} > .version chmod u+w ./.version
cp -r ${../../build-utils-meson} build-utils-meson echo ${version} > ../../.version
''; '';
mesonFlags = [ mesonFlags = [
@ -80,8 +70,7 @@ mkDerivation (finalAttrs: {
separateDebugInfo = !stdenv.hostPlatform.isStatic; separateDebugInfo = !stdenv.hostPlatform.isStatic;
# TODO Always true after https://github.com/NixOS/nixpkgs/issues/318564 strictDeps = true;
strictDeps = !withCoverageChecks;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie"; hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
@ -89,8 +78,4 @@ mkDerivation (finalAttrs: {
platforms = lib.platforms.unix ++ lib.platforms.windows; platforms = lib.platforms.unix ++ lib.platforms.windows;
}; };
} // lib.optionalAttrs withCoverageChecks {
lcovFilter = [ "*/boost/*" "*-tab.*" ];
hardeningDisable = [ "fortify" ];
}) })

59
src/libstore/package.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, stdenv , stdenv
, mkMesonDerivation
, releaseTools , releaseTools
, meson , meson
@ -22,46 +23,35 @@
, versionSuffix ? "" , versionSuffix ? ""
, embeddedSandboxShell ? stdenv.hostPlatform.isStatic , embeddedSandboxShell ? stdenv.hostPlatform.isStatic
# Check test coverage of Nix. Probably want to use with at least
# one of `doCheck` or `doInstallCheck` enabled.
, withCoverageChecks ? false
}: }:
let let
inherit (lib) fileset; inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix; 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 in
mkDerivation (finalAttrs: { mkMesonDerivation (finalAttrs: {
pname = "nix-store"; pname = "nix-store";
inherit version; inherit version;
src = fileset.toSource { workDir = ./.;
root = ./.; fileset = fileset.unions [
fileset = fileset.unions [ ../../build-utils-meson
./meson.build ./build-utils-meson
./meson.options ../../.version
./linux/meson.build ./.version
./unix/meson.build ./meson.build
./windows/meson.build ./meson.options
(fileset.fileFilter (file: file.hasExt "cc") ./.) ./linux/meson.build
(fileset.fileFilter (file: file.hasExt "hh") ./.) ./unix/meson.build
(fileset.fileFilter (file: file.hasExt "sb") ./.) ./windows/meson.build
(fileset.fileFilter (file: file.hasExt "md") ./.) (fileset.fileFilter (file: file.hasExt "cc") ./.)
(fileset.fileFilter (file: file.hasExt "sql") ./.) (fileset.fileFilter (file: file.hasExt "hh") ./.)
]; (fileset.fileFilter (file: file.hasExt "sb") ./.)
}; (fileset.fileFilter (file: file.hasExt "md") ./.)
(fileset.fileFilter (file: file.hasExt "sql") ./.)
];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -93,8 +83,8 @@ mkDerivation (finalAttrs: {
# "Inline" .version so it's not a symlink, and includes the suffix. # "Inline" .version so it's not a symlink, and includes the suffix.
# Do the meson utils, without modification. # Do the meson utils, without modification.
'' ''
echo ${version} > .version chmod u+w ./.version
cp -r ${../../build-utils-meson} build-utils-meson echo ${version} > ../../.version
''; '';
mesonFlags = [ mesonFlags = [
@ -117,8 +107,7 @@ mkDerivation (finalAttrs: {
separateDebugInfo = !stdenv.hostPlatform.isStatic; separateDebugInfo = !stdenv.hostPlatform.isStatic;
# TODO Always true after https://github.com/NixOS/nixpkgs/issues/318564 strictDeps = true;
strictDeps = !withCoverageChecks;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie"; hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
@ -126,8 +115,4 @@ mkDerivation (finalAttrs: {
platforms = lib.platforms.unix ++ lib.platforms.windows; platforms = lib.platforms.unix ++ lib.platforms.windows;
}; };
} // lib.optionalAttrs withCoverageChecks {
lcovFilter = [ "*/boost/*" "*-tab.*" ];
hardeningDisable = [ "fortify" ];
}) })

49
src/libutil-c/package.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, stdenv , stdenv
, mkMesonDerivation
, releaseTools , releaseTools
, meson , meson
@ -11,41 +12,30 @@
# Configuration Options # Configuration Options
, versionSuffix ? "" , versionSuffix ? ""
# Check test coverage of Nix. Probably want to use with at least
# one of `doCheck` or `doInstallCheck` enabled.
, withCoverageChecks ? false
}: }:
let let
inherit (lib) fileset; inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix; 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 in
mkDerivation (finalAttrs: { mkMesonDerivation (finalAttrs: {
pname = "nix-util-c"; pname = "nix-util-c";
inherit version; inherit version;
src = fileset.toSource { workDir = ./.;
root = ./.; fileset = fileset.unions [
fileset = fileset.unions [ ../../build-utils-meson
./meson.build ./build-utils-meson
./meson.options ../../.version
(fileset.fileFilter (file: file.hasExt "cc") ./.) ./.version
(fileset.fileFilter (file: file.hasExt "hh") ./.) ./meson.build
(fileset.fileFilter (file: file.hasExt "h") ./.) ./meson.options
]; (fileset.fileFilter (file: file.hasExt "cc") ./.)
}; (fileset.fileFilter (file: file.hasExt "hh") ./.)
(fileset.fileFilter (file: file.hasExt "h") ./.)
];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -63,8 +53,8 @@ mkDerivation (finalAttrs: {
# "Inline" .version so it's not a symlink, and includes the suffix. # "Inline" .version so it's not a symlink, and includes the suffix.
# Do the meson utils, without modification. # Do the meson utils, without modification.
'' ''
echo ${version} > .version chmod u+w ./.version
cp -r ${../../build-utils-meson} build-utils-meson echo ${version} > ../../.version
''; '';
mesonFlags = [ mesonFlags = [
@ -78,8 +68,7 @@ mkDerivation (finalAttrs: {
separateDebugInfo = !stdenv.hostPlatform.isStatic; separateDebugInfo = !stdenv.hostPlatform.isStatic;
# TODO Always true after https://github.com/NixOS/nixpkgs/issues/318564 strictDeps = true;
strictDeps = !withCoverageChecks;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie"; hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
@ -87,8 +76,4 @@ mkDerivation (finalAttrs: {
platforms = lib.platforms.unix ++ lib.platforms.windows; platforms = lib.platforms.unix ++ lib.platforms.windows;
}; };
} // lib.optionalAttrs withCoverageChecks {
lcovFilter = [ "*/boost/*" "*-tab.*" ];
hardeningDisable = [ "fortify" ];
}) })

28
src/libutil/package.nix
View file

@ -18,25 +18,12 @@
# Configuration Options # Configuration Options
, versionSuffix ? "" , versionSuffix ? ""
# Check test coverage of Nix. Probably want to use with at least
# one of `doCheck` or `doInstallCheck` enabled.
, withCoverageChecks ? false
}: }:
let let
inherit (lib) fileset; inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix; 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 in
mkMesonDerivation (finalAttrs: { mkMesonDerivation (finalAttrs: {
@ -45,6 +32,8 @@ mkMesonDerivation (finalAttrs: {
workDir = ./.; workDir = ./.;
fileset = fileset.unions [ fileset = fileset.unions [
../../build-utils-meson
./build-utils-meson
../../.version ../../.version
./.version ./.version
./meson.build ./meson.build
@ -78,12 +67,14 @@ mkMesonDerivation (finalAttrs: {
]; ];
preConfigure = 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. # 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 chmod u+w ./.version
echo ${version} > ../../.version echo ${version} > ../../.version
cp -r ${../../build-utils-meson} build-utils-meson
''; '';
mesonFlags = [ mesonFlags = [
@ -103,8 +94,7 @@ mkMesonDerivation (finalAttrs: {
separateDebugInfo = !stdenv.hostPlatform.isStatic; separateDebugInfo = !stdenv.hostPlatform.isStatic;
# TODO Always true after https://github.com/NixOS/nixpkgs/issues/318564 strictDeps = true;
strictDeps = !withCoverageChecks;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie"; hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
@ -112,8 +102,4 @@ mkMesonDerivation (finalAttrs: {
platforms = lib.platforms.unix ++ lib.platforms.windows; platforms = lib.platforms.unix ++ lib.platforms.windows;
}; };
} // lib.optionalAttrs withCoverageChecks {
lcovFilter = [ "*/boost/*" "*-tab.*" ];
hardeningDisable = [ "fortify" ];
}) })

47
src/nix-expr-test-support/package.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, stdenv , stdenv
, mkMesonDerivation
, releaseTools , releaseTools
, meson , meson
@ -14,40 +15,29 @@
# Configuration Options # Configuration Options
, versionSuffix ? "" , versionSuffix ? ""
# Check test coverage of Nix. Probably want to use with at least
# one of `doCheck` or `doInstallCheck` enabled.
, withCoverageChecks ? false
}: }:
let let
inherit (lib) fileset; inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix; 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 in
mkDerivation (finalAttrs: { mkMesonDerivation (finalAttrs: {
pname = "nix-util-test-support"; pname = "nix-util-test-support";
inherit version; inherit version;
src = fileset.toSource { workDir = ./.;
root = ./.; fileset = fileset.unions [
fileset = fileset.unions [ ../../build-utils-meson
./meson.build ./build-utils-meson
# ./meson.options ../../.version
(fileset.fileFilter (file: file.hasExt "cc") ./.) ./.version
(fileset.fileFilter (file: file.hasExt "hh") ./.) ./meson.build
]; # ./meson.options
}; (fileset.fileFilter (file: file.hasExt "cc") ./.)
(fileset.fileFilter (file: file.hasExt "hh") ./.)
];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -67,8 +57,8 @@ mkDerivation (finalAttrs: {
# "Inline" .version so it's not a symlink, and includes the suffix. # "Inline" .version so it's not a symlink, and includes the suffix.
# Do the meson utils, without modification. # Do the meson utils, without modification.
'' ''
echo ${version} > .version chmod u+w ./.version
cp -r ${../../build-utils-meson} build-utils-meson echo ${version} > ../../.version
''; '';
mesonFlags = [ mesonFlags = [
@ -82,8 +72,7 @@ mkDerivation (finalAttrs: {
separateDebugInfo = !stdenv.hostPlatform.isStatic; separateDebugInfo = !stdenv.hostPlatform.isStatic;
# TODO Always true after https://github.com/NixOS/nixpkgs/issues/318564 strictDeps = true;
strictDeps = !withCoverageChecks;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie"; hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
@ -91,8 +80,4 @@ mkDerivation (finalAttrs: {
platforms = lib.platforms.unix ++ lib.platforms.windows; platforms = lib.platforms.unix ++ lib.platforms.windows;
}; };
} // lib.optionalAttrs withCoverageChecks {
lcovFilter = [ "*/boost/*" "*-tab.*" ];
hardeningDisable = [ "fortify" ];
}) })

47
src/nix-expr-tests/package.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, stdenv , stdenv
, mkMesonDerivation
, releaseTools , releaseTools
, meson , meson
@ -17,40 +18,29 @@
# Configuration Options # Configuration Options
, versionSuffix ? "" , versionSuffix ? ""
# Check test coverage of Nix. Probably want to use with at least
# one of `doCheck` or `doInstallCheck` enabled.
, withCoverageChecks ? false
}: }:
let let
inherit (lib) fileset; inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix; 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 in
mkDerivation (finalAttrs: { mkMesonDerivation (finalAttrs: {
pname = "nix-expr-tests"; pname = "nix-expr-tests";
inherit version; inherit version;
src = fileset.toSource { workDir = ./.;
root = ./.; fileset = fileset.unions [
fileset = fileset.unions [ ../../build-utils-meson
./meson.build ./build-utils-meson
# ./meson.options ../../.version
(fileset.fileFilter (file: file.hasExt "cc") ./.) ./.version
(fileset.fileFilter (file: file.hasExt "hh") ./.) ./meson.build
]; # ./meson.options
}; (fileset.fileFilter (file: file.hasExt "cc") ./.)
(fileset.fileFilter (file: file.hasExt "hh") ./.)
];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -72,8 +62,8 @@ mkDerivation (finalAttrs: {
# "Inline" .version so it's not a symlink, and includes the suffix. # "Inline" .version so it's not a symlink, and includes the suffix.
# Do the meson utils, without modification. # Do the meson utils, without modification.
'' ''
echo ${version} > .version chmod u+w ./.version
cp -r ${../../build-utils-meson} build-utils-meson echo ${version} > ../../.version
''; '';
mesonFlags = [ mesonFlags = [
@ -87,8 +77,7 @@ mkDerivation (finalAttrs: {
separateDebugInfo = !stdenv.hostPlatform.isStatic; separateDebugInfo = !stdenv.hostPlatform.isStatic;
# TODO Always true after https://github.com/NixOS/nixpkgs/issues/318564 strictDeps = true;
strictDeps = !withCoverageChecks;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie"; hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
@ -108,8 +97,4 @@ mkDerivation (finalAttrs: {
platforms = lib.platforms.unix ++ lib.platforms.windows; platforms = lib.platforms.unix ++ lib.platforms.windows;
}; };
} // lib.optionalAttrs withCoverageChecks {
lcovFilter = [ "*/boost/*" "*-tab.*" ];
hardeningDisable = [ "fortify" ];
}) })

47
src/nix-fetchers-tests/package.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, stdenv , stdenv
, mkMesonDerivation
, releaseTools , releaseTools
, meson , meson
@ -16,40 +17,29 @@
# Configuration Options # Configuration Options
, versionSuffix ? "" , versionSuffix ? ""
# Check test coverage of Nix. Probably want to use with at least
# one of `doCheck` or `doInstallCheck` enabled.
, withCoverageChecks ? false
}: }:
let let
inherit (lib) fileset; inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix; 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 in
mkDerivation (finalAttrs: { mkMesonDerivation (finalAttrs: {
pname = "nix-fetchers-tests"; pname = "nix-fetchers-tests";
inherit version; inherit version;
src = fileset.toSource { workDir = ./.;
root = ./.; fileset = fileset.unions [
fileset = fileset.unions [ ../../build-utils-meson
./meson.build ./build-utils-meson
# ./meson.options ../../.version
(fileset.fileFilter (file: file.hasExt "cc") ./.) ./.version
(fileset.fileFilter (file: file.hasExt "hh") ./.) ./meson.build
]; # ./meson.options
}; (fileset.fileFilter (file: file.hasExt "cc") ./.)
(fileset.fileFilter (file: file.hasExt "hh") ./.)
];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -70,8 +60,8 @@ mkDerivation (finalAttrs: {
# "Inline" .version so it's not a symlink, and includes the suffix. # "Inline" .version so it's not a symlink, and includes the suffix.
# Do the meson utils, without modification. # Do the meson utils, without modification.
'' ''
echo ${version} > .version chmod u+w ./.version
cp -r ${../../build-utils-meson} build-utils-meson echo ${version} > ../../.version
''; '';
mesonFlags = [ mesonFlags = [
@ -85,8 +75,7 @@ mkDerivation (finalAttrs: {
separateDebugInfo = !stdenv.hostPlatform.isStatic; separateDebugInfo = !stdenv.hostPlatform.isStatic;
# TODO Always true after https://github.com/NixOS/nixpkgs/issues/318564 strictDeps = true;
strictDeps = !withCoverageChecks;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie"; hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
@ -106,8 +95,4 @@ mkDerivation (finalAttrs: {
platforms = lib.platforms.unix ++ lib.platforms.windows; platforms = lib.platforms.unix ++ lib.platforms.windows;
}; };
} // lib.optionalAttrs withCoverageChecks {
lcovFilter = [ "*/boost/*" "*-tab.*" ];
hardeningDisable = [ "fortify" ];
}) })

47
src/nix-flake-tests/package.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, stdenv , stdenv
, mkMesonDerivation
, releaseTools , releaseTools
, meson , meson
@ -16,40 +17,29 @@
# Configuration Options # Configuration Options
, versionSuffix ? "" , versionSuffix ? ""
# Check test coverage of Nix. Probably want to use with at least
# one of `doCheck` or `doInstallCheck` enabled.
, withCoverageChecks ? false
}: }:
let let
inherit (lib) fileset; inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix; 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 in
mkDerivation (finalAttrs: { mkMesonDerivation (finalAttrs: {
pname = "nix-flake-tests"; pname = "nix-flake-tests";
inherit version; inherit version;
src = fileset.toSource { workDir = ./.;
root = ./.; fileset = fileset.unions [
fileset = fileset.unions [ ../../build-utils-meson
./meson.build ./build-utils-meson
# ./meson.options ../../.version
(fileset.fileFilter (file: file.hasExt "cc") ./.) ./.version
(fileset.fileFilter (file: file.hasExt "hh") ./.) ./meson.build
]; # ./meson.options
}; (fileset.fileFilter (file: file.hasExt "cc") ./.)
(fileset.fileFilter (file: file.hasExt "hh") ./.)
];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -70,8 +60,8 @@ mkDerivation (finalAttrs: {
# "Inline" .version so it's not a symlink, and includes the suffix. # "Inline" .version so it's not a symlink, and includes the suffix.
# Do the meson utils, without modification. # Do the meson utils, without modification.
'' ''
echo ${version} > .version chmod u+w ./.version
cp -r ${../../build-utils-meson} build-utils-meson echo ${version} > ../../.version
''; '';
mesonFlags = [ mesonFlags = [
@ -85,8 +75,7 @@ mkDerivation (finalAttrs: {
separateDebugInfo = !stdenv.hostPlatform.isStatic; separateDebugInfo = !stdenv.hostPlatform.isStatic;
# TODO Always true after https://github.com/NixOS/nixpkgs/issues/318564 strictDeps = true;
strictDeps = !withCoverageChecks;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie"; hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
@ -106,8 +95,4 @@ mkDerivation (finalAttrs: {
platforms = lib.platforms.unix ++ lib.platforms.windows; platforms = lib.platforms.unix ++ lib.platforms.windows;
}; };
} // lib.optionalAttrs withCoverageChecks {
lcovFilter = [ "*/boost/*" "*-tab.*" ];
hardeningDisable = [ "fortify" ];
}) })

47
src/nix-store-test-support/package.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, stdenv , stdenv
, mkMesonDerivation
, releaseTools , releaseTools
, meson , meson
@ -14,40 +15,29 @@
# Configuration Options # Configuration Options
, versionSuffix ? "" , versionSuffix ? ""
# Check test coverage of Nix. Probably want to use with at least
# one of `doCheck` or `doInstallCheck` enabled.
, withCoverageChecks ? false
}: }:
let let
inherit (lib) fileset; inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix; 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 in
mkDerivation (finalAttrs: { mkMesonDerivation (finalAttrs: {
pname = "nix-store-test-support"; pname = "nix-store-test-support";
inherit version; inherit version;
src = fileset.toSource { workDir = ./.;
root = ./.; fileset = fileset.unions [
fileset = fileset.unions [ ../../build-utils-meson
./meson.build ./build-utils-meson
# ./meson.options ../../.version
(fileset.fileFilter (file: file.hasExt "cc") ./.) ./.version
(fileset.fileFilter (file: file.hasExt "hh") ./.) ./meson.build
]; # ./meson.options
}; (fileset.fileFilter (file: file.hasExt "cc") ./.)
(fileset.fileFilter (file: file.hasExt "hh") ./.)
];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -67,8 +57,8 @@ mkDerivation (finalAttrs: {
# "Inline" .version so it's not a symlink, and includes the suffix. # "Inline" .version so it's not a symlink, and includes the suffix.
# Do the meson utils, without modification. # Do the meson utils, without modification.
'' ''
echo ${version} > .version chmod u+w ./.version
cp -r ${../../build-utils-meson} build-utils-meson echo ${version} > ../../.version
''; '';
mesonFlags = [ mesonFlags = [
@ -82,8 +72,7 @@ mkDerivation (finalAttrs: {
separateDebugInfo = !stdenv.hostPlatform.isStatic; separateDebugInfo = !stdenv.hostPlatform.isStatic;
# TODO Always true after https://github.com/NixOS/nixpkgs/issues/318564 strictDeps = true;
strictDeps = !withCoverageChecks;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie"; hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
@ -91,8 +80,4 @@ mkDerivation (finalAttrs: {
platforms = lib.platforms.unix ++ lib.platforms.windows; platforms = lib.platforms.unix ++ lib.platforms.windows;
}; };
} // lib.optionalAttrs withCoverageChecks {
lcovFilter = [ "*/boost/*" "*-tab.*" ];
hardeningDisable = [ "fortify" ];
}) })

47
src/nix-store-tests/package.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, stdenv , stdenv
, mkMesonDerivation
, releaseTools , releaseTools
, meson , meson
@ -18,40 +19,29 @@
# Configuration Options # Configuration Options
, versionSuffix ? "" , versionSuffix ? ""
# Check test coverage of Nix. Probably want to use with at least
# one of `doCheck` or `doInstallCheck` enabled.
, withCoverageChecks ? false
}: }:
let let
inherit (lib) fileset; inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix; 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 in
mkDerivation (finalAttrs: { mkMesonDerivation (finalAttrs: {
pname = "nix-store-tests"; pname = "nix-store-tests";
inherit version; inherit version;
src = fileset.toSource { workDir = ./.;
root = ./.; fileset = fileset.unions [
fileset = fileset.unions [ ../../build-utils-meson
./meson.build ./build-utils-meson
# ./meson.options ../../.version
(fileset.fileFilter (file: file.hasExt "cc") ./.) ./.version
(fileset.fileFilter (file: file.hasExt "hh") ./.) ./meson.build
]; # ./meson.options
}; (fileset.fileFilter (file: file.hasExt "cc") ./.)
(fileset.fileFilter (file: file.hasExt "hh") ./.)
];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -74,8 +64,8 @@ mkDerivation (finalAttrs: {
# "Inline" .version so it's not a symlink, and includes the suffix. # "Inline" .version so it's not a symlink, and includes the suffix.
# Do the meson utils, without modification. # Do the meson utils, without modification.
'' ''
echo ${version} > .version chmod u+w ./.version
cp -r ${../../build-utils-meson} build-utils-meson echo ${version} > ../../.version
''; '';
mesonFlags = [ mesonFlags = [
@ -89,8 +79,7 @@ mkDerivation (finalAttrs: {
separateDebugInfo = !stdenv.hostPlatform.isStatic; separateDebugInfo = !stdenv.hostPlatform.isStatic;
# TODO Always true after https://github.com/NixOS/nixpkgs/issues/318564 strictDeps = true;
strictDeps = !withCoverageChecks;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie"; hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
@ -115,8 +104,4 @@ mkDerivation (finalAttrs: {
platforms = lib.platforms.unix ++ lib.platforms.windows; platforms = lib.platforms.unix ++ lib.platforms.windows;
}; };
} // lib.optionalAttrs withCoverageChecks {
lcovFilter = [ "*/boost/*" "*-tab.*" ];
hardeningDisable = [ "fortify" ];
}) })

47
src/nix-util-test-support/package.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, stdenv , stdenv
, mkMesonDerivation
, releaseTools , releaseTools
, meson , meson
@ -13,40 +14,29 @@
# Configuration Options # Configuration Options
, versionSuffix ? "" , versionSuffix ? ""
# Check test coverage of Nix. Probably want to use with at least
# one of `doCheck` or `doInstallCheck` enabled.
, withCoverageChecks ? false
}: }:
let let
inherit (lib) fileset; inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix; 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 in
mkDerivation (finalAttrs: { mkMesonDerivation (finalAttrs: {
pname = "nix-util-test-support"; pname = "nix-util-test-support";
inherit version; inherit version;
src = fileset.toSource { workDir = ./.;
root = ./.; fileset = fileset.unions [
fileset = fileset.unions [ ../../build-utils-meson
./meson.build ./build-utils-meson
# ./meson.options ../../.version
(fileset.fileFilter (file: file.hasExt "cc") ./.) ./.version
(fileset.fileFilter (file: file.hasExt "hh") ./.) ./meson.build
]; # ./meson.options
}; (fileset.fileFilter (file: file.hasExt "cc") ./.)
(fileset.fileFilter (file: file.hasExt "hh") ./.)
];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -65,8 +55,8 @@ mkDerivation (finalAttrs: {
# "Inline" .version so it's not a symlink, and includes the suffix. # "Inline" .version so it's not a symlink, and includes the suffix.
# Do the meson utils, without modification. # Do the meson utils, without modification.
'' ''
echo ${version} > .version chmod u+w ./.version
cp -r ${../../build-utils-meson} build-utils-meson echo ${version} > ../../.version
''; '';
mesonFlags = [ mesonFlags = [
@ -80,8 +70,7 @@ mkDerivation (finalAttrs: {
separateDebugInfo = !stdenv.hostPlatform.isStatic; separateDebugInfo = !stdenv.hostPlatform.isStatic;
# TODO Always true after https://github.com/NixOS/nixpkgs/issues/318564 strictDeps = true;
strictDeps = !withCoverageChecks;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie"; hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
@ -89,8 +78,4 @@ mkDerivation (finalAttrs: {
platforms = lib.platforms.unix ++ lib.platforms.windows; platforms = lib.platforms.unix ++ lib.platforms.windows;
}; };
} // lib.optionalAttrs withCoverageChecks {
lcovFilter = [ "*/boost/*" "*-tab.*" ];
hardeningDisable = [ "fortify" ];
}) })

47
src/nix-util-tests/package.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, stdenv , stdenv
, mkMesonDerivation
, releaseTools , releaseTools
, meson , meson
@ -17,40 +18,29 @@
# Configuration Options # Configuration Options
, versionSuffix ? "" , versionSuffix ? ""
# Check test coverage of Nix. Probably want to use with at least
# one of `doCheck` or `doInstallCheck` enabled.
, withCoverageChecks ? false
}: }:
let let
inherit (lib) fileset; inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix; 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 in
mkDerivation (finalAttrs: { mkMesonDerivation (finalAttrs: {
pname = "nix-util-tests"; pname = "nix-util-tests";
inherit version; inherit version;
src = fileset.toSource { workDir = ./.;
root = ./.; fileset = fileset.unions [
fileset = fileset.unions [ ../../build-utils-meson
./meson.build ./build-utils-meson
# ./meson.options ../../.version
(fileset.fileFilter (file: file.hasExt "cc") ./.) ./.version
(fileset.fileFilter (file: file.hasExt "hh") ./.) ./meson.build
]; # ./meson.options
}; (fileset.fileFilter (file: file.hasExt "cc") ./.)
(fileset.fileFilter (file: file.hasExt "hh") ./.)
];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -72,8 +62,8 @@ mkDerivation (finalAttrs: {
# "Inline" .version so it's not a symlink, and includes the suffix. # "Inline" .version so it's not a symlink, and includes the suffix.
# Do the meson utils, without modification. # Do the meson utils, without modification.
'' ''
echo ${version} > .version chmod u+w ./.version
cp -r ${../../build-utils-meson} build-utils-meson echo ${version} > ../../.version
''; '';
mesonFlags = [ mesonFlags = [
@ -87,8 +77,7 @@ mkDerivation (finalAttrs: {
separateDebugInfo = !stdenv.hostPlatform.isStatic; separateDebugInfo = !stdenv.hostPlatform.isStatic;
# TODO Always true after https://github.com/NixOS/nixpkgs/issues/318564 strictDeps = true;
strictDeps = !withCoverageChecks;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie"; hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
@ -108,8 +97,4 @@ mkDerivation (finalAttrs: {
platforms = lib.platforms.unix ++ lib.platforms.windows; platforms = lib.platforms.unix ++ lib.platforms.windows;
}; };
} // lib.optionalAttrs withCoverageChecks {
lcovFilter = [ "*/boost/*" "*-tab.*" ];
hardeningDisable = [ "fortify" ];
}) })