From da6b9312569aa31e0654820fa0a01447d90908ec Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Sat, 26 Oct 2024 03:06:38 +0900 Subject: [PATCH] revert haskell.nix update (#503) * revert haskell.nix update * bitvec -simd * Use ghc965 * Update flake.nix * add hackageNix * drop ghc 9.8 * bring back cabal-3.12.1 --------- Co-authored-by: Hamish Mackenzie --- cabal.project | 4 ++ flake.lock | 120 +++++++++++++++++++++++++++----------------------- flake.nix | 14 ++++-- 3 files changed, 79 insertions(+), 59 deletions(-) diff --git a/cabal.project b/cabal.project index e8abde016..2a3fe3caa 100644 --- a/cabal.project +++ b/cabal.project @@ -39,3 +39,7 @@ benchmarks: true program-options ghc-options: -Werror +-- Windows cross with bitvec/simd is broken. +package bitvec + -- Workaround for windows cross-compilation + flags: -simd diff --git a/flake.lock b/flake.lock index 084e62b02..66508f26d 100644 --- a/flake.lock +++ b/flake.lock @@ -202,6 +202,43 @@ "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" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -223,14 +260,14 @@ "type": "github" } }, - "hackage": { + "hackageNix": { "flake": false, "locked": { - "lastModified": 1728520067, - "narHash": "sha256-hM44JtZhnSKRzf6rJkZLPyAYHFMmysdZz1gLA+0Kctk=", + "lastModified": 1729124899, + "narHash": "sha256-cmb4iMcgk5+jUGMiZGNMzPCAnG17Kz9J6WIitYM17Fc=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "06fc3131daf5fcd3db12429d0c62e6c1db97eb5a", + "rev": "138edf81c8bcc4209e9706966f7feece70c37a96", "type": "github" }, "original": { @@ -248,7 +285,11 @@ "cardano-shell": "cardano-shell", "flake-compat": "flake-compat_2", "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", @@ -258,7 +299,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", @@ -273,21 +313,21 @@ "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": 1725411053, - "narHash": "sha256-cW999pULNLOZHlV9sqBFIrWTkSxuVAVR6xJR7GndHdQ=", + "lastModified": 1718797200, + "narHash": "sha256-ueFxTuZrQ3ZT/Fj5sSeUWlqKa4+OkUU1xW0E+q/XTfw=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "63783ecc949e99b2396ca821275cee26385adaba", + "rev": "cb139fa956158397aa398186bb32dd26f7318784", "type": "github" }, "original": { "owner": "input-output-hk", + "ref": "cb139fa956158397aa398186bb32dd26f7318784", "repo": "haskell.nix", "type": "github" } @@ -445,23 +485,6 @@ "type": "github" } }, - "hls-2.9": { - "flake": false, - "locked": { - "lastModified": 1718469202, - "narHash": "sha256-THXSz+iwB1yQQsr/PY151+2GvtoJnTIB2pIQ4OzfjD4=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "40891bccb235ebacce020b598b083eab9dda80f1", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.9.0.0", - "repo": "haskell-language-server", - "type": "github" - } - }, "hpc-coveralls": { "flake": false, "locked": { @@ -674,11 +697,11 @@ }, "nixpkgs-2305": { "locked": { - "lastModified": 1705033721, - "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=", + "lastModified": 1701362232, + "narHash": "sha256-GVdzxL0lhEadqs3hfRLuj+L1OJFGiL/L7gCcelgBlsw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea", + "rev": "d2332963662edffacfddfad59ff4f709dde80ffe", "type": "github" }, "original": { @@ -690,11 +713,11 @@ }, "nixpkgs-2311": { "locked": { - "lastModified": 1719957072, - "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=", + "lastModified": 1701386440, + "narHash": "sha256-xI0uQ9E7JbmEy/v8kR9ZQan6389rHug+zOtZeZFiDJk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105", + "rev": "293822e55ec1872f715a66d0eda9e592dc14419f", "type": "github" }, "original": { @@ -704,22 +727,6 @@ "type": "github" } }, - "nixpkgs-2405": { - "locked": { - "lastModified": 1726447378, - "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-24.05-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-regression": { "locked": { "lastModified": 1643052045, @@ -754,17 +761,17 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1726583932, - "narHash": "sha256-zACxiQx8knB3F8+Ze+1BpiYrI+CbhxyWpcSID9kVhkQ=", + "lastModified": 1694822471, + "narHash": "sha256-6fSDCj++lZVMZlyqOe9SIOL8tYSBz1bI8acwovRwoX8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "658e7223191d2598641d50ee4e898126768fe847", + "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", + "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", "type": "github" } }, @@ -843,6 +850,7 @@ "CHaP": "CHaP", "flake-compat": "flake-compat", "flake-utils": "flake-utils", + "hackageNix": "hackageNix", "haskellNix": "haskellNix", "iohkNix": "iohkNix", "nixpkgs": [ @@ -889,11 +897,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1728519053, - "narHash": "sha256-eLqU1oYOInJgc0bVzPhkYzFZ3C/naHTY8C6gzgGz3Jo=", + "lastModified": 1718756571, + "narHash": "sha256-8rL8viTbuE9/yV1of6SWp2tHmhVMD2UmkOfmN5KDbKg=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "fbf28874c9c0e75d99f97e81057097f018d37574", + "rev": "027672fb6fd45828b0e623c8152572d4058429ad", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index daf50598c..37292f3bd 100644 --- a/flake.nix +++ b/flake.nix @@ -2,11 +2,19 @@ description = "cardano-base"; inputs = { - haskellNix.url = "github:input-output-hk/haskell.nix"; + # freeze haskell.nix prior to the nixpkgs update that broken 8.10 cross-windows + haskellNix.url = "github:input-output-hk/haskell.nix?ref=cb139fa956158397aa398186bb32dd26f7318784"; + # allow us to independently update hackageNix + haskellNix.inputs.hackage.follows = "hackageNix"; nixpkgs.follows = "haskellNix/nixpkgs-unstable"; iohkNix.url = "github:input-output-hk/iohk-nix"; flake-utils.url = "github:hamishmack/flake-utils/hkm/nested-hydraJobs"; + hackageNix = { + url = "github:input-output-hk/hackage.nix"; + flake = false; + }; + CHaP = { url = "github:intersectmbo/cardano-haskell-packages?ref=repo"; flake = false; @@ -48,7 +56,7 @@ inherit (nixpkgs) lib; # see flake `variants` below for alternative compilers - defaultCompiler = "ghc966"; + defaultCompiler = "ghc964"; fourmoluVersion = "0.16.2.0"; # We use cabalProject' to ensure we don't build the plan for # all systems. @@ -144,7 +152,7 @@ cabalProject.flake ( lib.optionalAttrs (system == "x86_64-linux") { # on linux, build/test other supported compilers - variants = lib.genAttrs ["ghc8107" "ghc982"] (compiler-nix-name: { + variants = lib.genAttrs ["ghc8107"] (compiler-nix-name: { inherit compiler-nix-name; }); # we also want cross compilation to windows.