Merge pull request #173800 from NixOS/haskell-updates

haskellPackages: update stackage and hackage
NixOS · May 29, 2022 · b571ef8 · b571ef8
2 parents 01c1bb5 + 9138527
commit b571ef8
Show file tree

Hide file tree

Showing 11 changed files with 1,475 additions and 1,404 deletions.
diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json
@@ -1,6 +1,6 @@
 {
-  "commit": "2c56a18f7c408d4fd67a3667d93cab163692fc53",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/2c56a18f7c408d4fd67a3667d93cab163692fc53.tar.gz",
-  "sha256": "0yvikmygrb6gb0lv4jp00rsqnagvkrc94sgmrn1gfjlmazss77z5",
-  "msg": "Update from Hackage at 2022-05-14T01:13:33Z"
+  "commit": "d69efcbdc39d5a7ae25039f9737ad04e34f38f68",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d69efcbdc39d5a7ae25039f9737ad04e34f38f68.tar.gz",
+  "sha256": "1xlnp36h5r8q3nf1fbq472rkqp0wmgz51rylnd23kl0pba2fypkp",
+  "msg": "Update from Hackage at 2022-05-20T19:45:02Z"
 }
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
@@ -165,6 +165,9 @@ self: super: {
     })
   ] super.flat;
 
+  # Too strict bounds on base, optparse-applicative: https://github.com/edsko/friendly/issues/5
+  friendly = doJailbreak super.friendly;
+
   # Too strict bound on hspec: https://github.com/ivan-m/graphviz/issues/55
   graphviz = doJailbreak super.graphviz;
 
