NixOS/nix
NixOS/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2024-10-18 00:16:11 -04:00
Code Activity

Merge pull request #11688 from roberth/meson-tidy

Browse source 
Clean up the `package.nix` files
This commit is contained in:
Robert Hensing 2024-10-14 17:40:46 +02:00 committed by GitHub
parent d5c45952ac 15e3e1543b
commit 806a91f7bf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
25 changed files with 92 additions and 390 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
packaging/dependencies.nix
View file

@ -38,6 +38,10 @@ let
# Indirection for Nixpkgs to override when package.nix files are vendored # Indirection for Nixpkgs to override when package.nix files are vendored
filesetToSource = lib.fileset.toSource; filesetToSource = lib.fileset.toSource;
/** Given a set of layers, create a mkDerivation-like function */
mkPackageBuilder = exts: userFn:
stdenv.mkDerivation (lib.extends (lib.composeManyExtensions exts) userFn);
localSourceLayer = finalAttrs: prevAttrs: localSourceLayer = finalAttrs: prevAttrs:
let let
workDirPath = workDirPath =
@ -60,6 +64,28 @@ let
workDir = null; workDir = null;
}; };
mesonLayer = finalAttrs: prevAttrs:
{
nativeBuildInputs = [
pkgs.buildPackages.meson
pkgs.buildPackages.ninja
] ++ prevAttrs.nativeBuildInputs or [];
};
mesonBuildLayer = finalAttrs: prevAttrs:
{
nativeBuildInputs = prevAttrs.nativeBuildInputs or [] ++ [
pkgs.buildPackages.pkg-config
];
separateDebugInfo = !stdenv.hostPlatform.isStatic;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
};
mesonLibraryLayer = finalAttrs: prevAttrs:
{
outputs = prevAttrs.outputs or [ "out" ] ++ [ "dev" ];
};
# Work around weird `--as-needed` linker behavior with BSD, see # Work around weird `--as-needed` linker behavior with BSD, see
# https://github.com/mesonbuild/meson/issues/3593 # https://github.com/mesonbuild/meson/issues/3593
bsdNoLinkAsNeeded = finalAttrs: prevAttrs: bsdNoLinkAsNeeded = finalAttrs: prevAttrs:
@ -172,14 +198,27 @@ scope: {
inherit resolvePath filesetToSource; inherit resolvePath filesetToSource;
mkMesonDerivation = f: let mkMesonDerivation =
exts = [ mkPackageBuilder [
miscGoodPractice
localSourceLayer
mesonLayer
];
mkMesonExecutable =
mkPackageBuilder [
miscGoodPractice miscGoodPractice
bsdNoLinkAsNeeded bsdNoLinkAsNeeded
localSourceLayer localSourceLayer
mesonLayer
mesonBuildLayer
];
mkMesonLibrary =
mkPackageBuilder [
miscGoodPractice
bsdNoLinkAsNeeded
localSourceLayer
mesonLayer
mesonBuildLayer
mesonLibraryLayer
]; ];
in stdenv.mkDerivation
(lib.extends
(lib.foldr lib.composeExtensions (_: _: {}) exts)
f);
} }

4
src/external-api-docs/package.nix
View file

