Merge pull request #140962 from NixOS/haskell-updates

haskellPackages: update stackage and hackage
2021-10-11 22:07:11 +02:00 · 2021-10-11 22:07:11 +02:00 · 2cdd608fab
commit 2cdd608fab
parent cbbbd56385 96c93be920
5 changed files with 490 additions and 628 deletions
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@ -1,6 +1,6 @@
 {
-  "commit": "c3251a7b66241fd25a603ea957ec88b9fa6fffa9",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/c3251a7b66241fd25a603ea957ec88b9fa6fffa9.tar.gz",
-  "sha256": "0rpwykkvd6m5v0ay3ra9fyjgax1y67pr857s32z7l5bjgv1aap5p",
-  "msg": "Update from Hackage at 2021-10-05T05:41:58Z"
+  "commit": "ba457d86df5e8781485cf1b109f249ecf00ee4c6",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/ba457d86df5e8781485cf1b109f249ecf00ee4c6.tar.gz",
+  "sha256": "1h1qnllhdfp6n71b36jw8kaw7kani76z3mmbigrvy8cmkbvj2mdc",
+  "msg": "Update from Hackage at 2021-10-08T09:46:02Z"
 }
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -1996,9 +1996,16 @@ EOT
  # 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too.
  streamly-posix = doJailbreak super.streamly-posix;

+  # https://github.com/hadolint/language-docker/issues/72
+  language-docker_10_2_0 = overrideCabal super.language-docker_10_2_0 (drv: {
+    testFlags = (drv.testFlags or []) ++ [
+      "--skip=/Language.Docker.Integration/parse"
+    ];
+  });
+
  # 2021-09-06: hadolint depends on language-docker >= 10.1
  hadolint = super.hadolint.override {
-    language-docker = self.language-docker_10_1_2;
+    language-docker = self.language-docker_10_2_0;
  };

  # 2021-09-13: hls 1.3 needs a newer lsp than stackage-lts. (lsp >= 1.2.0.1)
@ -2025,11 +2032,11 @@ EOT

  # Needs network >= 3.1.2
  quic = super.quic.overrideScope (self: super: {
-    network = self.network_3_1_2_2;
+    network = self.network_3_1_2_5;
  });

  http3 = super.http3.overrideScope (self: super: {
-    network = self.network_3_1_2_2;
+    network = self.network_3_1_2_5;
  });

 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
--- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
@ -43,54 +43,129 @@ self: super: {
  unix = null;
  xhtml = null;

+  aeson = appendPatch (doJailbreak super.aeson) (pkgs.fetchpatch {
+    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/aeson-1.5.6.0.patch";
+    sha256 = "07rk7f0lhgilxvbg2grpl1p5x25wjf9m7a0wqmi2jr0q61p9a0nl";
+    # The revision information is newer than that included in the patch
+    excludes = ["*.cabal"];
+  });
+
+  attoparsec = appendPatch (doJailbreak super.attoparsec_0_14_1) (pkgs.fetchpatch {
+    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/attoparsec-0.14.1.patch";
+    sha256 = "0nprywmi3i9ih8mcc8afyimrfjr8pbcjxr2ywz9gwdlwdplk21da";
+  });
+
  # 0.12.0 introduces support for 9.2
  base-compat = self.base-compat_0_12_0;
+  base-compat-batteries = self.base-compat-batteries_0_12_0;
+
+  basement = overrideCabal (appendPatch super.basement (pkgs.fetchpatch {
+    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/basement-0.0.12.patch";
+    sha256 = "0c8n2krz827cv87p3vb1vpl3v0k255aysjx9lq44gz3z1dhxd64z";
+  })) (drv: {
+    # This is inside a conditional block so `doJailbreak` doesn't work
+    postPatch = "sed -i -e 's,<4.16,<4.17,' basement.cabal";
+  });
+
+  # Duplicate Show instances in tests and library cause compiling tests to fail
+  blaze-builder = appendPatch (dontCheck super.blaze-builder) (pkgs.fetchpatch {
+    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/blaze-builder-0.4.2.1.patch";
+    sha256 = "1h5ny3mlng69vwaabl3af8hlv4qi24wfw8s14lw2ksw1yjbgi0j8";
+  });
+
+  cereal = appendPatch super.cereal (pkgs.fetchpatch {
+    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/cereal-0.5.8.1.patch";
+    sha256 = "03v4nxwz9y6viaa8anxcmp4zdf2clczv4pf9fqq6lnpplpz5i128";
+  });
+
+  # Tests fail because of typechecking changes
+  conduit = dontCheck super.conduit;
+
+  constraints = appendPatch super.constraints (pkgs.fetchpatch {
+    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/constraints-0.13.patch";
+    sha256 = "0cr4qzw0fbwy97f3wx0v3mv8yc642ahpfa80kaqrq191232fzzf3";
+  });
+
+  cryptonite = appendPatch super.cryptonite (pkgs.fetchpatch {
+    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/cryptonite-0.29.patch";
+    sha256 = "1g48lrmqgd88hqvfq3klz7lsrpwrir2v1931myrhh6dy0d9pqj09";
+  });

  # cabal-install needs more recent versions of Cabal and base16-bytestring.
  cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: {
    Cabal = null;
  });

