haskellPackages: update stackage and hackage

pkgs/data/misc/hackage/pin.json

@@ -1,6 +1,6 @@
 {
-  "commit": "149e34766e4b393af8f4b1e02b3a8cb341d22151",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/149e34766e4b393af8f4b1e02b3a8cb341d22151.tar.gz",
-  "sha256": "09acrzaqr05hbhdj2d0i5yj8j321fi7qcxfmpgws25bz9l07qand",
-  "msg": "Update from Hackage at 2023-05-28T10:08:17Z"
+  "commit": "ef5d0a2b18aa5fb9d03c1a0cadf1e90791b81f99",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/ef5d0a2b18aa5fb9d03c1a0cadf1e90791b81f99.tar.gz",
+  "sha256": "034hmgc16mn9ly7pc6d67ksv9qdpmrv7va8jwpnjsd2mf1fc9gwz",
+  "msg": "Update from Hackage at 2023-05-30T03:47:42Z"
 }

pkgs/development/compilers/ghc/9.6.2.nix

@@ -0,0 +1,4 @@
+import ./common-hadrian.nix rec {
+  version = "9.6.2";
+  sha256 = "1b510c5f8753c3ba24851702c6c9da7d81dc5e47fe3ecb7af39c7c2613abf170";
+}

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

@@ -61,15 +61,15 @@ self: super: {
           # not solvable short of recompiling GHC. Instead of adding
           # allowInconsistentDependencies for all reverse dependencies of hspec-core,
           # just upgrade to an hspec version without the offending dependency.
-          hspec-core = cself.hspec-core_2_11_0_1;
-          hspec-discover = cself.hspec-discover_2_11_0_1;
-          hspec = cself.hspec_2_11_0_1;
+          hspec-core = cself.hspec-core_2_11_1;
+          hspec-discover = cself.hspec-discover_2_11_1;
+          hspec = cself.hspec_2_11_1;
 
           # hspec-discover and hspec-core depend on hspec-meta for testing which
-          # we need to avoid since it depends on ghc as well. Since hspec*_2_10*
+          # we need to avoid since it depends on ghc as well. Since hspec*_2_11*
           # are overridden to take the versioned attributes as inputs, we need
           # to make sure to override the versioned attribute with this fix.
-          hspec-discover_2_11_0_1 = dontCheck csuper.hspec-discover_2_11_0_1;
+          hspec-discover_2_11_1 = dontCheck csuper.hspec-discover_2_11_1;
 
           # Prevent dependency on doctest which causes an inconsistent dependency
           # due to depending on ghc which depends on directory etc.
@@ -725,9 +725,6 @@ self: super: {
   # vector dependency < 0.12
   imagemagick = doJailbreak super.imagemagick;
 
-  # https://github.com/liyang/thyme/issues/36
-  thyme = dontCheck super.thyme;
-
   # Elm is no longer actively maintained on Hackage: https://github.com/NixOS/nixpkgs/pull/9233.
   Elm = markBroken super.Elm;
   elm-build-lib = markBroken super.elm-build-lib;
@@ -969,12 +966,12 @@ self: super: {
     testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_10_5 ];
     testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ];
   }) (super.sensei.override {
-    hspec = self.hspec_2_11_0_1;
+    hspec = self.hspec_2_11_1;
     hspec-wai = self.hspec-wai.override {
-      hspec = self.hspec_2_11_0_1;
+      hspec = self.hspec_2_11_1;
     };
     hspec-contrib = self.hspec-contrib.override {
-      hspec-core = self.hspec-core_2_11_0_1;
+      hspec-core = self.hspec-core_2_11_1;
     };
     fsnotify = self.fsnotify_0_4_1_0;
   });
@@ -1641,18 +1638,19 @@ self: super: {
   # https://github.com/biocad/servant-openapi3/issues/30
   servant-openapi3 = dontCheck super.servant-openapi3;
 
-  # Give hspec 2.10.* correct dependency versions without overrideScope
-  hspec_2_11_0_1 = doDistribute (super.hspec_2_11_0_1.override {
-    hspec-discover = self.hspec-discover_2_11_0_1;
-    hspec-core = self.hspec-core_2_11_0_1;
+  # Give latest hspec correct dependency versions without overrideScope
+  hspec_2_11_1 = doDistribute (super.hspec_2_11_1.override {
+    hspec-discover = self.hspec-discover_2_11_1;
+    hspec-core = self.hspec-core_2_11_1;
   });
-  hspec-discover_2_11_0_1 = doDistribute (super.hspec-discover_2_11_0_1.override {
+  hspec-discover_2_11_1 = doDistribute (super.hspec-discover_2_11_1.override {
     hspec-meta = self.hspec-meta_2_10_5;
   });
-  # Need to disable tests to prevent an infinite recursion if hspec-core_2_11_0_1
+  # Need to disable tests to prevent an infinite recursion if hspec-core_2_11_1
   # is overlayed to hspec-core.
-  hspec-core_2_11_0_1 = doDistribute (dontCheck (super.hspec-core_2_11_0_1.override {
+  hspec-core_2_11_1 = doDistribute (dontCheck (super.hspec-core_2_11_1.override {
     hspec-meta = self.hspec-meta_2_10_5;
+    hspec-expectations = self.hspec-expectations_0_8_3;
   }));
 
   # Point hspec 2.7.10 to correct dependencies

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

@@ -35,6 +35,7 @@ self: super: ({
   double-conversion = addExtraLibrary pkgs.libcxx super.double-conversion;
 
   streamly = addBuildDepend darwin.apple_sdk.frameworks.Cocoa super.streamly;
+  streamly_0_9_0 = addBuildDepend darwin.apple_sdk.frameworks.Cocoa super.streamly_0_9_0;
 
   apecs-physics = addPkgconfigDepends [
     darwin.apple_sdk.frameworks.ApplicationServices

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

@@ -2607,6 +2607,7 @@ broken-packages:
   - http-rfc7807
   - http-server
   - http-shed
+  - httpstan # dependency missing in job https://hydra.nixos.org/build/221916023 at 2023-05-31
   - http-wget
   - htune
   - htvm