Deduplicate our many package.nix a bit (#11175)

- They should all be built in parallel - They should all use strict deps by default
2024-11-21 22:32:26 +00:00 · 2024-07-24 23:12:39 -04:00 · 2024-07-24 23:12:39 -04:00 · 3b49f7a143
commit 3b49f7a143
parent a2fed6db9e
24 changed files with 21 additions and 106 deletions
--- a/packaging/dependencies.nix
+++ b/packaging/dependencies.nix
@ -63,9 +63,16 @@ let

  # Work around weird `--as-needed` linker behavior with BSD, see
  # https://github.com/mesonbuild/meson/issues/3593
-  bsdNoLinkAsNeeded = finalAttrs: prevAttrs: lib.optionalAttrs stdenv.hostPlatform.isBSD {
-    mesonFlags = [ (lib.mesonBool "b_asneeded" false) ] ++ prevAttrs.mesonFlags or [];
-  };
+  bsdNoLinkAsNeeded = finalAttrs: prevAttrs:
+    lib.optionalAttrs stdenv.hostPlatform.isBSD {
+      mesonFlags = [ (lib.mesonBool "b_asneeded" false) ] ++ prevAttrs.mesonFlags or [];
+    };
+
+  miscGoodPractice = finalAttrs: prevAttrs:
+    {
+      strictDeps = prevAttrs.strictDeps or true;
+      enableParallelBuilding = true;
+    };

 in
 scope: {
@ -136,8 +143,14 @@ scope: {

  inherit resolvePath filesetToSource;

-  mkMesonDerivation = f: stdenv.mkDerivation
-    (lib.extends
-      (lib.composeExtensions bsdNoLinkAsNeeded localSourceLayer)
-      f);
+  mkMesonDerivation = f: let
+    exts = [
+      miscGoodPractice
+      bsdNoLinkAsNeeded
+      localSourceLayer
+    ];
+  in stdenv.mkDerivation
+   (lib.extends
+     (lib.foldr lib.composeExtensions (_: _: {}) exts)
+     f);
 }
--- a/src/external-api-docs/package.nix
+++ b/src/external-api-docs/package.nix
@ -53,10 +53,6 @@ mkMesonDerivation (finalAttrs: {
    echo "doc external-api-docs $out/share/doc/nix/external-api/html" >> ''${!outputDoc}/nix-support/hydra-build-products
  '';

-  enableParallelBuilding = true;
-
-  strictDeps = true;
-
  meta = {
    platforms = lib.platforms.all;
  };
--- a/src/internal-api-docs/package.nix
+++ b/src/internal-api-docs/package.nix
@ -48,10 +48,6 @@ mkMesonDerivation (finalAttrs: {
    echo "doc internal-api-docs $out/share/doc/nix/internal-api/html" >> ''${!outputDoc}/nix-support/hydra-build-products
  '';

-  enableParallelBuilding = true;
-
-  strictDeps = true;
-
  meta = {
    platforms = lib.platforms.all;
  };
--- a/src/libcmd/package.nix
+++ b/src/libcmd/package.nix
@ -93,14 +93,8 @@ mkMesonDerivation (finalAttrs: {
    LDFLAGS = "-fuse-ld=gold";
  };

-  enableParallelBuilding = true;
-
  separateDebugInfo = !stdenv.hostPlatform.isStatic;

-  # TODO `releaseTools.coverageAnalysis` in Nixpkgs needs to be updated
-  # to work with `strictDeps`.
-  strictDeps = true;
-
  hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";

  meta = {
--- a/src/libexpr-c/package.nix
+++ b/src/libexpr-c/package.nix
@ -63,12 +63,8 @@ mkMesonDerivation (finalAttrs: {
    LDFLAGS = "-fuse-ld=gold";
  };

-  enableParallelBuilding = true;
-
  separateDebugInfo = !stdenv.hostPlatform.isStatic;

-  strictDeps = true;
-
  hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";

  meta = {
--- a/src/libexpr/package.nix
+++ b/src/libexpr/package.nix
@ -102,12 +102,8 @@ mkMesonDerivation (finalAttrs: {
    LDFLAGS = "-fuse-ld=gold";
  };

-  enableParallelBuilding = true;
-
  separateDebugInfo = !stdenv.hostPlatform.isStatic;

-  strictDeps = true;
-
  hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";

  meta = {
--- a/src/libfetchers/package.nix
+++ b/src/libfetchers/package.nix
@ -67,14 +67,8 @@ mkMesonDerivation (finalAttrs: {
    LDFLAGS = "-fuse-ld=gold";
  };

-  enableParallelBuilding = true;
-
  separateDebugInfo = !stdenv.hostPlatform.isStatic;

-  # TODO `releaseTools.coverageAnalysis` in Nixpkgs needs to be updated
-  # to work with `strictDeps`.
-  strictDeps = true;
-
  hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";

  meta = {
--- a/src/libflake/package.nix
+++ b/src/libflake/package.nix
@ -67,14 +67,8 @@ mkMesonDerivation (finalAttrs: {
    LDFLAGS = "-fuse-ld=gold";
  };

-  enableParallelBuilding = true;
-
  separateDebugInfo = !stdenv.hostPlatform.isStatic;

-  # TODO `releaseTools.coverageAnalysis` in Nixpkgs needs to be updated
-  # to work with `strictDeps`.
-  strictDeps = true;
-
  hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";

  meta = {
--- a/src/libmain-c/package.nix
+++ b/src/libmain-c/package.nix
@ -68,12 +68,8 @@ mkMesonDerivation (finalAttrs: {
    LDFLAGS = "-fuse-ld=gold";
  };

-  enableParallelBuilding = true;
-
  separateDebugInfo = !stdenv.hostPlatform.isStatic;

-  strictDeps = true;
-
  hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";

  meta = {
--- a/src/libmain/package.nix
+++ b/src/libmain/package.nix
@ -62,14 +62,8 @@ mkMesonDerivation (finalAttrs: {
    LDFLAGS = "-fuse-ld=gold";
  };

-  enableParallelBuilding = true;
-
  separateDebugInfo = !stdenv.hostPlatform.isStatic;

-  # TODO `releaseTools.coverageAnalysis` in Nixpkgs needs to be updated
-  # to work with `strictDeps`.
-  strictDeps = true;
-
  hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";

  meta = {
--- a/src/libstore-c/package.nix
+++ b/src/libstore-c/package.nix
@ -64,12 +64,8 @@ mkMesonDerivation (finalAttrs: {
    LDFLAGS = "-fuse-ld=gold";
  };

-  enableParallelBuilding = true;
-
  separateDebugInfo = !stdenv.hostPlatform.isStatic;

-  strictDeps = true;
-
  hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";

  meta = {
--- a/src/libstore/package.nix
+++ b/src/libstore/package.nix
@ -101,12 +101,8 @@ mkMesonDerivation (finalAttrs: {
    LDFLAGS = "-fuse-ld=gold";
  };

-  enableParallelBuilding = true;
-
  separateDebugInfo = !stdenv.hostPlatform.isStatic;

-  strictDeps = true;
-
  hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";

  meta = {
--- a/src/libutil-c/package.nix
+++ b/src/libutil-c/package.nix
@ -62,12 +62,8 @@ mkMesonDerivation (finalAttrs: {
    LDFLAGS = "-fuse-ld=gold";
  };

-  enableParallelBuilding = true;
-
  separateDebugInfo = !stdenv.hostPlatform.isStatic;

-  strictDeps = true;
-
  hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";

  meta = {
--- a/src/libutil/package.nix
+++ b/src/libutil/package.nix
@ -88,12 +88,8 @@ mkMesonDerivation (finalAttrs: {
    LDFLAGS = "-fuse-ld=gold";
  };

-  enableParallelBuilding = true;
-
  separateDebugInfo = !stdenv.hostPlatform.isStatic;

-  strictDeps = true;
-
  hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";

  meta = {
--- a/src/nix/package.nix
+++ b/src/nix/package.nix
@ -84,8 +84,6 @@ mkMesonDerivation (finalAttrs: {
    ]
  );

-  outputs = [ "out" "dev" ];
-
  nativeBuildInputs = [
    meson
    ninja
@ -114,12 +112,8 @@ mkMesonDerivation (finalAttrs: {
    LDFLAGS = "-fuse-ld=gold";
  };

-  enableParallelBuilding = true;
-
  separateDebugInfo = !stdenv.hostPlatform.isStatic;

-  strictDeps = true;
-
  hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";

  meta = {
--- a/src/perl/package.nix
+++ b/src/perl/package.nix
@ -73,5 +73,5 @@ perl.pkgs.toPerlModule (mkMesonDerivation (finalAttrs: {
    "--print-errorlogs"
  ];

-  enableParallelBuilding = true;
+  strictDeps = false;
 }))
--- a/tests/unit/libexpr-support/package.nix
+++ b/tests/unit/libexpr-support/package.nix
@ -66,12 +66,8 @@ mkMesonDerivation (finalAttrs: {
    LDFLAGS = "-fuse-ld=gold";
  };

-  enableParallelBuilding = true;
-
  separateDebugInfo = !stdenv.hostPlatform.isStatic;

-  strictDeps = true;
-
  hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";

  meta = {
--- a/tests/unit/libexpr/package.nix
+++ b/tests/unit/libexpr/package.nix
@ -71,12 +71,8 @@ mkMesonDerivation (finalAttrs: {
    LDFLAGS = "-fuse-ld=gold";
  };

-  enableParallelBuilding = true;
-
  separateDebugInfo = !stdenv.hostPlatform.isStatic;

-  strictDeps = true;
-
  hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";

  passthru = {
--- a/tests/unit/libfetchers/package.nix
+++ b/tests/unit/libfetchers/package.nix
@ -69,12 +69,8 @@ mkMesonDerivation (finalAttrs: {
    LDFLAGS = "-fuse-ld=gold";
  };

-  enableParallelBuilding = true;
-
  separateDebugInfo = !stdenv.hostPlatform.isStatic;

-  strictDeps = true;
-
  hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";

  passthru = {
--- a/tests/unit/libflake/package.nix
+++ b/tests/unit/libflake/package.nix
@ -69,12 +69,8 @@ mkMesonDerivation (finalAttrs: {
    LDFLAGS = "-fuse-ld=gold";
  };

-  enableParallelBuilding = true;
-
  separateDebugInfo = !stdenv.hostPlatform.isStatic;

-  strictDeps = true;
-
  hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";

  passthru = {
--- a/tests/unit/libstore-support/package.nix
+++ b/tests/unit/libstore-support/package.nix
@ -66,12 +66,8 @@ mkMesonDerivation (finalAttrs: {
    LDFLAGS = "-fuse-ld=gold";
  };

-  enableParallelBuilding = true;
-
  separateDebugInfo = !stdenv.hostPlatform.isStatic;

-  strictDeps = true;
-
  hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";

  meta = {
--- a/tests/unit/libstore/package.nix
+++ b/tests/unit/libstore/package.nix
@ -73,12 +73,8 @@ mkMesonDerivation (finalAttrs: {
    LDFLAGS = "-fuse-ld=gold";
  };

-  enableParallelBuilding = true;
-
  separateDebugInfo = !stdenv.hostPlatform.isStatic;

-  strictDeps = true;
-
  hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";

  passthru = {
--- a/tests/unit/libutil-support/package.nix
+++ b/tests/unit/libutil-support/package.nix
@ -64,12 +64,8 @@ mkMesonDerivation (finalAttrs: {
    LDFLAGS = "-fuse-ld=gold";
  };

-  enableParallelBuilding = true;
-
  separateDebugInfo = !stdenv.hostPlatform.isStatic;

-  strictDeps = true;
-
  hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";

  meta = {
--- a/tests/unit/libutil/package.nix
+++ b/tests/unit/libutil/package.nix
@ -70,12 +70,8 @@ mkMesonDerivation (finalAttrs: {
    LDFLAGS = "-fuse-ld=gold";
  };

-  enableParallelBuilding = true;
-
  separateDebugInfo = !stdenv.hostPlatform.isStatic;

-  strictDeps = true;
-
  hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";

  passthru = {