From 62dbe409768bd0e5d051bf7e3a7a1365f43d0835 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 26 Feb 2021 00:13:30 +0100 Subject: [PATCH 1/3] haskellPackages: fix eval after advancing to hnix-store-core 0.4.1.0 We don't need to pin the package version from hackage anywhere anymore since stackage-nightly has arrived at the version we want. The tasty-discover override is still necessary, but can be applied to the plain hnix-store-core attribute. Since the hnix-store-core_0_4_1_0 attribute no longer exists a few intermittent eval errors where caused by the package set regeneration. --- .../haskell-modules/configuration-common.nix | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 372d0c8e5c3..bfde29e33cd 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -217,26 +217,10 @@ self: super: { # building of the executable has been disabled for ghc < 8.10 in hnix. # Generating the completions should be activated again, once we default to # ghc 8.10. - hnix = dontCheck (super.hnix.override { - - # 2021-01-07: NOTE: hnix-store-core pinned at ==0.2 in Stackage Nightly. - # https://github.com/haskell-nix/hnix-store/issues/104 - # Until unpin, which may hold off in time due to Stackage maintenence bottleneck - # the 0_4_0_0 is used - hnix-store-core = self.hnix-store-core_0_4_1_0; # at least 1.7 - - }); - - # 2021-01-07: NOTE: hnix-store-core pinned at ==0.2 in Stackage Nightly. - # https://github.com/haskell-nix/hnix-store/issues/104 - # Until unpin, which may hold off in time due to Stackage maintenence bottleneck - # the 0_4_0_0 is used - hnix-store-remote = (super.hnix-store-remote.override { - hnix-store-core = self.hnix-store-core_0_4_1_0; # at least 1.7 - }); + hnix = dontCheck super.hnix; # https://github.com/haskell-nix/hnix-store/issues/127 - hnix-store-core_0_4_1_0 = addTestToolDepend super.hnix-store-core_0_4_1_0 self.tasty-discover; + hnix-store-core = addTestToolDepend super.hnix-store-core self.tasty-discover; # Fails for non-obvious reasons while attempting to use doctest. search = dontCheck super.search; From 474dbcb767a3e62cbfded428b294e99c9da96de9 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 26 Feb 2021 00:24:32 +0100 Subject: [PATCH 2/3] haskellPackages.essence-of-live-coding-warp: bump http-client http-client had a new release on hackage, so the http-client_0_7_5 attribute no longer exists, we replace it by http-client_0_7_6. --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index bfde29e33cd..8ab7e06af2e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1534,7 +1534,7 @@ self: super: { # 2020-12-05: http-client is fixed on too old version essence-of-live-coding-warp = super.essence-of-live-coding-warp.override { - http-client = self.http-client_0_7_5; + http-client = self.http-client_0_7_6; }; # 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27) From 77fe5ae244044424c6eeb8a8441ca24d046487d7 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 26 Feb 2021 00:30:22 +0100 Subject: [PATCH 3/3] haskellPackages.hnix: generate completions again As stated in the original comment, since we have moved to GHC 8.10.x, the hnix binary builds again and we can generate completions for it. --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8ab7e06af2e..433060b4405 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -212,12 +212,8 @@ self: super: { # base bound digit = doJailbreak super.digit; - # 2020-06-05: HACK: does not pass own build suite - `dontCheck` We should - # generate optparse-applicative completions for the hnix executable. Sadly - # building of the executable has been disabled for ghc < 8.10 in hnix. - # Generating the completions should be activated again, once we default to - # ghc 8.10. - hnix = dontCheck super.hnix; + # 2020-06-05: HACK: does not pass own build suite - `dontCheck` + hnix = generateOptparseApplicativeCompletion "hnix" (dontCheck super.hnix); # https://github.com/haskell-nix/hnix-store/issues/127 hnix-store-core = addTestToolDepend super.hnix-store-core self.tasty-discover;