From b30b9ddcdd7ac17032fb2add5683e6d4793a3652 Mon Sep 17 00:00:00 2001 From: Jade Date: Fri, 10 Sep 2021 00:18:43 -0700 Subject: [PATCH 1/4] update ghc-api-compat --- flake.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index e7409c385a..31c926ea47 100644 --- a/flake.nix +++ b/flake.nix @@ -71,13 +71,11 @@ tweaks = hself: hsuper: with haskell.lib; { - ghc-api-compat = hself.callCabal2nix "ghc-api-compat" - (pkgs.fetchFromGitHub { - owner = "hsyl20"; - repo = "ghc-api-compat"; - rev = "8fee87eac97a538dbe81ff1ab18cff10f2f9fa15"; - sha256 = "byehvdxQxhNk5ZQUXeFHjAZpAze4Ct9261ro4c5acZk="; - }) { }; + ghc-api-compat = hself.callHackageDirect { + pkg = "ghc-api-compat"; + ver = "8.10.7"; + sha256 = "0p3sxpzpnccfm9p3yvi88507kh7zcmmg52nl0z12azlh6yfcipw3"; + } {}; lsp = hself.lsp_1_2_0_1; From 94f5e9ce1561ba46375960bea174252ef8baed7b Mon Sep 17 00:00:00 2001 From: jneira Date: Sun, 12 Sep 2021 21:46:26 +0200 Subject: [PATCH 2/4] Add ghc-api-compat to 9.0.1 --- configuration-ghc-901.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/configuration-ghc-901.nix b/configuration-ghc-901.nix index 36777ad92b..22dad7e25b 100644 --- a/configuration-ghc-901.nix +++ b/configuration-ghc-901.nix @@ -25,6 +25,13 @@ let # we need add ghc-api-compat to build depends, # since its condition tree is not evaluated under ghc 9 + + ghc-api-compat = hself.callHackageDirect { + pkg = "ghc-api-compat"; + ver = "9.0.1"; + sha256 = "0p3sxpzpnccfm9p3yvi88507kh7zcmmg52nl0z12azlh6yfcixxx"; + } {}; + hiedb = addBuildDepend hsuper.hiedb hself.ghc-api-compat; blaze-textual = hself.callCabal2nix "blaze-textual" From 09e9cab8489ee5edd434b7196275bd860f1b2c1b Mon Sep 17 00:00:00 2001 From: Peter Becich Date: Sun, 12 Sep 2021 13:58:26 -0700 Subject: [PATCH 3/4] update sha256 acquired by providing empty sha256 and causing error --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 31c926ea47..d5dc999ed1 100644 --- a/flake.nix +++ b/flake.nix @@ -74,7 +74,7 @@ ghc-api-compat = hself.callHackageDirect { pkg = "ghc-api-compat"; ver = "8.10.7"; - sha256 = "0p3sxpzpnccfm9p3yvi88507kh7zcmmg52nl0z12azlh6yfcipw3"; + sha256 = "g9/InDeQfiXCB9SK8mpl/8B5QEEobj9uqo4xe//telw="; } {}; lsp = hself.lsp_1_2_0_1; From cbda2f88daa0f9aa25b7b29e6d5499072e6790e4 Mon Sep 17 00:00:00 2001 From: Javier Neira Date: Mon, 13 Sep 2021 07:22:12 +0200 Subject: [PATCH 4/4] Update sha for ghc-api-compat-9.0.1 --- configuration-ghc-901.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration-ghc-901.nix b/configuration-ghc-901.nix index 22dad7e25b..79a04cf0ac 100644 --- a/configuration-ghc-901.nix +++ b/configuration-ghc-901.nix @@ -29,7 +29,7 @@ let ghc-api-compat = hself.callHackageDirect { pkg = "ghc-api-compat"; ver = "9.0.1"; - sha256 = "0p3sxpzpnccfm9p3yvi88507kh7zcmmg52nl0z12azlh6yfcixxx"; + sha256 = "WCK1gu6iiCAc2s2rFEqn2CkvHkITPrmDjuiGsWOWerM="; } {}; hiedb = addBuildDepend hsuper.hiedb hself.ghc-api-compat;