+  doctest = appendPatch (dontCheck (doJailbreak super.doctest_0_18_1)) (pkgs.fetchpatch {
+    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/doctest-0.18.1.patch";
+    sha256 = "030kdsk0fg08cgdcjpyv6z8ym1vkkrbd34aacs91y5hqzc9g79y1";
+  });
+
+  entropy = appendPatch super.entropy (pkgs.fetchpatch {
+    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/entropy-0.4.1.6.patch";
+    sha256 = "0pbbl6m8b3snf9cz6rs0ljmacpsavayfn0s3p67hdcmndy3ndawi";
+  });
+
+  # Tests fail in GHC 9.2
+  extra = dontCheck super.extra;
+
  # Jailbreaks & Version Updates
+  assoc = doJailbreak super.assoc;
  async = doJailbreak super.async;
  base64-bytestring = doJailbreak super.base64-bytestring;
  ChasingBottoms = doJailbreak super.ChasingBottoms;
+  cpphs = overrideCabal super.cpphs (drv: { postPatch = "sed -i -e 's,time >=1.5 && <1.11,time >=1.5 \\&\\& <1.12,' cpphs.cabal";});
+  cryptohash-md5 = doJailbreak super.cryptohash-md5;
+  cryptohash-sha1 = doJailbreak super.cryptohash-sha1;
  data-fix = doJailbreak super.data-fix;
  dec = doJailbreak super.dec;
  ed25519 = doJailbreak super.ed25519;
+  ghc-byteorder = doJailbreak super.ghc-byteorder;
  hackage-security = doJailbreak super.hackage-security;
  hashable-time = doJailbreak super.hashable-time;
  HTTP = overrideCabal (doJailbreak super.HTTP) (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; });
-  integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's,integer-gmp <1.1,integer-gmp < 2,' integer-logarithms.cabal"; });
+  integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's, <1.1, <1.3,' integer-logarithms.cabal"; });
+  indexed-traversable = doJailbreak super.indexed-traversable;
+  lifted-async = doJailbreak super.lifted-async;
  lukko = doJailbreak super.lukko;
-  network = super.network_3_1_2_2;
+  network = super.network_3_1_2_5;
  parallel = doJailbreak super.parallel;
+  polyparse = overrideCabal (doJailbreak super.polyparse) (drv: { postPatch = "sed -i -e 's, <0.11, <0.12,' polyparse.cabal"; });
  primitive = doJailbreak super.primitive;
  regex-posix = doJailbreak super.regex-posix;
  resolv = doJailbreak super.resolv;
  singleton-bool = doJailbreak super.singleton-bool;
+  scientific = doJailbreak super.scientific;
+  shelly = doJailbreak super.shelly;
  split = doJailbreak super.split;
  splitmix = doJailbreak super.splitmix;
  tar = doJailbreak super.tar;
+  these = doJailbreak super.these;
  time-compat = doJailbreak super.time-compat;
+  type-equality = doJailbreak super.type-equality;
  vector = doJailbreak (dontCheck super.vector);
  vector-binary-instances = doJailbreak super.vector-binary-instances;
  vector-th-unbox = doJailbreak super.vector-th-unbox;
  zlib = doJailbreak super.zlib;

+  # Syntax error in tests fixed in https://github.com/simonmar/alex/commit/84b29475e057ef744f32a94bc0d3954b84160760
+  alex = dontCheck super.alex;
+
  # Apply patches from head.hackage.
