Test a version of haskell.nix using cabal unit IDs

See input-output-hk/haskell.nix#2239
IntersectMBO · Sep 10, 2024 · 5a2edc1 · 5a2edc1
1 parent 51a034a
commit 5a2edc1
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 83 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/nix/haskell.nix b/nix/haskell.nix
@@ -113,6 +113,7 @@ let
           ({ lib, pkgs, ... }: {
             packages.cardano-tracer.package.buildable = with pkgs.stdenv.hostPlatform; lib.mkForce (!isMusl);
             packages.cardano-node-chairman.components.tests.chairman-tests.buildable = lib.mkForce pkgs.stdenv.hostPlatform.isUnix;
+            package-keys = ["plutus-tx-plugin"];
             packages.plutus-tx-plugin.components.library.platforms = with lib.platforms; [ linux darwin ];
             packages.tx-generator.package.buildable = with pkgs.stdenv.hostPlatform; !isMusl;
 
@@ -139,10 +140,6 @@ let
             packages.unix-time.postPatch = ''
               sed -i 's/mingwex//g' unix-time.cabal
             '';
-            # For these two packages the custom setups fail, as we end up with multiple instances of
-            # lib:Cabal. Likely a haskell.nix bug.
-            packages.entropy.package.buildType = lib.mkForce "Simple";
-            packages.HsOpenSSL.package.buildType = lib.mkForce "Simple";
             #packages.plutus-core.components.library.preBuild = ''
             #  export ISERV_ARGS="-v +RTS -Dl"
             #  export PROXY_ARGS=-v
@@ -312,17 +309,18 @@ let
             # <no location info>: error: ghc: ghc-iserv terminated (-11)
             packages.plutus-core.components.library.ghcOptions = [ "-fexternal-interpreter" ];
           })
-          ({ lib, ... }@args: {
-            options.packages = lib.mkOption {
-              type = lib.types.attrsOf (lib.types.submodule (
-                { config, lib, ... }:
-                lib.mkIf config.package.isLocal
-                {
-                  configureFlags = [ "--ghc-option=-Werror"]
-                    ++ lib.optional (args.config.compiler.version == "8.10.7") "--ghc-option=-Wwarn=unused-packages";
-                }
-              ));
-            };
+          ({ config, lib, ... }@args: {
+            options.packages = lib.genAttrs config.package-keys (_:
+              lib.mkOption {
+                type = lib.types.submodule (
+                  { config, lib, ... }:
+                  lib.mkIf config.package.isLocal
+                  {
+                    configureFlags = [ "--ghc-option=-Werror"]
+                      ++ lib.optional (args.config.compiler.version == "8.10.7") "--ghc-option=-Wwarn=unused-packages";
+                  }
+                );
+              });
           })
           ({ lib, pkgs, ... }: lib.mkIf pkgs.stdenv.hostPlatform.isLinux {
             # systemd can't be statically linked
@@ -332,18 +330,19 @@ let
           })
           # disable haddock
           # Musl libc fully static build
-          ({ lib, ... }: {
-            options.packages = lib.mkOption {
-              type = lib.types.attrsOf (lib.types.submodule (
-                { config, lib, pkgs, ...}:
-                lib.mkIf (pkgs.stdenv.hostPlatform.isMusl && config.package.isLocal)
-                {
-                  # Module options which adds GHC flags and libraries for a fully static build
-                  enableShared = true; # TH code breaks if this is false.
-                  enableStatic = true;
-                }
-              ));
-            };
+          ({ config, lib, ... }: {
+            options.packages = lib.genAttrs config.package-keys (_:
+              lib.mkOption {
+                type = lib.types.submodule (
+                  { config, lib, pkgs, ...}:
+                  lib.mkIf (pkgs.stdenv.hostPlatform.isMusl && config.package.isLocal)
+                  {
+                    # Module options which adds GHC flags and libraries for a fully static build
+                    enableShared = true; # TH code breaks if this is false.
+                    enableStatic = true;
+                  }
+                );
+              });
             config =
               lib.mkIf pkgs.stdenv.hostPlatform.isMusl
               {