From 81da1a14ced81a747ce7138f0d775781e0e42035 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Sat, 7 Sep 2024 00:38:58 +1200 Subject: [PATCH 1/6] Test haskell.nix/hkm/use-plan-json --- flake.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index cc426e748..be0f2cf32 100644 --- a/flake.lock +++ b/flake.lock @@ -256,11 +256,11 @@ "stackage": "stackage" }, "locked": { - "lastModified": 1724806249, - "narHash": "sha256-TG9Mhl1QBppdnjeYmEIKan8XLJZpbQXtcMGBlm1KIF8=", + "lastModified": 1725625404, + "narHash": "sha256-VYqEVzowRO9IpSfV1uchPAIo9tsl0STuLbp/rW2bUkk=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "57defd49a7800af2bd91ba3606d444b10fbae393", + "rev": "0c1fdfc5ff8fac777a48ba8697f5daf449263cae", "type": "github" }, "original": { @@ -425,16 +425,16 @@ "hls-2.9": { "flake": false, "locked": { - "lastModified": 1718469202, - "narHash": "sha256-THXSz+iwB1yQQsr/PY151+2GvtoJnTIB2pIQ4OzfjD4=", + "lastModified": 1720003792, + "narHash": "sha256-qnDx8Pk0UxtoPr7BimEsAZh9g2WuTuMB/kGqnmdryKs=", "owner": "haskell", "repo": "haskell-language-server", - "rev": "40891bccb235ebacce020b598b083eab9dda80f1", + "rev": "0c1817cb2babef0765e4e72dd297c013e8e3d12b", "type": "github" }, "original": { "owner": "haskell", - "ref": "2.9.0.0", + "ref": "2.9.0.1", "repo": "haskell-language-server", "type": "github" } @@ -799,11 +799,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1724717508, - "narHash": "sha256-FeGR8x/iFDB6zmu3pjRFVcXc6gD/jEct/aM1kZF9gWs=", + "lastModified": 1725581641, + "narHash": "sha256-Iq6VRta5AZr3svddAv8C/117/ExHjI+HdSH8NHCGzCM=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "3cdad9ccd2f0232659e147b16ca979d08f77e63e", + "rev": "8ec9d29751aefd01f45fc2dc998cc78a4637e5aa", "type": "github" }, "original": { From 0e95d7ecb83c7409de7558f107b5b7a3cc0accee Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Sat, 7 Sep 2024 01:06:14 +1200 Subject: [PATCH 2/6] addPackageKeys --- flake.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 8ae252487..3dee674e8 100644 --- a/flake.nix +++ b/flake.nix @@ -232,7 +232,7 @@ extraConfig = compiler: { modules = [ - { + ({pkgs, ...}: pkgs.haskell-nix.haskellLib.addPackageKeys { # Packages that depend on the plutus-tx plugin have broken haddock packages = { cardano-node-emulator.doHaddock = false; @@ -240,8 +240,8 @@ plutus-script-utils.doHaddock = false; plutus-scripts-bench.doHaddock = false; }; - } - { + }) + ({pkgs, ...}: pkgs.haskell-nix.haskellLib.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") { @@ -257,7 +257,7 @@ ouroboros-consensus.doHaddock = false; ouroboros-consensus-cardano.doHaddock = false; }; - } + }) ]; }; From ed1727c69f162545a1c8e3a2525e8e2b3b536f78 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Sat, 7 Sep 2024 01:15:07 +1200 Subject: [PATCH 3/6] addPackageKeys --- flake.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 3dee674e8..de5a0d3b6 100644 --- a/flake.nix +++ b/flake.nix @@ -230,9 +230,10 @@ # Extra configurations (possibly compiler-dependent) to add to all projects. extraConfig = compiler: - { + let addPackageKeys = x: x // { package-keys = builtins.attrNames x.packages; }; + in { modules = [ - ({pkgs, ...}: pkgs.haskell-nix.haskellLib.addPackageKeys { + (addPackageKeys { # Packages that depend on the plutus-tx plugin have broken haddock packages = { cardano-node-emulator.doHaddock = false; @@ -241,7 +242,7 @@ plutus-scripts-bench.doHaddock = false; }; }) - ({pkgs, ...}: pkgs.haskell-nix.haskellLib.addPackageKeys { + (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") { From 3a9e8ca0a8da2222036f8188b831ee27d58b2110 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Sat, 7 Sep 2024 08:52:49 +1200 Subject: [PATCH 4/6] nix flake update haskell-nix --override-input haskell-nix github:input-output-hk/haskell.nix/hkm/use-plan-json --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index be0f2cf32..fa2305cfb 100644 --- a/flake.lock +++ b/flake.lock @@ -256,11 +256,11 @@ "stackage": "stackage" }, "locked": { - "lastModified": 1725625404, - "narHash": "sha256-VYqEVzowRO9IpSfV1uchPAIo9tsl0STuLbp/rW2bUkk=", + "lastModified": 1725654938, + "narHash": "sha256-k6VSUNnz4tplsRQF5vRIJykD6zVXAj37wJC/Toh09ik=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "0c1fdfc5ff8fac777a48ba8697f5daf449263cae", + "rev": "8fa0abbc4c8bbdf815f69e3e6c5f6bb5cf86a1a2", "type": "github" }, "original": { From e8e7f9fdf3184d8eb3826773bae08c929183110b Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Sat, 7 Sep 2024 16:09:06 +1200 Subject: [PATCH 5/6] Fix overrides --- flake.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index de5a0d3b6..881ae367a 100644 --- a/flake.nix +++ b/flake.nix @@ -245,18 +245,18 @@ (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-network.doHaddock = false; - ouroboros-consensus.doHaddock = false; - ouroboros-consensus-cardano.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-network.doHaddock = compiler != "ghc810"; + ouroboros-consensus.doHaddock = compiler != "ghc810"; + ouroboros-consensus-cardano.doHaddock = compiler != "ghc810"; }; }) ]; From 58f456247dff146b4867da4ec2438fc0cd64869f Mon Sep 17 00:00:00 2001 From: Marcin Szamotulski Date: Mon, 9 Sep 2024 17:09:35 +1200 Subject: [PATCH 6/6] Added strict-checked-vars-0.2.0.1 --- _sources/strict-checked-vars/0.2.0.1/meta.toml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 _sources/strict-checked-vars/0.2.0.1/meta.toml diff --git a/_sources/strict-checked-vars/0.2.0.1/meta.toml b/_sources/strict-checked-vars/0.2.0.1/meta.toml new file mode 100644 index 000000000..9ecf04f10 --- /dev/null +++ b/_sources/strict-checked-vars/0.2.0.1/meta.toml @@ -0,0 +1,3 @@ +timestamp = 2024-09-09T01:37:29Z +github = { repo = "IntersectMBO/cardano-base", rev = "6f9c20abdd3010e5a25356580cc968ba430101ad" } +subdir = 'strict-checked-vars'