Update haskell.nix input and adapt flake to new version

IntersectMBO · Oct 12, 2024 · 26181b7 · 26181b7
1 parent 707b80d
commit 26181b7
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 27 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -37,7 +37,8 @@
   outputs = { self, nixpkgs, flake-utils, foliage, haskell-nix, CHaP, iohk-nix, ... }:
     let
       inherit (nixpkgs) lib;
-      inherit (import ./nix/chap-meta.nix { inherit lib CHaP; }) chap-package-latest-versions chap-package-versions mkPackageTreeWith;
+      inherit (import ./nix/chap-meta.nix { inherit lib CHaP; })
+        chap-package-latest-versions chap-package-versions mkPackageTreeWith addPackageKeys;
 
       smokeTestPackages = [
         "plutus-ledger-api"
@@ -230,36 +231,35 @@
 
       # Extra configurations (possibly compiler-dependent) to add to all projects.
       extraConfig = compiler:
-        let addPackageKeys = x: x // { package-keys = builtins.attrNames x.packages; };
-        in {
-          modules = [
-            (addPackageKeys {
+        {
+          modules = builtins.map addPackageKeys [
+            {
               # Packages that depend on the plutus-tx plugin have broken haddock
               packages = {
                 cardano-node-emulator.doHaddock = false;
                 plutus-ledger.doHaddock = false;
                 plutus-script-utils.doHaddock = false;
                 plutus-scripts-bench.doHaddock = false;
               };
-            })
-            (addPackageKeys {
+            }
+            {
               # Packages that have haddock that is broken on 8.10
               # See https://github.com/input-output-hk/cardano-haskell-packages/issues/482
-              packages = {
-                cardano-ledger-allegra.doHaddock = compiler != "ghc810";
-                cardano-ledger-alonzo.doHaddock = compiler != "ghc810";
-                cardano-ledger-api.doHaddock = compiler != "ghc810";
-                cardano-ledger-conway.doHaddock = compiler != "ghc810";
-                cardano-ledger-core.doHaddock = compiler != "ghc810";
-                cardano-ledger-babbage.doHaddock = compiler != "ghc810";
-                cardano-ledger-shelley.doHaddock = compiler != "ghc810";
-                cardano-protocol-tpraos.doHaddock = compiler != "ghc810";
-                ouroboros-consensus-cardano.doHaddock = compiler != "ghc810";
-                ouroboros-consensus.doHaddock = compiler != "ghc810";
-                ouroboros-network.doHaddock = compiler != "ghc810";
-                plutus-ledger-api.doHaddock = compiler != "ghc810";
+              packages = lib.mkIf (compiler == "ghc810") {
+                cardano-ledger-allegra.doHaddock = false;
+                cardano-ledger-alonzo.doHaddock = false;
+                cardano-ledger-api.doHaddock = false;
+                cardano-ledger-conway.doHaddock = false;
+                cardano-ledger-core.doHaddock = false;
+                cardano-ledger-babbage.doHaddock = false;
+                cardano-ledger-shelley.doHaddock = false;
+                cardano-protocol-tpraos.doHaddock = false;
+                ouroboros-consensus-cardano.doHaddock = false;
+                ouroboros-consensus.doHaddock = false;
+                ouroboros-network.doHaddock = false;
+                plutus-ledger-api.doHaddock = false;
               };
-            })
+            }
           ];
         };
 

diff --git a/nix/chap-meta.nix b/nix/chap-meta.nix
@@ -40,12 +40,20 @@ let
   mkPackageTreeWith = f:
     builtins.mapAttrs (name: versions: lib.genAttrs versions (f name));
 
+  # addPackageKeys :: AttrSet -> AttrSet
+  #
+  # Add a `package-keys` attribute listing the keys used in the packages attribute.
+  # Needed since haskell.nix:61fbe408c01b6d61d010e6fb8e78bd19b5b025cc
+  #
+  addPackageKeys = x:
+    x // { package-keys = builtins.attrNames (if x.packages._type or "" == "if" then x.packages.content else x.packages); };
 in
 {
   inherit
     chap-package-meta
     chap-package-versions
     chap-package-latest-versions
     mkPackageTreeWith
+    addPackageKeys
     ;
 }