-  alex = appendPatch (dontCheck super.alex) (pkgs.fetchpatch {
-    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/fe192e12b88b09499d4aff0e562713e820544bd6/patches/alex-3.2.6.patch";
-    sha256 = "1rzs764a0nhx002v4fadbys98s6qblw4kx4g46galzjf5f7n2dn4";
-  });
-  doctest = dontCheck (doJailbreak super.doctest_0_18_1);
  language-haskell-extract = appendPatch (doJailbreak super.language-haskell-extract) (pkgs.fetchpatch {
-    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/language-haskell-extract-0.2.4.patch";
-    sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f";
+    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/language-haskell-extract-0.2.4.patch";
+    sha256 = "0w4y3v69nd3yafpml4gr23l94bdhbmx8xky48a59lckmz5x9fgxv";
  });

-  # 1.3.0 (on stackage) defines instances for the Option-type, which has been removed from base in GHC 9.2.x
-  hashable = super.hashable_1_3_3_0;
+  hashable = super.hashable_1_3_4_1;
+
+  haskell-src-meta = appendPatch (doJailbreak super.haskell-src-meta) (pkgs.fetchpatch {
+    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/haskell-src-meta-0.8.7.patch";
+    sha256 = "013k8hpxac226j47cdzgdf9a1j91kmm0cvv7n8zwlajbj3y9bzjp";
+  });
+
+  # Tests depend on `parseTime` which is no longer available
+  hourglass = dontCheck super.hourglass;

  # 1.2.1 introduced support for GHC 9.2.1, stackage has 1.2.0
  # The test suite indirectly depends on random, which leads to infinite recursion
