Merge pull request #128993 from NixOS/haskell-updates

haskellPackages: update stackage and hackage

pkgs/data/misc/hackage/pin.json

@@ -1,6 +1,6 @@
 {
-  "commit": "1567e96c400fcd62dfc0d9412881591d6e1e9f22",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/1567e96c400fcd62dfc0d9412881591d6e1e9f22.tar.gz",
-  "sha256": "04z26ypfp3nip2x6gwrv5k1lmckmmi03ry3z97syc72qqj59n9hq",
-  "msg": "Update from Hackage at 2021-06-26T12:56:56Z"
+  "commit": "080786cc20b9223cc5c1dc04d3e47ce3ad0b0f36",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/080786cc20b9223cc5c1dc04d3e47ce3ad0b0f36.tar.gz",
+  "sha256": "0shv10s208nazb7q36vsx6a4sy7a14qikad4b984r9gz3j6g7l62",
+  "msg": "Update from Hackage at 2021-07-02T10:49:03Z"
 }

pkgs/development/haskell-modules/configuration-common.nix

@@ -64,7 +64,7 @@ self: super: {
       name = "git-annex-${super.git-annex.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + super.git-annex.version;
-      sha256 = "1hf2i36ayscdg7fa81akx031chg8c3scbjphj4c1qawif41bynmm";
+      sha256 = "0nvaaba06dgkl2kfq6ldmj0v6mm2dh7wfky6lsxxy5kskbncyqjr";
       # delete android and Android directories which cause issues on
       # darwin (case insensitive directory). Since we don't need them
       # during the build process, we can delete it to prevent a hash

pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml

@@ -74,6 +74,7 @@ broken-packages:
   - aeson-filthy
   - aeson-flowtyped
   - aeson-match-qq
+  - aeson-modern-tojson
   - aeson-options
   - aeson-prefix
   - aeson-schema
@@ -261,6 +262,7 @@ broken-packages:
   - aws-route53
   - aws-sdk-text-converter
   - aws-simple
+  - aws-xray-client-persistent
   - axel
   - azubi
   - azure-acs
@@ -1904,6 +1906,7 @@ broken-packages:
   - haskell-src-match
   - haskell-src-meta-mwotton
   - haskell-stack-trace-plugin
+  - haskell-to-elm
   - HaskellTorrent
   - HaskellTutorials
   - haskell-type-exts
@@ -2755,6 +2758,7 @@ broken-packages:
   - linear-maps
   - linear-opengl
   - linearscan
+  - linear-smc
   - linear-vect
   - line-drawing
   - lines-of-action
@@ -3183,6 +3187,7 @@ broken-packages:
   - nested-sequence
   - netclock
   - netease-fm
+  - net-mqtt-rpc
   - netrium
   - NetSNMP
   - netspec
@@ -4511,6 +4516,7 @@ broken-packages:
   - streaming-png
   - streaming-utils
   - streaming-with
+  - streamly-examples
   - streamly-fsnotify
   - stream-monad
   - streamproc

pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml

@@ -564,6 +564,7 @@ dont-distribute-packages:
  - bip32
  - birch-beer
  - bird
+ - biscuit-servant
  - bit-array
  - bitcoin-address
  - bitcoin-api
@@ -2344,6 +2345,7 @@ dont-distribute-packages:
  - polysemy-path
  - polysemy-plugin
  - polysemy-readline
+ - polysemy-req
  - polysemy-resume
  - polysemy-test
  - polysemy-time

pkgs/top-level/release-haskell.nix

@@ -82,7 +82,7 @@ let
   recursiveUpdateMany = builtins.foldl' lib.recursiveUpdate {};
 
   staticHaskellPackagesPlatforms =
-    packagePlatforms pkgs.pkgsStatic.haskellPackages;
+    packagePlatforms pkgs.pkgsStatic.haskell.packages.integer-simple.ghc8104;
 
   jobs = recursiveUpdateMany [
     (mapTestOn {
@@ -98,7 +98,8 @@ let
 
       # test some statically linked packages to catch regressions
       # and get some cache going for static compilation with GHC
-      pkgsStatic.haskellPackages = {
+      # Use integer-simple to avoid GMP linking problems (LGPL)
+      pkgsStatic.haskell.packages.integer-simple.ghc8104 = {
         inherit (staticHaskellPackagesPlatforms)
           hello
           random
@@ -300,12 +301,12 @@ let
         };
         constituents = [
           # TODO: reenable darwin builds if static libiconv works
-          jobs.pkgsStatic.haskellPackages.hello.x86_64-linux
-          jobs.pkgsStatic.haskellPackages.hello.aarch64-linux
-          jobs.pkgsStatic.haskellPackages.lens.x86_64-linux
-          jobs.pkgsStatic.haskellPackages.lens.aarch64-linux
-          jobs.pkgsStatic.haskellPackages.random.x86_64-linux
-          jobs.pkgsStatic.haskellPackages.random.aarch64-linux
+          jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.hello.x86_64-linux
+          jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.hello.aarch64-linux
+          jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.lens.x86_64-linux
+          jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.lens.aarch64-linux
+          jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.random.x86_64-linux
+          jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.random.aarch64-linux
         ];
       };
     }