dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #114422 from sternenseemann/fix-hnix-eval

Browse Source 
haskellPackages: fix various configuration-common.nix eval errors
This commit is contained in:
Dennis Gosnell 2021-02-26 12:07:30 +09:00 committed by GitHub
commit c9fb7d308d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -212,31 +212,11 @@ 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.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
});
# 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_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;
@ -1550,7 +1530,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)