@@ -779,22 +782,6 @@ self: super: {
   # The tests spuriously fail
   libmpd = dontCheck super.libmpd;
 
-  # For template-haskell 2.16 and 2.17 support: https://github.com/JonasDuregard/sized-functors/pull/10
-  size-based = overrideCabal
-    (drv: {
-      # make all line endings unix, otherwise patching fails
-      prePatch = ''
-        find . -type f -print0 | xargs -0 ${pkgs.buildPackages.dos2unix}/bin/dos2unix
-      '' + (drv.prePatch or "");
-      patches = [
-        (fetchpatch {
-          url = "https://github.com/JonasDuregard/sized-functors/pull/10/commits/fe6bf78a1b97ff7429630d0e8974c9bc40945dcf.patch";
-          sha256 = "sha256-mMsXOqLqSbGl9Q0txiZiciPtGT7f12lnhlpFsnCwamk=";
-        })
-      ];
-    })
-    super.size-based;
-
   # https://github.com/diagrams/diagrams-braille/issues/1
   diagrams-braille = doJailbreak super.diagrams-braille;
 
@@ -1003,10 +990,6 @@ self: super: {
   # https://github.com/haskell-hvr/resolv/pull/6
   resolv_0_1_1_2 = dontCheck super.resolv_0_1_1_2;
 
-  # Too strict bounds on base and Cabal, fixed on master
-  # Occasional test failures: https://github.com/phadej/spdx/issues/27
-  spdx = assert super.spdx.version == "1.0.0.2"; doJailbreak (dontCheck super.spdx);
-
   # The test suite does not know how to find the 'alex' binary.
   alex = overrideCabal (drv: {
     testSystemDepends = (drv.testSystemDepends or []) ++ [pkgs.which];
@@ -1166,16 +1149,6 @@ self: super: {
   # https://github.com/danfran/cabal-macosx/issues/13
   cabal-macosx = dontCheck super.cabal-macosx;
 
-  # Causes Test.QuickCheck.resize: negative size crashes e.g. in test suites
-  # https://github.com/typeable/generic-arbitrary/issues/14
-  generic-arbitrary = appendPatches [
-    (pkgs.fetchpatch {
-      name = "generic-arbitrary-no-negative-resize.patch";
-      url = "https://github.com/typeable/generic-arbitrary/commit/c13d119d8ad0d43860ecdb93b357b0239e366a6c.patch";
-      sha256 = "1jgbd2jn575icqw9nfdzh57nacm3pn8n53ka52129pnfjqfzyhsi";
-    })
-  ] super.generic-arbitrary;
-
   # https://github.com/DanielG/cabal-helper/pull/123
   cabal-helper = doJailbreak super.cabal-helper;
 
@@ -1767,7 +1740,11 @@ self: super: {
   # waiting for aeson bump
   servant-swagger-ui-core = doJailbreak super.servant-swagger-ui-core;
 
-  hercules-ci-agent = generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent;
+  hercules-ci-agent =
+    assert super.hercules-ci-agent.version == "0.9.5"; # >0.9.5: remove source override as sdist will be fixed
+    overrideSrc
+      { src = pkgs.fetchFromGitHub { owner = "hercules-ci"; repo = "hercules-ci-agent"; rev = "hercules-ci-agent-0.9.5"; sha256 = "sha256-7d8lf4g8CWHTzIOmma8UKvFIi1Og6RqPH9Lt+6iA4pw="; } + "/hercules-ci-agent"; }
+      (generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent);
 
   # Test suite doesn't compile with aeson 2.0
   # https://github.com/hercules-ci/hercules-ci-agent/pull/387
@@ -2351,22 +2328,16 @@ self: super: {
       "--skip" "/Data.List.UniqueUnsorted.repeatedBy,repeated,unique/repeatedBy: simple test/"
     ] ++ drv.testFlags or [];
   }) super.Unique;
+
   # https://github.com/AndrewRademacher/aeson-casing/issues/8
   aeson-casing = assert super.aeson-casing.version == "0.2.0.0"; overrideCabal (drv: {
     testFlags = [
       "-p" "! /encode train/"
     ] ++ drv.testFlags or [];
   }) super.aeson-casing;
-  # https://github.com/Soostone/katip/issues/134
-  katip = assert super.katip.version == "0.8.7.0"; overrideCabal (drv: {
-    testFlags = [
-      "-p" "!/Text-golden/&&!/respects payloadKeys for each constituent payload/"
-    ] ++ drv.testFlags or [];
-  }) super.katip;
+
   # 2020-11-19: Jailbreaking until: https://github.com/snapframework/heist/pull/124
   # 2021-12-22: https://github.com/snapframework/heist/issues/131
-
-
   heist = assert super.heist.version == "1.1.0.1";
     # aeson 2.0 compat https://github.com/snapframework/heist/pull/132
     # not merged in master yet

diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
@@ -173,7 +173,7 @@ self: super: {
   ];
 
   # lens >= 5.1 supports 9.2.1
-  lens = doDistribute self.lens_5_1;
+  lens = doDistribute self.lens_5_1_1;
 
   # Syntax error in tests fixed in https://github.com/simonmar/alex/commit/84b29475e057ef744f32a94bc0d3954b84160760
   alex = dontCheck super.alex;

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -453,7 +453,6 @@ broken-packages:
   - botpp
   - bottom
   - boundingboxes
-  - bower-json
   - bowntz
   - bpath
   - BPS
@@ -1552,7 +1551,6 @@ broken-packages:
   - fresh
   - friday-devil
   - friday-scale-dct
-  - friendly
   - frown
   - frp-arduino
   - frpnow
@@ -4903,6 +4901,7 @@ broken-packages:
   - stripeapi
   - stripe-core
   - stripe-servant
+  - strongweak
   - structural-traversal
   - structures
   - stt

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -85,6 +85,8 @@ default-package-overrides:
   - http-client-restricted < 0.0.5
   # Needs dhall 1.41.*, Stackage LTS 19 has 1.40
   - dhall-nix < 1.1.24
+  # Temporarily forbid distribution-nixpkgs updates until cabal2nix supports the new version
+  - distribution-nixpkgs < 1.7.0
 
 extra-packages:
   - aeson < 2                           # required by pantry-0.5.2
@@ -131,6 +133,7 @@ extra-packages:
   - hspec < 2.8                         # 2022-04-07: Needed for tasty-hspec 1.1.6
   - hspec-core < 2.8                    # 2022-04-07: Needed for tasty-hspec 1.1.6
   - hspec-discover < 2.8                # 2022-04-07: Needed for tasty-hspec 1.1.6
+  - bower-json == 1.0.0.1               # 2022-05-21: Needed for spago 0.20.9
 
 package-maintainers:
   abbradar: