Update haskell.nix to latest version

IntersectMBO · Oct 10, 2024 · 7fd3b5b · 7fd3b5b
1 parent 6becd2b
commit 7fd3b5b
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 34 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -230,35 +230,36 @@
 
       # 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 {
               # 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 = 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;
+              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";
               };
-            }
+            })
           ];
         };