@ -100,16 +175,31 @@ self: super: {
  lens = super.lens_5_0_1;

  # 0.16.0 introduced support for GHC 9.0.x, stackage has 0.15.0
-  memory = super.memory_0_16_0;
+  memory = appendPatch super.memory_0_16_0 (pkgs.fetchpatch {
+    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/memory-0.16.0.patch";
+    sha256 = "1kjganx729a6xfgfnrb3z7q6mvnidl042zrsd9n5n5a3i76nl5nl";
+  });

  # GHC 9.0.x doesn't like `import Spec (main)` in Main.hs
  # https://github.com/snoyberg/mono-traversable/issues/192
  mono-traversable = dontCheck super.mono-traversable;

+  quickcheck-instances = appendPatch (doJailbreak super.quickcheck-instances) (pkgs.fetchpatch {
+    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/quickcheck-instances-0.3.25.2.patch";
+    sha256 = "0ndnb6wbnhxxwy69jjdpmd7gmmv6asmx1jczwz1hsn921mn1ilnp";
+    # `.cabal` revision information has been included in the patch
+    excludes = ["*.cabal"];
+  });
+
  # Disable tests pending resolution of
  # https://github.com/Soostone/retry/issues/71
  retry = dontCheck super.retry;

+  streaming-commons = appendPatch super.streaming-commons (pkgs.fetchpatch {
+    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/streaming-commons-0.2.2.1.patch";
+    sha256 = "04wi1jskr3j8ayh88kkx4irvhhgz0i7aj6fblzijy0fygikvidpy";
+  });
+
  # hlint 3.3 needs a ghc-lib-parser newer than the one from stackage
  hlint = super.hlint_3_3_4.overrideScope (self: super: {
    ghc-lib-parser = overrideCabal self.ghc-lib-parser_9_0_1_20210324 {
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
@ -1,4 +1,4 @@
-# Stackage LTS 18.12
+# Stackage LTS 18.13
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@ -163,22 +163,22 @@ default-package-overrides:
  - array-memoize ==0.6.0
  - arrow-extras ==0.1.0.1
  - arrows ==0.4.4.2
-  - ascii ==1.0.1.4
-  - ascii-case ==1.0.0.4
-  - ascii-char ==1.0.0.8
+  - ascii ==1.0.1.6
+  - ascii-case ==1.0.0.6
+  - ascii-char ==1.0.0.10
  - asciidiagram ==1.3.3.3
-  - ascii-group ==1.0.0.4
-  - ascii-predicates ==1.0.0.4
+  - ascii-group ==1.0.0.6
+  - ascii-predicates ==1.0.0.6
  - ascii-progress ==0.3.3.0
-  - ascii-superset ==1.0.1.4
-  - ascii-th ==1.0.0.4
+  - ascii-superset ==1.0.1.6
+  - ascii-th ==1.0.0.6
  - asn1-encoding ==0.9.6
  - asn1-parse ==0.9.5
  - asn1-types ==0.3.4
  - assert-failure ==0.1.2.5
  - assoc ==1.0.2
  - astro ==0.4.3.0
-  - async ==2.2.3
+  - async ==2.2.4
  - async-extra ==0.2.0.0
  - async-pool ==0.9.1
  - async-refresh ==0.3.0.0
@ -277,7 +277,7 @@ default-package-overrides:
  - blaze-svg ==0.3.6.1
  - blaze-textual ==0.2.2.1
  - bmp ==1.2.6.3
-  - BNFC ==2.9.2
+  - BNFC ==2.9.3
  - BNFC-meta ==0.6.1
  - board-games ==0.3
  - boltzmann-samplers ==0.1.1.0
@ -614,7 +614,7 @@ default-package-overrides:
  - distributed-closure ==0.4.2.0
  - distribution-opensuse ==1.1.1
  - distributive ==0.6.2.1
-  - dl-fedora ==0.9.1
+  - dl-fedora ==0.9.2
  - dlist ==1.0
  - dlist-instances ==0.1.1.1
  - dlist-nonempty ==0.1.1
@ -683,7 +683,7 @@ default-package-overrides:
  - elynx-tree ==0.5.1.1
  - email-validate ==2.3.2.15
  - emd ==0.2.0.0
-  - emojis ==0.1
+  - emojis ==0.1.1
  - enclosed-exceptions ==1.0.3
  - ENIG ==0.0.1.0
  - entropy ==0.4.1.6
@ -704,7 +704,7 @@ default-package-overrides:
  - errors ==2.3.0
  - errors-ext ==0.4.2
  - ersatz ==0.4.9
-  - esqueleto ==3.5.2.2
+  - esqueleto ==3.5.3.0
  - essence-of-live-coding ==0.2.5
  - essence-of-live-coding-gloss ==0.2.5
  - essence-of-live-coding-pulse ==0.2.5
@ -838,7 +838,7 @@ default-package-overrides:
  - generic-aeson ==0.2.0.12
  - generic-arbitrary ==0.1.0
  - generic-constraints ==1.1.1.1
-  - generic-data ==0.9.2.0
+  - generic-data ==0.9.2.1
  - generic-data-surgery ==0.3.0.0
  - generic-deriving ==1.14.1
  - generic-functor ==0.2.0.0
@ -1011,7 +1011,7 @@ default-package-overrides:
  - hasql-transaction ==1.0.1
  - hasty-hamiltonian ==1.3.4
  - HaTeX ==3.22.3.0
-  - HaXml ==1.25.5
+  - HaXml ==1.25.6
  - haxr ==3000.11.4.1
  - HCodecs ==0.5.2
  - hdaemonize ==0.5.6
@ -1107,7 +1107,7 @@ default-package-overrides:
  - hslua-module-path ==0.1.0.1
  - hslua-module-system ==0.2.2.1
  - hslua-module-text ==0.3.0.1
-  - HsOpenSSL ==0.11.7.1
+  - HsOpenSSL ==0.11.7.2
  - HsOpenSSL-x509-system ==0.1.0.4
  - hsp ==0.10.0
  - hspec ==2.7.10
@ -1259,7 +1259,7 @@ default-package-overrides:
  - intset-imperative ==0.1.0.0
  - invariant ==0.5.4
  - invertible ==0.2.0.7
-  - invertible-grammar ==0.1.3
+  - invertible-grammar ==0.1.3.1
  - io-machine ==0.2.0.0
  - io-manager ==0.1.0.3
  - io-memoize ==1.1.1.0
@ -1395,6 +1395,7 @@ default-package-overrides:
  - linear ==1.21.6
  - linear-circuit ==0.1.0.2
  - linenoise ==0.3.2
+  - linux-capabilities ==0.1.0.0
  - linux-file-extents ==0.2.0.0
  - linux-namespaces ==0.1.3.0
  - liquid-fixpoint ==0.8.10.2
@ -1446,7 +1447,7 @@ default-package-overrides:
  - makefile ==1.1.0.0
  - managed ==1.0.8
  - MapWith ==0.2.0.0
-  - markdown ==0.1.17.4
+  - markdown ==0.1.17.5
  - markdown-unlit ==0.5.1
  - markov-chain ==0.0.3.4
  - massiv ==0.6.1.0
@ -1578,7 +1579,7 @@ default-package-overrides:
  - multipart ==0.2.1
  - multiset ==0.3.4.3
  - multistate ==0.8.0.3
-  - murmur3 ==1.0.4
+  - murmur3 ==1.0.5
  - murmur-hash ==0.1.0.9
  - MusicBrainz ==0.4.1
  - mustache ==2.3.1
@ -1634,7 +1635,7 @@ default-package-overrides:
  - nonce ==1.0.7
  - nondeterminism ==1.4
  - non-empty ==0.3.3
-  - nonempty-containers ==0.3.4.3
+  - nonempty-containers ==0.3.4.4
  - nonemptymap ==0.0.6.0
  - non-empty-sequence ==0.2.0.4
  - nonempty-vector ==0.2.1.0
@ -1686,7 +1687,7 @@ default-package-overrides:
  - opentelemetry-extra ==0.7.0
  - opentelemetry-lightstep ==0.7.0
  - opentelemetry-wai ==0.7.0
-  - operational ==0.2.3.5
+  - operational ==0.2.4.0
  - operational-class ==0.3.0.0
  - optics ==0.3
  - optics-core ==0.3.0.1
@ -2011,7 +2012,7 @@ default-package-overrides:
  - rocksdb-haskell ==1.0.1
  - rocksdb-haskell-jprupp ==2.1.3
  - rocksdb-query ==0.4.2
-  - roles ==0.2.0.0
+  - roles ==0.2.1.0
  - rope-utf16-splay ==0.3.2.0
  - rosezipper ==0.2
  - rot13 ==0.2.0.1
@ -2120,7 +2121,7 @@ default-package-overrides:
  - set-cover ==0.1.1
  - setenv ==0.1.1.3
  - setlocale ==1.0.0.10
-  - sexp-grammar ==2.3.2
+  - sexp-grammar ==2.3.3
  - SHA ==1.6.4.4
  - shake ==0.19.6
  - shake-language-c ==0.12.0
@ -2464,7 +2465,7 @@ default-package-overrides:
  - turtle ==1.5.22
  - typecheck-plugin-nat-simple ==0.1.0.2
  - TypeCompose ==0.9.14
-  - typed-process ==0.2.6.1
+  - typed-process ==0.2.6.3
  - typed-uuid ==0.1.0.0
  - type-equality ==1
  - type-errors ==0.2.0.0
@ -2608,7 +2609,7 @@ default-package-overrides:
  - wai-websockets ==3.0.1.2
  - wakame ==0.1.0.0
  - warp ==3.3.17
-  - warp-tls ==3.3.1
+  - warp-tls ==3.3.2
  - warp-tls-uid ==0.2.0.6
  - wave ==0.2.0
  - wcwidth ==0.0.2
@ -2660,7 +2661,7 @@ default-package-overrides:
  - Xauth ==0.1
  - xdg-basedir ==0.2.2
  - xdg-userdirs ==0.1.0.2
-  - xeno ==0.4.2
+  - xeno ==0.4.3
  - xlsx ==0.8.4
  - xlsx-tabular ==0.2.2.1
  - xml ==1.3.14
@ -2693,7 +2694,7 @@ default-package-overrides:
  - yesod-fb ==0.6.1
  - yesod-form ==1.7.0
  - yesod-gitrev ==0.2.2
-  - yesod-markdown ==0.12.6.11
+  - yesod-markdown ==0.12.6.12
  - yesod-newsfeed ==1.7.0.0
  - yesod-page-cursor ==2.0.0.9
  - yesod-paginator ==1.1.1.0
@ -2724,6 +2725,6 @@ default-package-overrides:
  - zlib-bindings ==0.1.1.5
  - zlib-lens ==0.1.2.1
  - zot ==0.0.3
-  - zstd ==0.1.2.0
+  - zstd ==0.1.3.0
  - ztail ==1.2.0.2
  - zydiskell ==0.2.0.0
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix