Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
af65daa
Stackage Nightly 2021-01-02
peti Jan 2, 2021
97c61d6
hackage-packages.nix: automatic Haskell package set update
peti Jan 2, 2021
c6bed7e
hackage-packages.nix: automatic Haskell package set update
peti Jan 5, 2021
00a90e9
haskellPackages.holmes: unbreak
markus1189 Jan 5, 2021
a9acf8e
haskellPackages.arbtt: unbreak
markus1189 Jan 5, 2021
d812bb9
haskellPackages.threadscope: jailbreak to fix build
markus1189 Jan 5, 2021
d89f456
Merge pull request #108460 from markus1189/unbreak-arbtt
cdepillabout Jan 6, 2021
8f5c69c
Merge pull request #108459 from markus1189/unbreak-holmes
cdepillabout Jan 6, 2021
ff1008e
hackage-packages.nix: automatic Haskell package set update
peti Jan 6, 2021
be17bea
spago: 0.18 -> 0.19
cdepillabout Jan 7, 2021
cb0119c
Merge pull request #108629 from cdepillabout/update-spago-0.19
cdepillabout Jan 7, 2021
7f8e739
Stackage Nightly 2021-01-05
peti Jan 7, 2021
7e27206
hackage-packages.nix: automatic Haskell package set update
peti Jan 7, 2021
0f888c7
haskellPackages.cryptohash-sha512: dontCheck
Anton-Latukha Dec 31, 2020
9f4b9b3
haskellPackages.hnix-store-remote: unbreak, fix deps
Anton-Latukha Dec 31, 2020
cfce290
haskellPackages.hnix: fix deps
Anton-Latukha Jan 7, 2021
b6ba72e
Merge remote-tracking branch 'origin/master' into haskell-updates.
peti Jan 7, 2021
bdc8c8b
hackage-packages.nix: automatic Haskell package set update
peti Jan 8, 2021
c871aec
Merge pull request #108470 from markus1189/threadscope-jailbreak
cdepillabout Jan 8, 2021
662eba1
profiteur: jailbreak and un-break
cleverca22 Jan 5, 2021
8ff0049
haskellPackages.profiteur: remove unnecessary parens
cdepillabout Jan 8, 2021
08fc5ef
Merge pull request #108452 from cleverca22/jailbreak-profiteur
cdepillabout Jan 8, 2021
0e48e5c
haskeline: fix overrides for the latest release
peti Jan 8, 2021
9aad7ef
hackage2nix: update list of broken builds to avoid evaluation errors
peti Jan 8, 2021
896e8ee
hackage-packages.nix: automatic Haskell package set update
peti Jan 8, 2021
d2f8eca
fix cachix build
domenkozar Jan 8, 2021
7829f94
haskelPackages.haskell-language-server: 0.7.1 -> 0.8.0
maralorn Jan 8, 2021
8e68a5e
Merge branch '2020-12-31-upd-haskell-packages' of git://github.com/An…
peti Jan 8, 2021
063a716
Merge pull request #108807 from maralorn/hls
peti Jan 8, 2021
4c16190
hackage-packages.nix: automatic Haskell package set update
peti Jan 8, 2021
7e26c12
hackage2nix: update list of broken builds
peti Jan 8, 2021
9a61689
hackage-packages.nix: automatic Haskell package set update
peti Jan 8, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 38 additions & 23 deletions pkgs/development/haskell-modules/configuration-common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,24 @@ 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;
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_0_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_0_0; # at least 1.7
});


# Fails for non-obvious reasons while attempting to use doctest.
search = dontCheck super.search;
Expand Down Expand Up @@ -805,11 +822,20 @@ self: super: {
# Needs QuickCheck <2.10, HUnit <1.6 and base <4.10
pointfree = doJailbreak super.pointfree;

# Depends on base <4.12
# See https://github.com/haskell-hvr/cryptohash-sha512/pull/3
# , https://github.com/haskell-hvr/cryptohash-sha512/issues/4
# and https://github.com/haskell-hvr/cryptohash-sha512/pull/5
cryptohash-sha512 = doJailbreak super.cryptohash-sha512;
# The project is stale
#
# Archiving request: https://github.com/haskell-hvr/cryptohash-sha512/issues/6
#
# doJailbreak since base <4.12 && bytestring <0.11
# Request to support:
# https://github.com/haskell-hvr/cryptohash-sha512/issues/4
# PRs to support base <4.12:
# https://github.com/haskell-hvr/cryptohash-sha512/pull/3
# https://github.com/haskell-hvr/cryptohash-sha512/pull/5
#
# dontCheck since test suite does not support new `base16-bytestring` >= 1 format
# https://github.com/haskell-hvr/cryptohash-sha512/pull/5#issuecomment-752796913
cryptohash-sha512 = dontCheck (doJailbreak super.cryptohash-sha512);

# Depends on tasty < 1.x, which we don't have.
cryptohash-sha256 = doJailbreak super.cryptohash-sha256;
Expand Down Expand Up @@ -1309,7 +1335,7 @@ self: super: {
commonmark-extensions = dontCheck super.commonmark-extensions;

# Testsuite trying to run `which haskeline-examples-Test`
haskeline_0_8_1_0 = dontCheck super.haskeline_0_8_1_0;
haskeline_0_8_1_1 = dontCheck super.haskeline_0_8_1_1;

# Tests for list-t, superbuffer, and stm-containers
# depend on HTF and it is broken, 2020-08-23
Expand Down Expand Up @@ -1483,22 +1509,7 @@ self: super: {
# 2020-11-19: Jailbreaking until: https://github.com/snapframework/snap/pull/219
snap = doJailbreak super.snap;

# 2020-11-21: cachix + chachix-api needs a patch for ghc 8.10 compat. Can be removed once released
# https://github.com/cachix/cachix/pull/331
cachix-api = appendPatch super.cachix-api (pkgs.fetchpatch {
url = https://github.com/cachix/cachix/commit/bfeec151a03afad72401815fe8bbb1b0d5d63b0d.patch;
sha256 = "0rglyd77g4j72l5g0sj9zpq2hy3v992bm6nhj58pmj4j2aj67y74";
stripLen = 2;
extraPrefix = "";
includes = [ "src/Cachix/Types/Session.hs" "src/Cachix/API/Signing.hs" ];
});
cachix = generateOptparseApplicativeCompletion "cachix" (appendPatch super.cachix (pkgs.fetchpatch {
url = https://github.com/cachix/cachix/commit/bfeec151a03afad72401815fe8bbb1b0d5d63b0d.patch;
sha256 = "06jmpz8l5vh9cch5aqdbrln7bm3fghxsicwy1m93avli320kp8pp";
stripLen = 2;
extraPrefix = "";
excludes = [ "stack.yaml" "sources.json" "src/Cachix/Types/Session.hs" "src/Cachix/API/Signing.hs" "cachix-api.cabal" "workflows/test.yml" ];
}));
cachix = generateOptparseApplicativeCompletion "cachix" super.cachix;

# 2020-11-23: Jailbreaking until: https://github.com/michaelt/text-pipes/pull/29
pipes-text = doJailbreak super.pipes-text;
Expand Down Expand Up @@ -1552,4 +1563,8 @@ self: super: {
servant-client = doJailbreak super.servant-client;
servant-client-core = doJailbreak super.servant-client-core;

# overly strict dependency on aeson
# https://github.com/jaspervdj/profiteur/issues/33
profiteur = doJailbreak super.profiteur;

} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
Loading