From 28c16c1dbfeb3e8269d88ed3a049ea93132282ee Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sat, 5 Apr 2025 19:05:35 +0200 Subject: [PATCH] nixVersions.nix_2_26+: Remove unused filesets This does not change any hashes. --- .../nix/modular/doc/manual/package.nix | 14 ---- .../modular/src/external-api-docs/package.nix | 21 ------ .../modular/src/internal-api-docs/package.nix | 17 ----- .../nix/modular/src/libcmd/package.nix | 14 ---- .../nix/modular/src/libexpr-c/package.nix | 15 ----- .../src/libexpr-test-support/package.nix | 14 ---- .../nix/modular/src/libexpr-tests/package.nix | 14 ---- .../nix/modular/src/libexpr/package.nix | 18 ----- .../modular/src/libfetchers-tests/package.nix | 14 ---- .../nix/modular/src/libfetchers/package.nix | 13 ---- .../nix/modular/src/libflake-c/package.nix | 15 ----- .../modular/src/libflake-tests/package.nix | 14 ---- .../nix/modular/src/libflake/package.nix | 13 ---- .../nix/modular/src/libmain-c/package.nix | 15 ----- .../nix/modular/src/libmain/package.nix | 13 ---- .../nix/modular/src/libstore-c/package.nix | 15 ----- .../src/libstore-test-support/package.nix | 14 ---- .../modular/src/libstore-tests/package.nix | 14 ---- .../nix/modular/src/libstore/package.nix | 20 ------ .../nix/modular/src/libutil-c/package.nix | 15 ----- .../src/libutil-test-support/package.nix | 14 ---- .../nix/modular/src/libutil-tests/package.nix | 14 ---- .../nix/modular/src/libutil/package.nix | 18 ----- .../nix/modular/src/nix/package.nix | 66 ------------------- .../nix/modular/src/perl/package.nix | 18 ----- .../nix/modular/tests/functional/package.nix | 10 --- 26 files changed, 442 deletions(-) diff --git a/pkgs/tools/package-management/nix/modular/doc/manual/package.nix b/pkgs/tools/package-management/nix/modular/doc/manual/package.nix index 8f5d0dfe1370..75ca70ae8fbd 100644 --- a/pkgs/tools/package-management/nix/modular/doc/manual/package.nix +++ b/pkgs/tools/package-management/nix/modular/doc/manual/package.nix @@ -17,25 +17,11 @@ version, }: -let - inherit (lib) fileset; -in - mkMesonDerivation (finalAttrs: { pname = "nix-manual"; inherit version; workDir = ./.; - fileset = - fileset.difference - (fileset.unions [ - ../../.version - # Too many different types of files to filter for now - ../../doc/manual - ./. - ]) - # Do a blacklist instead - ../../doc/manual/package.nix; # TODO the man pages should probably be separate outputs = [ diff --git a/pkgs/tools/package-management/nix/modular/src/external-api-docs/package.nix b/pkgs/tools/package-management/nix/modular/src/external-api-docs/package.nix index b194e16d4608..6c3950148f2d 100644 --- a/pkgs/tools/package-management/nix/modular/src/external-api-docs/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/external-api-docs/package.nix @@ -9,32 +9,11 @@ version, }: -let - inherit (lib) fileset; -in - mkMesonDerivation (finalAttrs: { pname = "nix-external-api-docs"; inherit version; workDir = ./.; - fileset = - let - cpp = fileset.fileFilter (file: file.hasExt "cc" || file.hasExt "h"); - in - fileset.unions [ - ./.version - ../../.version - ./meson.build - ./doxygen.cfg.in - ./README.md - # Source is not compiled, but still must be available for Doxygen - # to gather comments. - (cpp ../libexpr-c) - (cpp ../libflake-c) - (cpp ../libstore-c) - (cpp ../libutil-c) - ]; nativeBuildInputs = [ doxygen diff --git a/pkgs/tools/package-management/nix/modular/src/internal-api-docs/package.nix b/pkgs/tools/package-management/nix/modular/src/internal-api-docs/package.nix index 6c4f354aee5c..b857aefe5c74 100644 --- a/pkgs/tools/package-management/nix/modular/src/internal-api-docs/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/internal-api-docs/package.nix @@ -9,28 +9,11 @@ version, }: -let - inherit (lib) fileset; -in - mkMesonDerivation (finalAttrs: { pname = "nix-internal-api-docs"; inherit version; workDir = ./.; - fileset = - let - cpp = fileset.fileFilter (file: file.hasExt "cc" || file.hasExt "hh"); - in - fileset.unions [ - ./.version - ../../.version - ./meson.build - ./doxygen.cfg.in - # Source is not compiled, but still must be available for Doxygen - # to gather comments. - (cpp ../.) - ]; nativeBuildInputs = [ doxygen diff --git a/pkgs/tools/package-management/nix/modular/src/libcmd/package.nix b/pkgs/tools/package-management/nix/modular/src/libcmd/package.nix index d459d1c20fb5..f0ad6d0f5012 100644 --- a/pkgs/tools/package-management/nix/modular/src/libcmd/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libcmd/package.nix @@ -30,25 +30,11 @@ readlineFlavor ? if stdenv.hostPlatform.isWindows then "readline" else "editline", }: -let - inherit (lib) fileset; -in - mkMesonLibrary (finalAttrs: { pname = "nix-cmd"; inherit version; workDir = ./.; - fileset = fileset.unions [ - ../../nix-meson-build-support - ./nix-meson-build-support - ../../.version - ./.version - ./meson.build - ./meson.options - (fileset.fileFilter (file: file.hasExt "cc") ./.) - (fileset.fileFilter (file: file.hasExt "hh") ./.) - ]; buildInputs = [ ({ inherit editline readline; }.${readlineFlavor}) diff --git a/pkgs/tools/package-management/nix/modular/src/libexpr-c/package.nix b/pkgs/tools/package-management/nix/modular/src/libexpr-c/package.nix index 694fbc1fe789..6c01d359e203 100644 --- a/pkgs/tools/package-management/nix/modular/src/libexpr-c/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libexpr-c/package.nix @@ -10,26 +10,11 @@ version, }: -let - inherit (lib) fileset; -in - mkMesonLibrary (finalAttrs: { pname = "nix-expr-c"; inherit version; workDir = ./.; - fileset = fileset.unions [ - ../../nix-meson-build-support - ./nix-meson-build-support - ../../.version - ./.version - ./meson.build - # ./meson.options - (fileset.fileFilter (file: file.hasExt "cc") ./.) - (fileset.fileFilter (file: file.hasExt "hh") ./.) - (fileset.fileFilter (file: file.hasExt "h") ./.) - ]; propagatedBuildInputs = [ nix-store-c diff --git a/pkgs/tools/package-management/nix/modular/src/libexpr-test-support/package.nix b/pkgs/tools/package-management/nix/modular/src/libexpr-test-support/package.nix index 44b0ff386313..0ed2dbfc3918 100644 --- a/pkgs/tools/package-management/nix/modular/src/libexpr-test-support/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libexpr-test-support/package.nix @@ -13,25 +13,11 @@ version, }: -let - inherit (lib) fileset; -in - mkMesonLibrary (finalAttrs: { pname = "nix-util-test-support"; inherit version; workDir = ./.; - fileset = fileset.unions [ - ../../nix-meson-build-support - ./nix-meson-build-support - ../../.version - ./.version - ./meson.build - # ./meson.options - (fileset.fileFilter (file: file.hasExt "cc") ./.) - (fileset.fileFilter (file: file.hasExt "hh") ./.) - ]; propagatedBuildInputs = [ nix-store-test-support diff --git a/pkgs/tools/package-management/nix/modular/src/libexpr-tests/package.nix b/pkgs/tools/package-management/nix/modular/src/libexpr-tests/package.nix index 51d52e935bf5..1d5c72928778 100644 --- a/pkgs/tools/package-management/nix/modular/src/libexpr-tests/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libexpr-tests/package.nix @@ -18,25 +18,11 @@ resolvePath, }: -let - inherit (lib) fileset; -in - mkMesonExecutable (finalAttrs: { pname = "nix-expr-tests"; inherit version; workDir = ./.; - fileset = fileset.unions [ - ../../nix-meson-build-support - ./nix-meson-build-support - ../../.version - ./.version - ./meson.build - # ./meson.options - (fileset.fileFilter (file: file.hasExt "cc") ./.) - (fileset.fileFilter (file: file.hasExt "hh") ./.) - ]; buildInputs = [ nix-expr diff --git a/pkgs/tools/package-management/nix/modular/src/libexpr/package.nix b/pkgs/tools/package-management/nix/modular/src/libexpr/package.nix index 533dae9f253c..5ff60bbf9c1b 100644 --- a/pkgs/tools/package-management/nix/modular/src/libexpr/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libexpr/package.nix @@ -31,29 +31,11 @@ enableGC ? !stdenv.hostPlatform.isWindows, }: -let - inherit (lib) fileset; -in - mkMesonLibrary (finalAttrs: { pname = "nix-expr"; inherit version; workDir = ./.; - fileset = fileset.unions [ - ../../nix-meson-build-support - ./nix-meson-build-support - ../../.version - ./.version - ./meson.build - ./meson.options - ./primops/meson.build - (fileset.fileFilter (file: file.hasExt "cc") ./.) - (fileset.fileFilter (file: file.hasExt "hh") ./.) - ./lexer.l - ./parser.y - (fileset.difference (fileset.fileFilter (file: file.hasExt "nix") ./.) ./package.nix) - ]; nativeBuildInputs = [ bison diff --git a/pkgs/tools/package-management/nix/modular/src/libfetchers-tests/package.nix b/pkgs/tools/package-management/nix/modular/src/libfetchers-tests/package.nix index f6659130152e..62b86697800a 100644 --- a/pkgs/tools/package-management/nix/modular/src/libfetchers-tests/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libfetchers-tests/package.nix @@ -18,25 +18,11 @@ resolvePath, }: -let - inherit (lib) fileset; -in - mkMesonExecutable (finalAttrs: { pname = "nix-fetchers-tests"; inherit version; workDir = ./.; - fileset = fileset.unions [ - ../../nix-meson-build-support - ./nix-meson-build-support - ../../.version - ./.version - ./meson.build - # ./meson.options - (fileset.fileFilter (file: file.hasExt "cc") ./.) - (fileset.fileFilter (file: file.hasExt "hh") ./.) - ]; buildInputs = [ diff --git a/pkgs/tools/package-management/nix/modular/src/libfetchers/package.nix b/pkgs/tools/package-management/nix/modular/src/libfetchers/package.nix index 3f52e987800e..a49a4b634fa6 100644 --- a/pkgs/tools/package-management/nix/modular/src/libfetchers/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libfetchers/package.nix @@ -12,24 +12,11 @@ version, }: -let - inherit (lib) fileset; -in - mkMesonLibrary (finalAttrs: { pname = "nix-fetchers"; inherit version; workDir = ./.; - fileset = fileset.unions [ - ../../nix-meson-build-support - ./nix-meson-build-support - ../../.version - ./.version - ./meson.build - (fileset.fileFilter (file: file.hasExt "cc") ./.) - (fileset.fileFilter (file: file.hasExt "hh") ./.) - ]; buildInputs = [ libgit2 diff --git a/pkgs/tools/package-management/nix/modular/src/libflake-c/package.nix b/pkgs/tools/package-management/nix/modular/src/libflake-c/package.nix index 1149508523e9..3ee6c6b4f8a6 100644 --- a/pkgs/tools/package-management/nix/modular/src/libflake-c/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libflake-c/package.nix @@ -11,26 +11,11 @@ version, }: -let - inherit (lib) fileset; -in - mkMesonLibrary (finalAttrs: { pname = "nix-flake-c"; inherit version; workDir = ./.; - fileset = fileset.unions [ - ../../nix-meson-build-support - ./nix-meson-build-support - ../../.version - ./.version - ./meson.build - # ./meson.options - (fileset.fileFilter (file: file.hasExt "cc") ./.) - (fileset.fileFilter (file: file.hasExt "hh") ./.) - (fileset.fileFilter (file: file.hasExt "h") ./.) - ]; propagatedBuildInputs = [ nix-expr-c diff --git a/pkgs/tools/package-management/nix/modular/src/libflake-tests/package.nix b/pkgs/tools/package-management/nix/modular/src/libflake-tests/package.nix index 714f3791ad90..93429e53812b 100644 --- a/pkgs/tools/package-management/nix/modular/src/libflake-tests/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libflake-tests/package.nix @@ -18,25 +18,11 @@ resolvePath, }: -let - inherit (lib) fileset; -in - mkMesonExecutable (finalAttrs: { pname = "nix-flake-tests"; inherit version; workDir = ./.; - fileset = fileset.unions [ - ../../nix-meson-build-support - ./nix-meson-build-support - ../../.version - ./.version - ./meson.build - # ./meson.options - (fileset.fileFilter (file: file.hasExt "cc") ./.) - (fileset.fileFilter (file: file.hasExt "hh") ./.) - ]; buildInputs = [ nix-flake diff --git a/pkgs/tools/package-management/nix/modular/src/libflake/package.nix b/pkgs/tools/package-management/nix/modular/src/libflake/package.nix index 5240ce5e3965..86ee4bb5c263 100644 --- a/pkgs/tools/package-management/nix/modular/src/libflake/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libflake/package.nix @@ -13,24 +13,11 @@ version, }: -let - inherit (lib) fileset; -in - mkMesonLibrary (finalAttrs: { pname = "nix-flake"; inherit version; workDir = ./.; - fileset = fileset.unions [ - ../../nix-meson-build-support - ./nix-meson-build-support - ../../.version - ./.version - ./meson.build - (fileset.fileFilter (file: file.hasExt "cc") ./.) - (fileset.fileFilter (file: file.hasExt "hh") ./.) - ]; propagatedBuildInputs = [ nix-store diff --git a/pkgs/tools/package-management/nix/modular/src/libmain-c/package.nix b/pkgs/tools/package-management/nix/modular/src/libmain-c/package.nix index f019a917d360..ec1d3ba3eb05 100644 --- a/pkgs/tools/package-management/nix/modular/src/libmain-c/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libmain-c/package.nix @@ -12,26 +12,11 @@ version, }: -let - inherit (lib) fileset; -in - mkMesonLibrary (finalAttrs: { pname = "nix-main-c"; inherit version; workDir = ./.; - fileset = fileset.unions [ - ../../nix-meson-build-support - ./nix-meson-build-support - ../../.version - ./.version - ./meson.build - # ./meson.options - (fileset.fileFilter (file: file.hasExt "cc") ./.) - (fileset.fileFilter (file: file.hasExt "hh") ./.) - (fileset.fileFilter (file: file.hasExt "h") ./.) - ]; propagatedBuildInputs = [ nix-util-c diff --git a/pkgs/tools/package-management/nix/modular/src/libmain/package.nix b/pkgs/tools/package-management/nix/modular/src/libmain/package.nix index c03697c48dab..6cf7e87f51d0 100644 --- a/pkgs/tools/package-management/nix/modular/src/libmain/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libmain/package.nix @@ -12,24 +12,11 @@ version, }: -let - inherit (lib) fileset; -in - mkMesonLibrary (finalAttrs: { pname = "nix-main"; inherit version; workDir = ./.; - fileset = fileset.unions [ - ../../nix-meson-build-support - ./nix-meson-build-support - ../../.version - ./.version - ./meson.build - (fileset.fileFilter (file: file.hasExt "cc") ./.) - (fileset.fileFilter (file: file.hasExt "hh") ./.) - ]; propagatedBuildInputs = [ nix-util diff --git a/pkgs/tools/package-management/nix/modular/src/libstore-c/package.nix b/pkgs/tools/package-management/nix/modular/src/libstore-c/package.nix index fde17c78e017..2672cfd1a415 100644 --- a/pkgs/tools/package-management/nix/modular/src/libstore-c/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libstore-c/package.nix @@ -10,26 +10,11 @@ version, }: -let - inherit (lib) fileset; -in - mkMesonLibrary (finalAttrs: { pname = "nix-store-c"; inherit version; workDir = ./.; - fileset = fileset.unions [ - ../../nix-meson-build-support - ./nix-meson-build-support - ../../.version - ./.version - ./meson.build - # ./meson.options - (fileset.fileFilter (file: file.hasExt "cc") ./.) - (fileset.fileFilter (file: file.hasExt "hh") ./.) - (fileset.fileFilter (file: file.hasExt "h") ./.) - ]; propagatedBuildInputs = [ nix-util-c diff --git a/pkgs/tools/package-management/nix/modular/src/libstore-test-support/package.nix b/pkgs/tools/package-management/nix/modular/src/libstore-test-support/package.nix index ccac25ee16a2..1211ef6b33e9 100644 --- a/pkgs/tools/package-management/nix/modular/src/libstore-test-support/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libstore-test-support/package.nix @@ -13,25 +13,11 @@ version, }: -let - inherit (lib) fileset; -in - mkMesonLibrary (finalAttrs: { pname = "nix-store-test-support"; inherit version; workDir = ./.; - fileset = fileset.unions [ - ../../nix-meson-build-support - ./nix-meson-build-support - ../../.version - ./.version - ./meson.build - # ./meson.options - (fileset.fileFilter (file: file.hasExt "cc") ./.) - (fileset.fileFilter (file: file.hasExt "hh") ./.) - ]; propagatedBuildInputs = [ nix-util-test-support diff --git a/pkgs/tools/package-management/nix/modular/src/libstore-tests/package.nix b/pkgs/tools/package-management/nix/modular/src/libstore-tests/package.nix index b39ee7fa73c0..be9a51a784d2 100644 --- a/pkgs/tools/package-management/nix/modular/src/libstore-tests/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libstore-tests/package.nix @@ -19,25 +19,11 @@ filesetToSource, }: -let - inherit (lib) fileset; -in - mkMesonExecutable (finalAttrs: { pname = "nix-store-tests"; inherit version; workDir = ./.; - fileset = fileset.unions [ - ../../nix-meson-build-support - ./nix-meson-build-support - ../../.version - ./.version - ./meson.build - # ./meson.options - (fileset.fileFilter (file: file.hasExt "cc") ./.) - (fileset.fileFilter (file: file.hasExt "hh") ./.) - ]; # Hack for sake of the dev shell passthru.externalBuildInputs = [ diff --git a/pkgs/tools/package-management/nix/modular/src/libstore/package.nix b/pkgs/tools/package-management/nix/modular/src/libstore/package.nix index bba96e07f312..63ea2c743687 100644 --- a/pkgs/tools/package-management/nix/modular/src/libstore/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libstore/package.nix @@ -23,31 +23,11 @@ embeddedSandboxShell ? stdenv.hostPlatform.isStatic, }: -let - inherit (lib) fileset; -in - mkMesonLibrary (finalAttrs: { pname = "nix-store"; inherit version; workDir = ./.; - fileset = fileset.unions [ - ../../nix-meson-build-support - ./nix-meson-build-support - ../../.version - ./.version - ./meson.build - ./meson.options - ./linux/meson.build - ./unix/meson.build - ./windows/meson.build - (fileset.fileFilter (file: file.hasExt "cc") ./.) - (fileset.fileFilter (file: file.hasExt "hh") ./.) - (fileset.fileFilter (file: file.hasExt "sb") ./.) - (fileset.fileFilter (file: file.hasExt "md") ./.) - (fileset.fileFilter (file: file.hasExt "sql") ./.) - ]; nativeBuildInputs = lib.optional embeddedSandboxShell unixtools.hexdump; diff --git a/pkgs/tools/package-management/nix/modular/src/libutil-c/package.nix b/pkgs/tools/package-management/nix/modular/src/libutil-c/package.nix index f26f57775d4f..70a678d82302 100644 --- a/pkgs/tools/package-management/nix/modular/src/libutil-c/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libutil-c/package.nix @@ -9,26 +9,11 @@ version, }: -let - inherit (lib) fileset; -in - mkMesonLibrary (finalAttrs: { pname = "nix-util-c"; inherit version; workDir = ./.; - fileset = fileset.unions [ - ../../nix-meson-build-support - ./nix-meson-build-support - ../../.version - ./.version - ./meson.build - ./meson.options - (fileset.fileFilter (file: file.hasExt "cc") ./.) - (fileset.fileFilter (file: file.hasExt "hh") ./.) - (fileset.fileFilter (file: file.hasExt "h") ./.) - ]; propagatedBuildInputs = [ nix-util diff --git a/pkgs/tools/package-management/nix/modular/src/libutil-test-support/package.nix b/pkgs/tools/package-management/nix/modular/src/libutil-test-support/package.nix index fafd47c86c5e..e3305ea36a5c 100644 --- a/pkgs/tools/package-management/nix/modular/src/libutil-test-support/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libutil-test-support/package.nix @@ -12,25 +12,11 @@ version, }: -let - inherit (lib) fileset; -in - mkMesonLibrary (finalAttrs: { pname = "nix-util-test-support"; inherit version; workDir = ./.; - fileset = fileset.unions [ - ../../nix-meson-build-support - ./nix-meson-build-support - ../../.version - ./.version - ./meson.build - # ./meson.options - (fileset.fileFilter (file: file.hasExt "cc") ./.) - (fileset.fileFilter (file: file.hasExt "hh") ./.) - ]; propagatedBuildInputs = [ nix-util diff --git a/pkgs/tools/package-management/nix/modular/src/libutil-tests/package.nix b/pkgs/tools/package-management/nix/modular/src/libutil-tests/package.nix index b8d54b76c42f..5bd2fd66542e 100644 --- a/pkgs/tools/package-management/nix/modular/src/libutil-tests/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libutil-tests/package.nix @@ -18,25 +18,11 @@ resolvePath, }: -let - inherit (lib) fileset; -in - mkMesonExecutable (finalAttrs: { pname = "nix-util-tests"; inherit version; workDir = ./.; - fileset = fileset.unions [ - ../../nix-meson-build-support - ./nix-meson-build-support - ../../.version - ./.version - ./meson.build - # ./meson.options - (fileset.fileFilter (file: file.hasExt "cc") ./.) - (fileset.fileFilter (file: file.hasExt "hh") ./.) - ]; buildInputs = [ nix-util diff --git a/pkgs/tools/package-management/nix/modular/src/libutil/package.nix b/pkgs/tools/package-management/nix/modular/src/libutil/package.nix index e389fd59439c..3e96aa0660c8 100644 --- a/pkgs/tools/package-management/nix/modular/src/libutil/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libutil/package.nix @@ -17,29 +17,11 @@ version, }: -let - inherit (lib) fileset; -in - mkMesonLibrary (finalAttrs: { pname = "nix-util"; inherit version; workDir = ./.; - fileset = fileset.unions [ - ../../nix-meson-build-support - ./nix-meson-build-support - ../../.version - ./.version - ./widecharwidth - ./meson.build - ./meson.options - ./linux/meson.build - ./unix/meson.build - ./windows/meson.build - (fileset.fileFilter (file: file.hasExt "cc") ./.) - (fileset.fileFilter (file: file.hasExt "hh") ./.) - ]; buildInputs = [ diff --git a/pkgs/tools/package-management/nix/modular/src/nix/package.nix b/pkgs/tools/package-management/nix/modular/src/nix/package.nix index 40a280437850..d96823a991c7 100644 --- a/pkgs/tools/package-management/nix/modular/src/nix/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/nix/package.nix @@ -12,77 +12,11 @@ version, }: -let - inherit (lib) fileset; -in - mkMesonExecutable (finalAttrs: { pname = "nix"; inherit version; workDir = ./.; - fileset = fileset.unions ( - [ - ../../nix-meson-build-support - ./nix-meson-build-support - ../../.version - ./.version - ./meson.build - ./meson.options - - # Symbolic links to other dirs - ## exes - ./build-remote - ./doc - ./nix-build - ./nix-channel - ./nix-collect-garbage - ./nix-copy-closure - ./nix-env - ./nix-instantiate - ./nix-store - ## dirs - ./scripts - ../../scripts - ./misc - ../../misc - - # Doc nix files for --help - ../../doc/manual/generate-manpage.nix - ../../doc/manual/utils.nix - ../../doc/manual/generate-settings.nix - ../../doc/manual/generate-store-info.nix - - # Other files to be included as string literals - ../nix-channel/unpack-channel.nix - ../nix-env/buildenv.nix - ./get-env.sh - ./help-stores.md - ../../doc/manual/source/store/types/index.md.in - ./profiles.md - ../../doc/manual/source/command-ref/files/profiles.md - - # Files - ] - ++ - lib.concatMap - (dir: [ - (fileset.fileFilter (file: file.hasExt "cc") dir) - (fileset.fileFilter (file: file.hasExt "hh") dir) - (fileset.fileFilter (file: file.hasExt "md") dir) - ]) - [ - ./. - ../build-remote - ../nix-build - ../nix-channel - ../nix-collect-garbage - ../nix-copy-closure - ../nix-env - ../nix-instantiate - ../nix-store - ] - ); buildInputs = [ nix-store diff --git a/pkgs/tools/package-management/nix/modular/src/perl/package.nix b/pkgs/tools/package-management/nix/modular/src/perl/package.nix index 5841570cd090..5c788ccdd8cd 100644 --- a/pkgs/tools/package-management/nix/modular/src/perl/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/perl/package.nix @@ -12,30 +12,12 @@ libsodium, }: -let - inherit (lib) fileset; -in - perl.pkgs.toPerlModule ( mkMesonDerivation (finalAttrs: { pname = "nix-perl"; inherit version; workDir = ./.; - fileset = fileset.unions ( - [ - ./.version - ../../.version - ./MANIFEST - ./lib - ./meson.build - ./meson.options - ] - ++ lib.optionals finalAttrs.finalPackage.doCheck [ - ./.yath.rc.in - ./t - ] - ); nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/package-management/nix/modular/tests/functional/package.nix b/pkgs/tools/package-management/nix/modular/tests/functional/package.nix index c479d6ca38d3..333149208c21 100644 --- a/pkgs/tools/package-management/nix/modular/tests/functional/package.nix +++ b/pkgs/tools/package-management/nix/modular/tests/functional/package.nix @@ -27,22 +27,12 @@ test-daemon ? null, }: -let - inherit (lib) fileset; -in - mkMesonDerivation ( finalAttrs: { inherit pname version; workDir = ./.; - fileset = fileset.unions [ - ../../scripts/nix-profile.sh.in - ../../.version - ../../tests/functional - ./. - ]; # Hack for sake of the dev shell passthru.externalNativeBuildInputs =