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

haskellPackages: adjust overrides for doctest update

Browse Source 
* haskell.packages.ghc9{0,2}1.doctest: 0.18.1 -> 0.18.2

* haskell.packages.ghc921.doctest: drop now obsolete patch

* haskellPackages.hledger-lib_1_23: reflect doctest update
This commit is contained in:
sternenseemann 2021-11-12 10:44:22 +01:00
parent 8b92aabf52
commit 51eed17da0
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -844,7 +844,7 @@ self: super: {
# hledger-lib 1.23 depends on doctest >= 0.18
hledger-lib_1_23 = super.hledger-lib_1_23.override {
doctest = self.doctest_0_18_1;
doctest = self.doctest_0_18_2;
};
# Copy hledger man pages from data directory into the proper place. This code

2
pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
View File

@ -92,7 +92,7 @@ self: super: {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/fe192e12b88b09499d4aff0e562713e820544bd6/patches/alex-3.2.6.patch";
sha256 = "1rzs764a0nhx002v4fadbys98s6qblw4kx4g46galzjf5f7n2dn4";
}) (dontCheck super.alex);
doctest = dontCheck (doJailbreak super.doctest_0_18_1);
doctest = dontCheck (doJailbreak super.doctest_0_18_2);
language-haskell-extract = appendPatch (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/language-haskell-extract-0.2.4.patch";
sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f";

5
pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
View File

@ -84,10 +84,7 @@ self: super: {
Cabal = self.Cabal_3_6_2_0;
});
doctest = appendPatch (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/doctest-0.18.1.patch";
sha256 = "030kdsk0fg08cgdcjpyv6z8ym1vkkrbd34aacs91y5hqzc9g79y1";
}) (dontCheck (doJailbreak super.doctest_0_18_1));
doctest = dontCheck (doJailbreak super.doctest_0_18_2);
# Tests fail in GHC 9.2
extra = dontCheck super.extra;