@ -1,8 +1,6 @@
{ lib { lib
, mkMesonDerivation , mkMesonDerivation
, meson
, ninja
, doxygen , doxygen
# Configuration Options # Configuration Options
@ -37,8 +35,6 @@ mkMesonDerivation (finalAttrs: {
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
meson
ninja
doxygen doxygen
]; ];

4
src/internal-api-docs/package.nix
View file

@ -1,8 +1,6 @@
{ lib { lib
, mkMesonDerivation , mkMesonDerivation
, meson
, ninja
, doxygen , doxygen
# Configuration Options # Configuration Options
@ -32,8 +30,6 @@ mkMesonDerivation (finalAttrs: {
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
meson
ninja
doxygen doxygen
]; ];

21
src/libcmd/package.nix
View file

@ -1,11 +1,6 @@
{ lib { lib
, stdenv , stdenv
, mkMesonDerivation , mkMesonLibrary
, releaseTools
, meson
, ninja
, pkg-config
, nix-util , nix-util
, nix-store , nix-store
@ -38,7 +33,7 @@ let
inherit (lib) fileset; inherit (lib) fileset;
in in
mkMesonDerivation (finalAttrs: { mkMesonLibrary (finalAttrs: {
pname = "nix-cmd"; pname = "nix-cmd";
inherit version; inherit version;
@ -54,14 +49,6 @@ mkMesonDerivation (finalAttrs: {
(fileset.fileFilter (file: file.hasExt "hh") ./.) (fileset.fileFilter (file: file.hasExt "hh") ./.)
]; ];
outputs = [ "out" "dev" ];
nativeBuildInputs = [
meson
ninja
pkg-config
];
buildInputs = [ buildInputs = [
({ inherit editline readline; }.${readlineFlavor}) ({ inherit editline readline; }.${readlineFlavor})
] ++ lib.optional enableMarkdown lowdown; ] ++ lib.optional enableMarkdown lowdown;
@ -93,10 +80,6 @@ mkMesonDerivation (finalAttrs: {
LDFLAGS = "-fuse-ld=gold"; LDFLAGS = "-fuse-ld=gold";
}; };
separateDebugInfo = !stdenv.hostPlatform.isStatic;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
meta = { meta = {
platforms = lib.platforms.unix ++ lib.platforms.windows; platforms = lib.platforms.unix ++ lib.platforms.windows;
}; };

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

@ -1,10 +1,6 @@
{ lib { lib
, stdenv , stdenv
, mkMesonDerivation , mkMesonLibrary
, meson
, ninja
, pkg-config
, nix-store-c , nix-store-c
, nix-expr , nix-expr
@ -18,7 +14,7 @@ let
inherit (lib) fileset; inherit (lib) fileset;
in in
mkMesonDerivation (finalAttrs: { mkMesonLibrary (finalAttrs: {
pname = "nix-expr-c"; pname = "nix-expr-c";
inherit version; inherit version;
@ -35,14 +31,6 @@ mkMesonDerivation (finalAttrs: {
(fileset.fileFilter (file: file.hasExt "h") ./.) (fileset.fileFilter (file: file.hasExt "h") ./.)
]; ];
outputs = [ "out" "dev" ];
nativeBuildInputs = [
meson
ninja
pkg-config
];
propagatedBuildInputs = [ propagatedBuildInputs = [
nix-store-c nix-store-c
nix-expr nix-expr
@ -63,10 +51,6 @@ mkMesonDerivation (finalAttrs: {
LDFLAGS = "-fuse-ld=gold"; LDFLAGS = "-fuse-ld=gold";
}; };
separateDebugInfo = !stdenv.hostPlatform.isStatic;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
meta = { meta = {
platforms = lib.platforms.unix ++ lib.platforms.windows; platforms = lib.platforms.unix ++ lib.platforms.windows;
}; };

22
src/libexpr/package.nix
View file

@ -1,11 +1,7 @@
{ lib { lib
, stdenv , stdenv
, mkMesonDerivation , mkMesonLibrary
, releaseTools
, meson
, ninja
, pkg-config
, bison , bison
, flex , flex
, cmake # for resolving toml11 dep , cmake # for resolving toml11 dep
@ -38,7 +34,7 @@ let
inherit (lib) fileset; inherit (lib) fileset;
in in
mkMesonDerivation (finalAttrs: { mkMesonLibrary (finalAttrs: {
pname = "nix-expr"; pname = "nix-expr";
inherit version; inherit version;
@ -55,15 +51,13 @@ mkMesonDerivation (finalAttrs: {
(fileset.fileFilter (file: file.hasExt "hh") ./.) (fileset.fileFilter (file: file.hasExt "hh") ./.)
./lexer.l ./lexer.l
./parser.y ./parser.y
(fileset.fileFilter (file: file.hasExt "nix") ./.) (fileset.difference
(fileset.fileFilter (file: file.hasExt "nix") ./.)
./package.nix
)
]; ];
outputs = [ "out" "dev" ];
nativeBuildInputs = [ nativeBuildInputs = [
meson
ninja
pkg-config
bison bison
flex flex
cmake cmake
@ -102,10 +96,6 @@ mkMesonDerivation (finalAttrs: {
LDFLAGS = "-fuse-ld=gold"; LDFLAGS = "-fuse-ld=gold";
}; };
separateDebugInfo = !stdenv.hostPlatform.isStatic;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
meta = { meta = {
platforms = lib.platforms.unix ++ lib.platforms.windows; platforms = lib.platforms.unix ++ lib.platforms.windows;
}; };

22
src/libfetchers/package.nix
View file

@ -1,17 +1,11 @@
{ lib { lib
, stdenv , stdenv
, mkMesonDerivation , mkMesonLibrary
, releaseTools
, meson
, ninja
, pkg-config
, nix-util , nix-util
, nix-store , nix-store
, nlohmann_json , nlohmann_json
, libgit2 , libgit2
, man
# Configuration Options # Configuration Options
@ -22,7 +16,7 @@ let
inherit (lib) fileset; inherit (lib) fileset;
in in
mkMesonDerivation (finalAttrs: { mkMesonLibrary (finalAttrs: {
pname = "nix-fetchers"; pname = "nix-fetchers";
inherit version; inherit version;
@ -37,14 +31,6 @@ mkMesonDerivation (finalAttrs: {
(fileset.fileFilter (file: file.hasExt "hh") ./.) (fileset.fileFilter (file: file.hasExt "hh") ./.)
]; ];
outputs = [ "out" "dev" ];
nativeBuildInputs = [
meson
ninja
pkg-config
];
buildInputs = [ buildInputs = [
libgit2 libgit2
]; ];
@ -67,10 +53,6 @@ mkMesonDerivation (finalAttrs: {
LDFLAGS = "-fuse-ld=gold"; LDFLAGS = "-fuse-ld=gold";
}; };
separateDebugInfo = !stdenv.hostPlatform.isStatic;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
meta = { meta = {
platforms = lib.platforms.unix ++ lib.platforms.windows; platforms = lib.platforms.unix ++ lib.platforms.windows;
}; };

23
src/libflake/package.nix
View file

@ -1,19 +1,12 @@
{ lib { lib
, stdenv , stdenv
, mkMesonDerivation , mkMesonLibrary
, releaseTools
, meson
, ninja
, pkg-config
, nix-util , nix-util
, nix-store , nix-store
, nix-fetchers , nix-fetchers
, nix-expr , nix-expr
, nlohmann_json , nlohmann_json
, libgit2
, man
# Configuration Options # Configuration Options
@ -24,7 +17,7 @@ let
inherit (lib) fileset; inherit (lib) fileset;
in in
mkMesonDerivation (finalAttrs: { mkMesonLibrary (finalAttrs: {
pname = "nix-flake"; pname = "nix-flake";
inherit version; inherit version;
@ -39,14 +32,6 @@ mkMesonDerivation (finalAttrs: {
(fileset.fileFilter (file: file.hasExt "hh") ./.) (fileset.fileFilter (file: file.hasExt "hh") ./.)
]; ];
outputs = [ "out" "dev" ];
nativeBuildInputs = [
meson
ninja
pkg-config
];
propagatedBuildInputs = [ propagatedBuildInputs = [
nix-store nix-store
nix-util nix-util
@ -67,10 +52,6 @@ mkMesonDerivation (finalAttrs: {
LDFLAGS = "-fuse-ld=gold"; LDFLAGS = "-fuse-ld=gold";
}; };
separateDebugInfo = !stdenv.hostPlatform.isStatic;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
meta = { meta = {
platforms = lib.platforms.unix ++ lib.platforms.windows; platforms = lib.platforms.unix ++ lib.platforms.windows;
}; };

21
src/libmain-c/package.nix
View file

@ -1,11 +1,6 @@
{ lib { lib
, stdenv , stdenv
, mkMesonDerivation , mkMesonLibrary
, releaseTools
, meson
, ninja
, pkg-config
, nix-util-c , nix-util-c
, nix-store , nix-store
@ -21,7 +16,7 @@ let
inherit (lib) fileset; inherit (lib) fileset;
in in
mkMesonDerivation (finalAttrs: { mkMesonLibrary (finalAttrs: {
pname = "nix-main-c"; pname = "nix-main-c";
inherit version; inherit version;
@ -38,14 +33,6 @@ mkMesonDerivation (finalAttrs: {
(fileset.fileFilter (file: file.hasExt "h") ./.) (fileset.fileFilter (file: file.hasExt "h") ./.)
]; ];
outputs = [ "out" "dev" ];
nativeBuildInputs = [
meson
ninja
pkg-config
];
propagatedBuildInputs = [ propagatedBuildInputs = [
nix-util-c nix-util-c
nix-store nix-store
@ -68,10 +55,6 @@ mkMesonDerivation (finalAttrs: {
LDFLAGS = "-fuse-ld=gold"; LDFLAGS = "-fuse-ld=gold";
}; };
separateDebugInfo = !stdenv.hostPlatform.isStatic;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
meta = { meta = {
platforms = lib.platforms.unix ++ lib.platforms.windows; platforms = lib.platforms.unix ++ lib.platforms.windows;
}; };

21
src/libmain/package.nix
View file

@ -1,11 +1,6 @@
{ lib { lib
, stdenv , stdenv
, mkMesonDerivation , mkMesonLibrary
, releaseTools
, meson
, ninja
, pkg-config
, openssl , openssl
@ -21,7 +16,7 @@ let
inherit (lib) fileset; inherit (lib) fileset;
in in
mkMesonDerivation (finalAttrs: { mkMesonLibrary (finalAttrs: {
pname = "nix-main"; pname = "nix-main";
inherit version; inherit version;
@ -36,14 +31,6 @@ mkMesonDerivation (finalAttrs: {
(fileset.fileFilter (file: file.hasExt "hh") ./.) (fileset.fileFilter (file: file.hasExt "hh") ./.)
]; ];
outputs = [ "out" "dev" ];
nativeBuildInputs = [
meson
ninja
pkg-config
];
propagatedBuildInputs = [ propagatedBuildInputs = [
nix-util nix-util
nix-store nix-store
@ -62,10 +49,6 @@ mkMesonDerivation (finalAttrs: {
LDFLAGS = "-fuse-ld=gold"; LDFLAGS = "-fuse-ld=gold";
}; };
separateDebugInfo = !stdenv.hostPlatform.isStatic;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
meta = { meta = {
platforms = lib.platforms.unix ++ lib.platforms.windows; platforms = lib.platforms.unix ++ lib.platforms.windows;
}; };

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

@ -1,11 +1,6 @@
{ lib { lib
, stdenv , stdenv
, mkMesonDerivation , mkMesonLibrary
, releaseTools
, meson
, ninja
, pkg-config
, nix-util-c , nix-util-c
, nix-store , nix-store
@ -19,7 +14,7 @@ let
inherit (lib) fileset; inherit (lib) fileset;
in in
mkMesonDerivation (finalAttrs: { mkMesonLibrary (finalAttrs: {
pname = "nix-store-c"; pname = "nix-store-c";
inherit version; inherit version;
@ -36,14 +31,6 @@ mkMesonDerivation (finalAttrs: {
(fileset.fileFilter (file: file.hasExt "h") ./.) (fileset.fileFilter (file: file.hasExt "h") ./.)
]; ];
outputs = [ "out" "dev" ];
nativeBuildInputs = [
meson
ninja
pkg-config
];
propagatedBuildInputs = [ propagatedBuildInputs = [
nix-util-c nix-util-c
nix-store nix-store
@ -64,10 +51,6 @@ mkMesonDerivation (finalAttrs: {
LDFLAGS = "-fuse-ld=gold"; LDFLAGS = "-fuse-ld=gold";
}; };
separateDebugInfo = !stdenv.hostPlatform.isStatic;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
meta = { meta = {
platforms = lib.platforms.unix ++ lib.platforms.windows; platforms = lib.platforms.unix ++ lib.platforms.windows;
}; };

21
src/libstore/package.nix
View file

@ -1,11 +1,7 @@
{ lib { lib
, stdenv , stdenv
, mkMesonDerivation , mkMesonLibrary
, releaseTools
, meson
, ninja
, pkg-config
, unixtools , unixtools
, nix-util , nix-util
@ -29,7 +25,7 @@ let
inherit (lib) fileset; inherit (lib) fileset;
in in
mkMesonDerivation (finalAttrs: { mkMesonLibrary (finalAttrs: {
pname = "nix-store"; pname = "nix-store";
inherit version; inherit version;
@ -51,13 +47,8 @@ mkMesonDerivation (finalAttrs: {
(fileset.fileFilter (file: file.hasExt "sql") ./.) (fileset.fileFilter (file: file.hasExt "sql") ./.)
]; ];
outputs = [ "out" "dev" ]; nativeBuildInputs =
lib.optional embeddedSandboxShell unixtools.hexdump;
nativeBuildInputs = [
meson
ninja
pkg-config
] ++ lib.optional embeddedSandboxShell unixtools.hexdump;
buildInputs = [ buildInputs = [
boost boost
@ -98,10 +89,6 @@ mkMesonDerivation (finalAttrs: {
LDFLAGS = "-fuse-ld=gold"; LDFLAGS = "-fuse-ld=gold";
}; };
separateDebugInfo = !stdenv.hostPlatform.isStatic;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
meta = { meta = {
platforms = lib.platforms.unix ++ lib.platforms.windows; platforms = lib.platforms.unix ++ lib.platforms.windows;
}; };

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

@ -1,11 +1,6 @@
{ lib { lib
, stdenv , stdenv
, mkMesonDerivation , mkMesonLibrary
, releaseTools
, meson
, ninja
, pkg-config
, nix-util , nix-util
@ -18,7 +13,7 @@ let
inherit (lib) fileset; inherit (lib) fileset;
in in
mkMesonDerivation (finalAttrs: { mkMesonLibrary (finalAttrs: {
pname = "nix-util-c"; pname = "nix-util-c";
inherit version; inherit version;
@ -35,14 +30,6 @@ mkMesonDerivation (finalAttrs: {
(fileset.fileFilter (file: file.hasExt "h") ./.) (fileset.fileFilter (file: file.hasExt "h") ./.)
]; ];
outputs = [ "out" "dev" ];
nativeBuildInputs = [
meson
ninja
pkg-config
];
propagatedBuildInputs = [ propagatedBuildInputs = [
nix-util nix-util
]; ];
@ -62,10 +49,6 @@ mkMesonDerivation (finalAttrs: {
LDFLAGS = "-fuse-ld=gold"; LDFLAGS = "-fuse-ld=gold";
}; };
separateDebugInfo = !stdenv.hostPlatform.isStatic;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
meta = { meta = {
platforms = lib.platforms.unix ++ lib.platforms.windows; platforms = lib.platforms.unix ++ lib.platforms.windows;
}; };

21
src/libutil/package.nix
View file

@ -1,11 +1,6 @@
{ lib { lib
, stdenv , stdenv
, mkMesonDerivation , mkMesonLibrary
, releaseTools
, meson
, ninja
, pkg-config
, boost , boost
, brotli , brotli
@ -24,7 +19,7 @@ let
inherit (lib) fileset; inherit (lib) fileset;
in in
mkMesonDerivation (finalAttrs: { mkMesonLibrary (finalAttrs: {
pname = "nix-util"; pname = "nix-util";
inherit version; inherit version;
@ -43,14 +38,6 @@ mkMesonDerivation (finalAttrs: {
(fileset.fileFilter (file: file.hasExt "hh") ./.) (fileset.fileFilter (file: file.hasExt "hh") ./.)
]; ];
outputs = [ "out" "dev" ];
nativeBuildInputs = [
meson
ninja
pkg-config
];
buildInputs = [ buildInputs = [
brotli brotli
libsodium libsodium
@ -88,10 +75,6 @@ mkMesonDerivation (finalAttrs: {
LDFLAGS = "-fuse-ld=gold"; LDFLAGS = "-fuse-ld=gold";
}; };
separateDebugInfo = !stdenv.hostPlatform.isStatic;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
meta = { meta = {
platforms = lib.platforms.unix ++ lib.platforms.windows; platforms = lib.platforms.unix ++ lib.platforms.windows;
}; };

23
src/nix/package.nix
View file

@ -1,21 +1,12 @@
{ lib { lib
, stdenv , stdenv
, mkMesonDerivation , mkMesonExecutable
, releaseTools
, meson
, ninja
, pkg-config
, nix-store , nix-store
, nix-expr , nix-expr
, nix-main , nix-main
, nix-cmd , nix-cmd
, rapidcheck
, gtest
, runCommand
# Configuration Options # Configuration Options
, version , version
@ -25,7 +16,7 @@ let
inherit (lib) fileset; inherit (lib) fileset;
in in
mkMesonDerivation (finalAttrs: { mkMesonExecutable (finalAttrs: {
pname = "nix"; pname = "nix";
inherit version; inherit version;
@ -90,12 +81,6 @@ mkMesonDerivation (finalAttrs: {
] ]
); );
nativeBuildInputs = [
meson
ninja
pkg-config
];
buildInputs = [ buildInputs = [
nix-store nix-store
nix-expr nix-expr
@ -118,10 +103,6 @@ mkMesonDerivation (finalAttrs: {
LDFLAGS = "-fuse-ld=gold"; LDFLAGS = "-fuse-ld=gold";
}; };
separateDebugInfo = !stdenv.hostPlatform.isStatic;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
meta = { meta = {
platforms = lib.platforms.unix ++ lib.platforms.windows; platforms = lib.platforms.unix ++ lib.platforms.windows;
}; };

7
src/perl/package.nix
View file

@ -1,13 +1,10 @@
{ lib { lib
, stdenv , stdenv
, mkMesonDerivation , mkMesonDerivation
, pkg-config
, perl , perl
, perlPackages , perlPackages
, meson
, ninja
, pkg-config
, nix-store , nix-store
, darwin
, version , version
, curl , curl
, bzip2 , bzip2
@ -36,8 +33,6 @@ perl.pkgs.toPerlModule (mkMesonDerivation (finalAttrs: {
]); ]);
nativeBuildInputs = [ nativeBuildInputs = [
meson
ninja
pkg-config pkg-config
perl perl
curl curl

1
tests/functional/package.nix
View file

@ -75,7 +75,6 @@ mkMesonDerivation (finalAttrs: {
nix-expr nix-expr
]; ];
preConfigure = preConfigure =
# "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.

21
tests/unit/libexpr-support/package.nix
View file

@ -1,11 +1,6 @@
{ lib { lib
, stdenv , stdenv
, mkMesonDerivation , mkMesonLibrary
, releaseTools
, meson
, ninja
, pkg-config
, nix-store-test-support , nix-store-test-support
, nix-expr , nix-expr
@ -21,7 +16,7 @@ let
inherit (lib) fileset; inherit (lib) fileset;
in in
mkMesonDerivation (finalAttrs: { mkMesonLibrary (finalAttrs: {
pname = "nix-util-test-support"; pname = "nix-util-test-support";
inherit version; inherit version;
@ -37,14 +32,6 @@ mkMesonDerivation (finalAttrs: {
(fileset.fileFilter (file: file.hasExt "hh") ./.) (fileset.fileFilter (file: file.hasExt "hh") ./.)
]; ];
outputs = [ "out" "dev" ];
nativeBuildInputs = [
meson
ninja
pkg-config
];
propagatedBuildInputs = [ propagatedBuildInputs = [
nix-store-test-support nix-store-test-support
nix-expr nix-expr
@ -66,10 +53,6 @@ mkMesonDerivation (finalAttrs: {
LDFLAGS = "-fuse-ld=gold"; LDFLAGS = "-fuse-ld=gold";
}; };
separateDebugInfo = !stdenv.hostPlatform.isStatic;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
meta = { meta = {
platforms = lib.platforms.unix ++ lib.platforms.windows; platforms = lib.platforms.unix ++ lib.platforms.windows;
}; };

19
tests/unit/libexpr/package.nix
View file

@ -1,12 +1,7 @@
{ lib { lib
, buildPackages , buildPackages
, stdenv , stdenv
, mkMesonDerivation , mkMesonExecutable
, releaseTools
, meson
, ninja
, pkg-config
, nix-expr , nix-expr
, nix-expr-c , nix-expr-c
@ -26,7 +21,7 @@ let
inherit (lib) fileset; inherit (lib) fileset;
in in
mkMesonDerivation (finalAttrs: { mkMesonExecutable (finalAttrs: {
pname = "nix-expr-tests"; pname = "nix-expr-tests";
inherit version; inherit version;
@ -42,12 +37,6 @@ mkMesonDerivation (finalAttrs: {
(fileset.fileFilter (file: file.hasExt "hh") ./.) (fileset.fileFilter (file: file.hasExt "hh") ./.)
]; ];
nativeBuildInputs = [
meson
ninja
pkg-config
];
buildInputs = [ buildInputs = [
nix-expr nix-expr
nix-expr-c nix-expr-c
@ -71,10 +60,6 @@ mkMesonDerivation (finalAttrs: {
LDFLAGS = "-fuse-ld=gold"; LDFLAGS = "-fuse-ld=gold";
}; };
separateDebugInfo = !stdenv.hostPlatform.isStatic;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
passthru = { passthru = {
tests = { tests = {
run = runCommand "${finalAttrs.pname}-run" { run = runCommand "${finalAttrs.pname}-run" {

19
tests/unit/libfetchers/package.nix
View file

@ -1,12 +1,7 @@
{ lib { lib
, buildPackages , buildPackages
, stdenv , stdenv
, mkMesonDerivation , mkMesonExecutable
, releaseTools
, meson
, ninja
, pkg-config
, nix-fetchers , nix-fetchers
, nix-store-test-support , nix-store-test-support
@ -25,7 +20,7 @@ let
inherit (lib) fileset; inherit (lib) fileset;
in in
mkMesonDerivation (finalAttrs: { mkMesonExecutable (finalAttrs: {
pname = "nix-fetchers-tests"; pname = "nix-fetchers-tests";
inherit version; inherit version;
@ -41,12 +36,6 @@ mkMesonDerivation (finalAttrs: {
(fileset.fileFilter (file: file.hasExt "hh") ./.) (fileset.fileFilter (file: file.hasExt "hh") ./.)
]; ];
nativeBuildInputs = [
meson
ninja
pkg-config
];
buildInputs = [ buildInputs = [
nix-fetchers nix-fetchers
nix-store-test-support nix-store-test-support
@ -69,10 +58,6 @@ mkMesonDerivation (finalAttrs: {
LDFLAGS = "-fuse-ld=gold"; LDFLAGS = "-fuse-ld=gold";
}; };
separateDebugInfo = !stdenv.hostPlatform.isStatic;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
passthru = { passthru = {
tests = { tests = {
run = runCommand "${finalAttrs.pname}-run" { run = runCommand "${finalAttrs.pname}-run" {

19
tests/unit/libflake/package.nix
View file

@ -1,12 +1,7 @@
{ lib { lib
, buildPackages , buildPackages
, stdenv , stdenv
, mkMesonDerivation , mkMesonExecutable
, releaseTools
, meson
, ninja
, pkg-config
, nix-flake , nix-flake
, nix-expr-test-support , nix-expr-test-support
@ -25,7 +20,7 @@ let
inherit (lib) fileset; inherit (lib) fileset;
in in
mkMesonDerivation (finalAttrs: { mkMesonExecutable (finalAttrs: {
pname = "nix-flake-tests"; pname = "nix-flake-tests";
inherit version; inherit version;
@ -41,12 +36,6 @@ mkMesonDerivation (finalAttrs: {
(fileset.fileFilter (file: file.hasExt "hh") ./.) (fileset.fileFilter (file: file.hasExt "hh") ./.)
]; ];
nativeBuildInputs = [
meson
ninja
pkg-config
];
buildInputs = [ buildInputs = [
nix-flake nix-flake
nix-expr-test-support nix-expr-test-support
@ -69,10 +58,6 @@ mkMesonDerivation (finalAttrs: {
LDFLAGS = "-fuse-ld=gold"; LDFLAGS = "-fuse-ld=gold";
}; };
separateDebugInfo = !stdenv.hostPlatform.isStatic;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
passthru = { passthru = {
tests = { tests = {
run = runCommand "${finalAttrs.pname}-run" { run = runCommand "${finalAttrs.pname}-run" {

21
tests/unit/libstore-support/package.nix
View file

@ -1,11 +1,6 @@
{ lib { lib
, stdenv , stdenv
, mkMesonDerivation , mkMesonLibrary
, releaseTools
, meson
, ninja
, pkg-config
, nix-util-test-support , nix-util-test-support
, nix-store , nix-store
@ -21,7 +16,7 @@ let
inherit (lib) fileset; inherit (lib) fileset;
in in
mkMesonDerivation (finalAttrs: { mkMesonLibrary (finalAttrs: {
pname = "nix-store-test-support"; pname = "nix-store-test-support";
inherit version; inherit version;
@ -37,14 +32,6 @@ mkMesonDerivation (finalAttrs: {
(fileset.fileFilter (file: file.hasExt "hh") ./.) (fileset.fileFilter (file: file.hasExt "hh") ./.)
]; ];
outputs = [ "out" "dev" ];
nativeBuildInputs = [
meson
ninja
pkg-config
];
propagatedBuildInputs = [ propagatedBuildInputs = [
nix-util-test-support nix-util-test-support
nix-store nix-store
@ -66,10 +53,6 @@ mkMesonDerivation (finalAttrs: {
LDFLAGS = "-fuse-ld=gold"; LDFLAGS = "-fuse-ld=gold";
}; };
separateDebugInfo = !stdenv.hostPlatform.isStatic;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
meta = { meta = {
platforms = lib.platforms.unix ++ lib.platforms.windows; platforms = lib.platforms.unix ++ lib.platforms.windows;
}; };

19
tests/unit/libstore/package.nix
View file

@ -1,12 +1,7 @@
{ lib { lib
, buildPackages , buildPackages
, stdenv , stdenv
, mkMesonDerivation , mkMesonExecutable
, releaseTools
, meson
, ninja
, pkg-config
, nix-store , nix-store
, nix-store-c , nix-store-c
@ -27,7 +22,7 @@ let
inherit (lib) fileset; inherit (lib) fileset;
in in
mkMesonDerivation (finalAttrs: { mkMesonExecutable (finalAttrs: {
pname = "nix-store-tests"; pname = "nix-store-tests";
inherit version; inherit version;
@ -43,12 +38,6 @@ mkMesonDerivation (finalAttrs: {
(fileset.fileFilter (file: file.hasExt "hh") ./.) (fileset.fileFilter (file: file.hasExt "hh") ./.)
]; ];
nativeBuildInputs = [
meson
ninja
pkg-config
];
buildInputs = [ buildInputs = [
nix-store nix-store
nix-store-c nix-store-c
@ -73,10 +62,6 @@ mkMesonDerivation (finalAttrs: {
LDFLAGS = "-fuse-ld=gold"; LDFLAGS = "-fuse-ld=gold";
}; };
separateDebugInfo = !stdenv.hostPlatform.isStatic;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
passthru = { passthru = {
tests = { tests = {
run = let run = let

21
tests/unit/libutil-support/package.nix
View file

@ -1,11 +1,6 @@
{ lib { lib
, stdenv , stdenv
, mkMesonDerivation , mkMesonLibrary
, releaseTools
, meson
, ninja
, pkg-config
, nix-util , nix-util
@ -20,7 +15,7 @@ let
inherit (lib) fileset; inherit (lib) fileset;
in in
mkMesonDerivation (finalAttrs: { mkMesonLibrary (finalAttrs: {
pname = "nix-util-test-support"; pname = "nix-util-test-support";
inherit version; inherit version;
@ -36,14 +31,6 @@ mkMesonDerivation (finalAttrs: {
(fileset.fileFilter (file: file.hasExt "hh") ./.) (fileset.fileFilter (file: file.hasExt "hh") ./.)
]; ];
outputs = [ "out" "dev" ];
nativeBuildInputs = [
meson
ninja
pkg-config
];
propagatedBuildInputs = [ propagatedBuildInputs = [
nix-util nix-util
rapidcheck rapidcheck
@ -64,10 +51,6 @@ mkMesonDerivation (finalAttrs: {
LDFLAGS = "-fuse-ld=gold"; LDFLAGS = "-fuse-ld=gold";
}; };
separateDebugInfo = !stdenv.hostPlatform.isStatic;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
meta = { meta = {
platforms = lib.platforms.unix ++ lib.platforms.windows; platforms = lib.platforms.unix ++ lib.platforms.windows;
}; };

19
tests/unit/libutil/package.nix
View file

@ -1,12 +1,7 @@
{ lib { lib
, buildPackages , buildPackages
, stdenv , stdenv
, mkMesonDerivation , mkMesonExecutable
, releaseTools
, meson
, ninja
, pkg-config
, nix-util , nix-util
, nix-util-c , nix-util-c
@ -25,7 +20,7 @@ let
inherit (lib) fileset; inherit (lib) fileset;
in in
mkMesonDerivation (finalAttrs: { mkMesonExecutable (finalAttrs: {
pname = "nix-util-tests"; pname = "nix-util-tests";
inherit version; inherit version;
@ -41,12 +36,6 @@ mkMesonDerivation (finalAttrs: {
(fileset.fileFilter (file: file.hasExt "hh") ./.) (fileset.fileFilter (file: file.hasExt "hh") ./.)
]; ];
nativeBuildInputs = [
meson
ninja
pkg-config
];
buildInputs = [ buildInputs = [
nix-util nix-util
nix-util-c nix-util-c
@ -70,10 +59,6 @@ mkMesonDerivation (finalAttrs: {
LDFLAGS = "-fuse-ld=gold"; LDFLAGS = "-fuse-ld=gold";
}; };
separateDebugInfo = !stdenv.hostPlatform.isStatic;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
passthru = { passthru = {
tests = { tests = {
run = runCommand "${finalAttrs.pname}-run" { run = runCommand "${finalAttrs.pname}-run" {