From efaf8c756b9de763898ee55bb539d72a17a71986 Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Mon, 25 Nov 2024 11:01:15 +1100 Subject: [PATCH 1/5] Make it build with ghc-9.8 --- jsapi/test/Main.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jsapi/test/Main.hs b/jsapi/test/Main.hs index 7c62abf91..ae4b87369 100644 --- a/jsapi/test/Main.hs +++ b/jsapi/test/Main.hs @@ -31,8 +31,8 @@ foreign import javascript interruptible "testStart($1, $c);" initComplete #else initComplete :: Object -> JSM () initComplete api = - void $ api ^. js1 "version" (fun $ \ _ _ [ver] -> - fromJSValUnchecked ver >>= (liftIO . putStrLn)) + void $ api ^. js1 "version" (fun $ \ _ _ xs -> + fromJSValUnchecked (head xs) >>= (liftIO . putStrLn)) #endif -- When runing the native version, point a browser at http://localhost:3757/ From 3bb48b48e0ee6c44986f62657c23d5ed350c906f Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Mon, 25 Nov 2024 11:02:07 +1100 Subject: [PATCH 2/5] cabal.project: Update index-states --- cabal.project | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cabal.project b/cabal.project index 340510f72..fa4b5e6e7 100644 --- a/cabal.project +++ b/cabal.project @@ -10,6 +10,10 @@ repository cardano-haskell-packages c00aae8461a256275598500ea0e187588c35a5d5d7454fb57eac18d9edb86a56 d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee +index-state: + , hackage.haskell.org 2024-11-14T09:17:39Z + , cardano-haskell-packages 2024-11-20T20:05:41Z + -- See CONTRIBUTING for information about these, including some Nix commands -- you need to run if you change them @@ -56,10 +60,6 @@ else active-repositories: hackage.haskell.org, cardano-haskell-packages -index-state: - , hackage.haskell.org 2024-06-05T16:48:53Z - , cardano-haskell-packages 2024-06-05T16:48:53Z - packages: command-line/cardano-addresses-cli.cabal core/cardano-addresses.cabal From 072c741d96738a733d0b0e934c1ab906c8341260 Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Mon, 25 Nov 2024 15:02:30 +1100 Subject: [PATCH 3/5] Nix updates --- flake.lock | 130 ++++++++++++++++++++++++++--------------------------- flake.nix | 12 ++++- 2 files changed, 73 insertions(+), 69 deletions(-) diff --git a/flake.lock b/flake.lock index 90a3117fa..63948d803 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1717745122, - "narHash": "sha256-RW0mbVghzN/ywg3CVsdHPB3WCj8KAEAS0egV4PFro/4=", + "lastModified": 1732134025, + "narHash": "sha256-BBz3q09+DqDMYnLLgqXYyAxj9amVibxuEevHzgqL6UM=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "a8d2c3e2b819e2f331aae71de5544a855a267e65", + "rev": "d36fcfb3c0f2632bdaf4637c72e91b93f7eada56", "type": "github" }, "original": { @@ -139,11 +139,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -169,51 +169,14 @@ "type": "github" } }, - "ghc910X": { - "flake": false, - "locked": { - "lastModified": 1714520650, - "narHash": "sha256-4uz6RA1hRr0RheGNDM49a/B3jszqNNU8iHIow4mSyso=", - "ref": "ghc-9.10", - "rev": "2c6375b9a804ac7fca1e82eb6fcfc8594c67c5f5", - "revCount": 62663, - "submodules": true, - "type": "git", - "url": "https://gitlab.haskell.org/ghc/ghc" - }, - "original": { - "ref": "ghc-9.10", - "submodules": true, - "type": "git", - "url": "https://gitlab.haskell.org/ghc/ghc" - } - }, - "ghc911": { - "flake": false, - "locked": { - "lastModified": 1714817013, - "narHash": "sha256-m2je4UvWfkgepMeUIiXHMwE6W+iVfUY38VDGkMzjCcc=", - "ref": "refs/heads/master", - "rev": "fc24c5cf6c62ca9e3c8d236656e139676df65034", - "revCount": 62816, - "submodules": true, - "type": "git", - "url": "https://gitlab.haskell.org/ghc/ghc" - }, - "original": { - "submodules": true, - "type": "git", - "url": "https://gitlab.haskell.org/ghc/ghc" - } - }, "hackage": { "flake": false, "locked": { - "lastModified": 1717807055, - "narHash": "sha256-CCqRhadPKQUkB/ncLBGHHt7XT8VbSR532sfpjbPNcZI=", + "lastModified": 1732494631, + "narHash": "sha256-NrHUkkhz7PTKV/yciWezL+qG4IRX8CsVz4ZcxYbOIso=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "edb78b8087db9d494ee3eeb9105c7650e44d009f", + "rev": "ed487dd9c78992176b1d39ee8268b192e848a7b5", "type": "github" }, "original": { @@ -248,8 +211,6 @@ "cardano-shell": "cardano-shell", "flake-compat": "flake-compat", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", - "ghc910X": "ghc910X", - "ghc911": "ghc911", "hackage": "hackage", "hls-1.10": "hls-1.10", "hls-2.0": "hls-2.0", @@ -260,6 +221,7 @@ "hls-2.6": "hls-2.6", "hls-2.7": "hls-2.7", "hls-2.8": "hls-2.8", + "hls-2.9": "hls-2.9", "hpc-coveralls": "hpc-coveralls", "hydra": "hydra", "iserv-proxy": "iserv-proxy", @@ -273,16 +235,17 @@ "nixpkgs-2211": "nixpkgs-2211", "nixpkgs-2305": "nixpkgs-2305", "nixpkgs-2311": "nixpkgs-2311", + "nixpkgs-2405": "nixpkgs-2405", "nixpkgs-unstable": "nixpkgs-unstable", "old-ghc-nix": "old-ghc-nix", "stackage": "stackage" }, "locked": { - "lastModified": 1717846179, - "narHash": "sha256-iSGepzdSLyvYafn+OvXCGN50ZsWQiGcJIKq4s+sg4nY=", + "lastModified": 1732495912, + "narHash": "sha256-XI66gTnALcJeYd6P9sQsqLoxrenTjo5zCJruaAnx7Ro=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "8f50d10aa7ce71f2dcb6c8eb25c2352294ddc854", + "rev": "ed2574bb336db42f69c822f9d94ed14205250c05", "type": "github" }, "original": { @@ -444,6 +407,23 @@ "type": "github" } }, + "hls-2.9": { + "flake": false, + "locked": { + "lastModified": 1720003792, + "narHash": "sha256-qnDx8Pk0UxtoPr7BimEsAZh9g2WuTuMB/kGqnmdryKs=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "0c1817cb2babef0765e4e72dd297c013e8e3d12b", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.9.0.1", + "repo": "haskell-language-server", + "type": "github" + } + }, "hpc-coveralls": { "flake": false, "locked": { @@ -493,11 +473,11 @@ "sodium": "sodium" }, "locked": { - "lastModified": 1709083850, - "narHash": "sha256-6DQ89ktt8rRVV1pXEyX2JwPjaqS0mQkelkmJmka04rg=", + "lastModified": 1732287300, + "narHash": "sha256-lURsE6HdJX0alscWhbzCWyLRK8GpAgKuXeIgX31Kfqg=", "owner": "input-output-hk", "repo": "iohk-nix", - "rev": "1c793a53ac0bd99b795c2180eb23d37e8389a74b", + "rev": "262cb2aec2ddd914124bab90b06fe24a1a74d02c", "type": "github" }, "original": { @@ -658,11 +638,11 @@ }, "nixpkgs-2305": { "locked": { - "lastModified": 1701362232, - "narHash": "sha256-GVdzxL0lhEadqs3hfRLuj+L1OJFGiL/L7gCcelgBlsw=", + "lastModified": 1705033721, + "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d2332963662edffacfddfad59ff4f709dde80ffe", + "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea", "type": "github" }, "original": { @@ -674,11 +654,11 @@ }, "nixpkgs-2311": { "locked": { - "lastModified": 1701386440, - "narHash": "sha256-xI0uQ9E7JbmEy/v8kR9ZQan6389rHug+zOtZeZFiDJk=", + "lastModified": 1719957072, + "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "293822e55ec1872f715a66d0eda9e592dc14419f", + "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105", "type": "github" }, "original": { @@ -688,6 +668,22 @@ "type": "github" } }, + "nixpkgs-2405": { + "locked": { + "lastModified": 1729242558, + "narHash": "sha256-VgcLDu4igNT0eYua6OAl9pWCI0cYXhDbR+pWP44tte0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4a3f2d3195b60d07530574988df92e049372c10e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-24.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-regression": { "locked": { "lastModified": 1643052045, @@ -706,17 +702,17 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1694822471, - "narHash": "sha256-6fSDCj++lZVMZlyqOe9SIOL8tYSBz1bI8acwovRwoX8=", + "lastModified": 1729980323, + "narHash": "sha256-eWPRZAlhf446bKSmzw6x7RWEE4IuZgAp8NW3eXZwRAY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", + "rev": "86e78d3d2084ff87688da662cf78c2af085d8e73", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", - "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", "type": "github" } }, @@ -787,11 +783,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1717806268, - "narHash": "sha256-QUGjB0OLnmXrS+u4jCdvawfWfngv+R99qmbFvpRaW4I=", + "lastModified": 1732493529, + "narHash": "sha256-lsaOSrOLXTDGoWUcQzfzpJ+hplMhlO+uKKZUOYCzCAA=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "6c6db491b4a4aab289fe0a5ada8bb9bfb842b23c", + "rev": "56a26f8bc2b81d733fd9878c771ded93b37dc427", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b8a52ed78..dcfa6eeaf 100644 --- a/flake.nix +++ b/flake.nix @@ -2,10 +2,18 @@ description = "Cardano Addresses"; inputs = { - nixpkgs.follows = "haskellNix/nixpkgs-2305"; + nixpkgs.follows = "haskellNix/nixpkgs-unstable"; + hostNixpkgs.follows = "nixpkgs"; + hackageNix = { + url = "github:input-output-hk/hackage.nix"; + flake = false; + }; haskellNix = { - url = "github:input-output-hk/haskell.nix"; + # GHC 8.10.7 cross compilation for windows is broken in newer versions of haskell.nix. + # Unpin this once we no longer need GHC 8.10.7. + url = "github:input-output-hk/haskell.nix/cb139fa956158397aa398186bb32dd26f7318784"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.hackage.follows = "hackageNix"; }; CHaP = { url = "github:intersectmbo/cardano-haskell-packages?ref=repo"; From eeddc11f11453c0836b9702a5866ea3291ae3e8b Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Mon, 25 Nov 2024 15:54:55 +0900 Subject: [PATCH 4/5] update flake.lock --- flake.lock | 119 +++++++++++++++++++++++++++++------------------------ 1 file changed, 65 insertions(+), 54 deletions(-) diff --git a/flake.lock b/flake.lock index 63948d803..95b6ee833 100644 --- a/flake.lock +++ b/flake.lock @@ -169,20 +169,41 @@ "type": "github" } }, - "hackage": { + "ghc910X": { "flake": false, "locked": { - "lastModified": 1732494631, - "narHash": "sha256-NrHUkkhz7PTKV/yciWezL+qG4IRX8CsVz4ZcxYbOIso=", - "owner": "input-output-hk", - "repo": "hackage.nix", - "rev": "ed487dd9c78992176b1d39ee8268b192e848a7b5", - "type": "github" + "lastModified": 1717140678, + "narHash": "sha256-4CYDaOITF7fmKBK/ujkQ8oblII191b6K3W/c9JxI6/4=", + "ref": "ghc-9.10", + "rev": "934a8bb930390d5db1e5613ddfeafc8c80dd9b96", + "revCount": 62700, + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" }, "original": { - "owner": "input-output-hk", - "repo": "hackage.nix", - "type": "github" + "ref": "ghc-9.10", + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + } + }, + "ghc911": { + "flake": false, + "locked": { + "lastModified": 1732336551, + "narHash": "sha256-J8HQ5AloMee/0h5w6O0L/r+5WdmRXREmljhQwE6Twso=", + "ref": "refs/heads/master", + "rev": "a021a4934dd6792a0d3ac614416a2db4ce265350", + "revCount": 67594, + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + }, + "original": { + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" } }, "hackageGHCJS": { @@ -202,6 +223,22 @@ "type": "github" } }, + "hackageNix": { + "flake": false, + "locked": { + "lastModified": 1732494631, + "narHash": "sha256-NrHUkkhz7PTKV/yciWezL+qG4IRX8CsVz4ZcxYbOIso=", + "owner": "input-output-hk", + "repo": "hackage.nix", + "rev": "ed487dd9c78992176b1d39ee8268b192e848a7b5", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "hackage.nix", + "type": "github" + } + }, "haskellNix": { "inputs": { "HTTP": "HTTP", @@ -211,7 +248,11 @@ "cardano-shell": "cardano-shell", "flake-compat": "flake-compat", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", - "hackage": "hackage", + "ghc910X": "ghc910X", + "ghc911": "ghc911", + "hackage": [ + "hackageNix" + ], "hls-1.10": "hls-1.10", "hls-2.0": "hls-2.0", "hls-2.2": "hls-2.2", @@ -221,7 +262,6 @@ "hls-2.6": "hls-2.6", "hls-2.7": "hls-2.7", "hls-2.8": "hls-2.8", - "hls-2.9": "hls-2.9", "hpc-coveralls": "hpc-coveralls", "hydra": "hydra", "iserv-proxy": "iserv-proxy", @@ -235,22 +275,22 @@ "nixpkgs-2211": "nixpkgs-2211", "nixpkgs-2305": "nixpkgs-2305", "nixpkgs-2311": "nixpkgs-2311", - "nixpkgs-2405": "nixpkgs-2405", "nixpkgs-unstable": "nixpkgs-unstable", "old-ghc-nix": "old-ghc-nix", "stackage": "stackage" }, "locked": { - "lastModified": 1732495912, - "narHash": "sha256-XI66gTnALcJeYd6P9sQsqLoxrenTjo5zCJruaAnx7Ro=", + "lastModified": 1718797200, + "narHash": "sha256-ueFxTuZrQ3ZT/Fj5sSeUWlqKa4+OkUU1xW0E+q/XTfw=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "ed2574bb336db42f69c822f9d94ed14205250c05", + "rev": "cb139fa956158397aa398186bb32dd26f7318784", "type": "github" }, "original": { "owner": "input-output-hk", "repo": "haskell.nix", + "rev": "cb139fa956158397aa398186bb32dd26f7318784", "type": "github" } }, @@ -407,23 +447,6 @@ "type": "github" } }, - "hls-2.9": { - "flake": false, - "locked": { - "lastModified": 1720003792, - "narHash": "sha256-qnDx8Pk0UxtoPr7BimEsAZh9g2WuTuMB/kGqnmdryKs=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "0c1817cb2babef0765e4e72dd297c013e8e3d12b", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.9.0.1", - "repo": "haskell-language-server", - "type": "github" - } - }, "hpc-coveralls": { "flake": false, "locked": { @@ -668,22 +691,6 @@ "type": "github" } }, - "nixpkgs-2405": { - "locked": { - "lastModified": 1729242558, - "narHash": "sha256-VgcLDu4igNT0eYua6OAl9pWCI0cYXhDbR+pWP44tte0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4a3f2d3195b60d07530574988df92e049372c10e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-24.05-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-regression": { "locked": { "lastModified": 1643052045, @@ -702,17 +709,17 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1729980323, - "narHash": "sha256-eWPRZAlhf446bKSmzw6x7RWEE4IuZgAp8NW3eXZwRAY=", + "lastModified": 1694822471, + "narHash": "sha256-6fSDCj++lZVMZlyqOe9SIOL8tYSBz1bI8acwovRwoX8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "86e78d3d2084ff87688da662cf78c2af085d8e73", + "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", + "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", "type": "github" } }, @@ -738,11 +745,15 @@ "CHaP": "CHaP", "flake-utils": "flake-utils", "hackageGHCJS": "hackageGHCJS", + "hackageNix": "hackageNix", "haskellNix": "haskellNix", + "hostNixpkgs": [ + "nixpkgs" + ], "iohkNix": "iohkNix", "nixpkgs": [ "haskellNix", - "nixpkgs-2305" + "nixpkgs-unstable" ] } }, From 8197a1135cb41647fd033721d9f5448cba09c823 Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Wed, 27 Nov 2024 10:00:58 +1100 Subject: [PATCH 5/5] revert accidental nixpkgs bump --- flake.lock | 2 +- flake.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index 95b6ee833..a4abd1b4d 100644 --- a/flake.lock +++ b/flake.lock @@ -753,7 +753,7 @@ "iohkNix": "iohkNix", "nixpkgs": [ "haskellNix", - "nixpkgs-unstable" + "nixpkgs-2305" ] } }, diff --git a/flake.nix b/flake.nix index dcfa6eeaf..ca9ba820b 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Cardano Addresses"; inputs = { - nixpkgs.follows = "haskellNix/nixpkgs-unstable"; + nixpkgs.follows = "haskellNix/nixpkgs-2305"; hostNixpkgs.follows = "nixpkgs"; hackageNix = { url = "github:input-output-hk/hackage.nix";