From 0c86fd9042c56501a6e5956219dc0b37d647c5f3 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Giraudeau Date: Fri, 10 Mar 2023 15:49:26 +0100 Subject: [PATCH] nix: revert from ghc927 to ghc925 since support for 9.2.7 is not yet merged in haskell.nix master and 9.2.6 somehow fails to build. --- flake.lock | 23 +++-------------------- flake.nix | 4 ---- nix/haskell.nix | 2 +- 3 files changed, 4 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index 7ac662b311e..4c578ad54dd 100644 --- a/flake.lock +++ b/flake.lock @@ -1018,11 +1018,11 @@ "hackageNix": { "flake": false, "locked": { - "lastModified": 1678148876, - "narHash": "sha256-zsNwGpH1E+Km92ScOOL7mDC1a+6Yia9tFqtxX/VjGec=", + "lastModified": 1678407976, + "narHash": "sha256-wygjprSmRikRSIjn+oxBMj9phJ6Y8VtKNAjnewo0ZM8=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "2515e96b2e742bd96f0f825b52f42583cce2e4bc", + "rev": "fd418eb1578f451c3984b7af78593e9a7cd1c413", "type": "github" }, "original": { @@ -1701,22 +1701,6 @@ "type": "github" } }, - "nixTools": { - "flake": false, - "locked": { - "lastModified": 1659569011, - "narHash": "sha256-wHS0H5+TERmDnPCfzH4A+rSR5TvjYMWus9BNeNAMyUM=", - "owner": "input-output-hk", - "repo": "nix-tools", - "rev": "555d57e1ea81b79945f2608aa261df20f6b602a5", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "nix-tools", - "type": "github" - } - }, "nix_2": { "inputs": { "lowdown-src": "lowdown-src_2", @@ -2461,7 +2445,6 @@ ], "iohkNix": "iohkNix", "nix2container": "nix2container_4", - "nixTools": "nixTools", "nixpkgs": [ "haskellNix", "nixpkgs-unstable" diff --git a/flake.nix b/flake.nix index d0191114d28..638bc9fba10 100644 --- a/flake.nix +++ b/flake.nix @@ -14,10 +14,6 @@ url = "github:input-output-hk/hackage.nix"; flake = false; }; - nixTools = { - url = "github:input-output-hk/nix-tools"; - flake = false; - }; haskellNix = { url = "github:input-output-hk/haskell.nix"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/nix/haskell.nix b/nix/haskell.nix index a5a17d3c32e..f078072c428 100644 --- a/nix/haskell.nix +++ b/nix/haskell.nix @@ -21,7 +21,7 @@ let name = "cardano-node"; compiler-nix-name = lib.mkDefault "ghc8107"; # extra-compilers - flake.variants = lib.genAttrs ["ghc927"] (x: {compiler-nix-name = x;}); + flake.variants = lib.genAttrs ["ghc925"] (x: {compiler-nix-name = x;}); cabalProjectLocal = '' allow-newer: terminfo:base '' + lib.optionalString pkgs.stdenv.hostPlatform.isWindows ''