From 5e78f55ddd848763d2df7d41f9613f72b4752e15 Mon Sep 17 00:00:00 2001
From: Dennis Gosnell <cdep.illabout@gmail.com>
Date: Tue, 30 May 2023 12:54:30 +0900
Subject: [PATCH 1/8] all-cabal-hashes: 2023-05-28T10:08:17Z ->
 2023-05-30T03:47:42Z

This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
---
 pkgs/data/misc/hackage/pin.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json
index 35cb5aeae7fe..219f89c8a216 100644
--- a/pkgs/data/misc/hackage/pin.json
+++ b/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"
 }

From 38ced599945494f021125044b216c7df2427ae4f Mon Sep 17 00:00:00 2001
From: Dennis Gosnell <cdep.illabout@gmail.com>
Date: Tue, 30 May 2023 12:55:48 +0900
Subject: [PATCH 2/8] haskellPackages: regenerate package set based on current
 config

This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
---
 .../haskell-modules/hackage-packages.nix      | 284 +++++++++++++++---
 1 file changed, 237 insertions(+), 47 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 39e763f3f19d..495149a19a26 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -14560,6 +14560,8 @@ self: {
        pname = "MuCheck";
        version = "0.3.0.4";
        sha256 = "183p3fmzz5d67g8wmzgv8c8yyhs0cp7x3xig4cm9s98nhrsm1j0r";
+       revision = "1";
+       editedCabalFile = "08h1jmsvy8kg3iq5x8hsjb734hhp9zf7fm8aj17v41gzn51icfrv";
        libraryHaskellDepends = [
          base directory hashable haskell-src-exts hint mtl random syb
          temporary time
@@ -26532,6 +26534,35 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "aeson-schemas_1_4_1_0" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, base, criterion, deepseq
+     , directory, filepath, first-class-families, hashable, interpolate
+     , megaparsec, process, QuickCheck, raw-strings-qq, tasty
+     , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell
+     , temporary, text, th-orphans, th-test-utils, unordered-containers
+     }:
+     mkDerivation {
+       pname = "aeson-schemas";
+       version = "1.4.1.0";
+       sha256 = "0l9qdzcx6fs661zn9vrkpflr5fl92s1w16nb94cabh8v1xzbagxh";
+       libraryHaskellDepends = [
+         aeson base first-class-families hashable megaparsec
+         template-haskell text unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-qq base deepseq directory filepath interpolate process
+         QuickCheck raw-strings-qq tasty tasty-golden tasty-hunit
+         tasty-quickcheck template-haskell temporary text th-orphans
+         th-test-utils
+       ];
+       benchmarkHaskellDepends = [
+         aeson base criterion deepseq template-haskell th-test-utils
+       ];
+       description = "Easily consume JSON data on-demand with type-safety";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "aeson-serialize" = callPackage
     ({ mkDerivation, aeson, base, cereal, hspec, HUnit }:
      mkDerivation {
@@ -53255,6 +53286,8 @@ self: {
        pname = "cabal-install";
        version = "3.10.1.0";
        sha256 = "13c3qx0qw7kizaj2dpgl2y3pj86pgqvmkck20w726jalamlf6pcr";
+       revision = "1";
+       editedCabalFile = "0h1ra9kw7mk70202whiphbdyvknm7jbhqhkgw4h8abb1sgffhs3n";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -75819,6 +75852,25 @@ self: {
        broken = true;
      }) {};
 
+  "data-diverse_4_7_1_0" = callPackage
+    ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim
+     , hashable, hspec, tagged
+     }:
+     mkDerivation {
+       pname = "data-diverse";
+       version = "4.7.1.0";
+       sha256 = "102d9zmbbwwav01q6190ggdiw49jkx2j0j60zslc59nqhlm2qwlq";
+       libraryHaskellDepends = [
+         base containers deepseq ghc-prim hashable tagged
+       ];
+       testHaskellDepends = [ base hspec tagged ];
+       benchmarkHaskellDepends = [ base criterion ];
+       description = "Extensible records and polymorphic variants";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "data-diverse-lens" = callPackage
     ({ mkDerivation, base, data-diverse, data-has, hspec, lens
      , profunctors, tagged
@@ -83335,8 +83387,8 @@ self: {
      }:
      mkDerivation {
        pname = "diohsc";
-       version = "0.1.12";
-       sha256 = "0zffy3m5w9cbf2ngg8zhvpz9cgdml6r7swvkf5k8grph1zifa0sj";
+       version = "0.1.13";
+       sha256 = "0fiahbzidrwqn0hfpp6v7ja98rcd5wyxk7f2vnybhg19k50k3zri";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -131463,6 +131515,29 @@ self: {
        license = lib.licenses.lgpl21Only;
      }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;};
 
+  "haskell-gi_0_26_5" = callPackage
+    ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal
+     , cabal-doctest, containers, directory, doctest, filepath, glib
+     , gobject-introspection, haskell-gi-base, mtl, pretty-show, process
+     , regex-tdfa, safe, text, transformers, xdg-basedir, xml-conduit
+     }:
+     mkDerivation {
+       pname = "haskell-gi";
+       version = "0.26.5";
+       sha256 = "1vwg0br0vrvq4blafv9j6l49x07ykg4jv9x0y11sjad7cm6s8k95";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         ansi-terminal attoparsec base bytestring Cabal containers directory
+         filepath haskell-gi-base mtl pretty-show process regex-tdfa safe
+         text transformers xdg-basedir xml-conduit
+       ];
+       libraryPkgconfigDepends = [ glib gobject-introspection ];
+       testHaskellDepends = [ base doctest process ];
+       description = "Generate Haskell bindings for GObject Introspection capable libraries";
+       license = lib.licenses.lgpl21Only;
+       hydraPlatforms = lib.platforms.none;
+     }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;};
+
   "haskell-gi-base" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib, text }:
      mkDerivation {
@@ -131475,6 +131550,19 @@ self: {
        license = lib.licenses.lgpl21Only;
      }) {inherit (pkgs) glib;};
 
+  "haskell-gi-base_0_26_4" = callPackage
+    ({ mkDerivation, base, bytestring, containers, glib, text }:
+     mkDerivation {
+       pname = "haskell-gi-base";
+       version = "0.26.4";
+       sha256 = "1c5i9nwf0ldgjyqm8qir5fs66d5pkyl9ajq77rcxy5bc7r7kbyws";
+       libraryHaskellDepends = [ base bytestring containers text ];
+       libraryPkgconfigDepends = [ glib ];
+       description = "Foundation for libraries generated by haskell-gi";
+       license = lib.licenses.lgpl21Only;
+       hydraPlatforms = lib.platforms.none;
+     }) {inherit (pkgs) glib;};
+
   "haskell-gi-overloading" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -153362,14 +153450,14 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
-  "hspec_2_11_0_1" = callPackage
+  "hspec_2_11_1" = callPackage
     ({ mkDerivation, base, hspec-core, hspec-discover
      , hspec-expectations, QuickCheck
      }:
      mkDerivation {
        pname = "hspec";
-       version = "2.11.0.1";
-       sha256 = "0sz2ishjz7fa09w2215fdxw2yj6bv1q55arr554l1jdxf6mvd7r7";
+       version = "2.11.1";
+       sha256 = "0rm2hcnhka0b8z7kdlzsd4lvk5jna29n9qfrfxzvn5a8ncj0mb71";
        libraryHaskellDepends = [
          base hspec-core hspec-discover hspec-expectations QuickCheck
        ];
@@ -153391,14 +153479,14 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
-  "hspec-api_2_11_0_1" = callPackage
+  "hspec-api_2_11_1" = callPackage
     ({ mkDerivation, base, hspec, hspec-core, hspec-discover
      , transformers
      }:
      mkDerivation {
        pname = "hspec-api";
-       version = "2.11.0.1";
-       sha256 = "0zrd2kn9qwx5cs9cbn8pz9sm8jr322jnj99lpasskpg8acby3pkk";
+       version = "2.11.1";
+       sha256 = "0jq8x5rfskb29nh1hpy9y1rc7g6nwbdba8nnri5kdc3jf3jwmnff";
        libraryHaskellDepends = [ base hspec-core transformers ];
        testHaskellDepends = [ base hspec hspec-core transformers ];
        testToolDepends = [ hspec-discover ];
@@ -153523,7 +153611,7 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
-  "hspec-core_2_11_0_1" = callPackage
+  "hspec-core_2_11_1" = callPackage
     ({ mkDerivation, ansi-terminal, array, base, base-orphans
      , call-stack, deepseq, directory, filepath, haskell-lexer
      , hspec-expectations, hspec-meta, HUnit, process, QuickCheck
@@ -153532,8 +153620,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-core";
-       version = "2.11.0.1";
-       sha256 = "03fwa0y901khi3gp45qs72f6yzxils1dwkm8hpc2znl0ndaf06hq";
+       version = "2.11.1";
+       sha256 = "1r8jnhfg6yn4spq5bml4rg47ifkq7xsk6lb1mnikly7l5x91nscl";
        libraryHaskellDepends = [
          ansi-terminal array base call-stack deepseq directory filepath
          haskell-lexer hspec-expectations HUnit process QuickCheck
@@ -153560,6 +153648,8 @@ self: {
        pname = "hspec-dirstream";
        version = "1.0.0.4";
        sha256 = "10axc2rszyqzw8zwz7zjh05m5lifmghflls1w2sbyp7vlyz13iac";
+       revision = "1";
+       editedCabalFile = "1dzfiw97z0jwl8axha8r6vzpm25x25rz181i7i3i7dm8j8kanm1d";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base dirstream filepath hspec hspec-core pipes pipes-safe
@@ -153614,14 +153704,14 @@ self: {
        maintainers = [ lib.maintainers.maralorn ];
      }) {};
 
-  "hspec-discover_2_11_0_1" = callPackage
+  "hspec-discover_2_11_1" = callPackage
     ({ mkDerivation, base, directory, filepath, hspec-meta, mockery
      , QuickCheck
      }:
      mkDerivation {
        pname = "hspec-discover";
-       version = "2.11.0.1";
-       sha256 = "18acqmw3zgkn718vgjiskx266ids4pp4mamb4gxlhj2934vfl656";
+       version = "2.11.1";
+       sha256 = "15jcz0dldq9jjzciv7vwnlxw9h7vbglvcgq90zwb50lpj1d9l916";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath ];
@@ -153649,6 +153739,19 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "hspec-expectations_0_8_3" = callPackage
+    ({ mkDerivation, base, call-stack, HUnit, nanospec }:
+     mkDerivation {
+       pname = "hspec-expectations";
+       version = "0.8.3";
+       sha256 = "0wi1s0byfrlay98w1w38lj0mi0ifqzhvkl05q5dv5yr1wl50mgvi";
+       libraryHaskellDepends = [ base call-stack HUnit ];
+       testHaskellDepends = [ base call-stack HUnit nanospec ];
+       description = "Catchy combinators for HUnit";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "hspec-expectations-json" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, aeson-qq, base, Diff, hspec
      , HUnit, scientific, text, unordered-containers, vector
@@ -157502,6 +157605,33 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "httpstan" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+     , case-insensitive, containers, deepseq, exceptions, hspec
+     , http-api-data, http-client, http-client-tls, http-media
+     , http-types, iso8601-time, katip, microlens, mtl, network
+     , QuickCheck, random, safe-exceptions, semigroups, text, time
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "httpstan";
+       version = "0.2.0.0";
+       sha256 = "08wpigjaqjdbml7bp4rpikldzv7qkkzbxlmngp9p99zxr75d86vf";
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring case-insensitive containers
+         deepseq exceptions http-api-data http-client http-client-tls
+         http-media http-types iso8601-time katip microlens mtl network
+         random safe-exceptions text time transformers unordered-containers
+         vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers hspec iso8601-time mtl QuickCheck
+         semigroups text time transformers unordered-containers vector
+       ];
+       description = "Auto-generated httpstan API Client";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "htune" = callPackage
     ({ mkDerivation, alsa-pcm, base, carray, fft, gloss }:
      mkDerivation {
@@ -171533,20 +171663,19 @@ self: {
      }) {};
 
   "juicy-gcode" = callPackage
-    ({ mkDerivation, base, configurator, gitrev, lens, linear, matrix
-     , optparse-applicative, svg-tree, text
+    ({ mkDerivation, aeson, base, gitrev, JuicyPixels, lens, linear
+     , matrix, optparse-applicative, svg-tree, text
+     , unordered-containers, yaml
      }:
      mkDerivation {
        pname = "juicy-gcode";
-       version = "0.3.0.0";
-       sha256 = "0j2q76fwx93az2yk0pnmzl82npl0305ks2ia7gbxi7k9jwdzbp0i";
-       revision = "1";
-       editedCabalFile = "1n7hnbsiag3zzm8qbqz002g7iz074g8fifiq6inzny3y8n8x1fcy";
+       version = "1.0.0.0";
+       sha256 = "1m8mqszid40fhspm8hk8zhvrx2sp7ikfvvh46z8kfbhpgqbfq1jv";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base configurator gitrev lens linear matrix optparse-applicative
-         svg-tree text
+         aeson base gitrev JuicyPixels lens linear matrix
+         optparse-applicative svg-tree text unordered-containers yaml
        ];
        description = "SVG to G-Code converter";
        license = lib.licenses.bsd3;
@@ -187715,6 +187844,8 @@ self: {
        pname = "lucid2";
        version = "0.0.20221012";
        sha256 = "00r3qmxrs3jh3v4gl5m38j86ihh78q4vmsk4bz2pbcc8gh2yficj";
+       revision = "1";
+       editedCabalFile = "029vhllgcdayrk34dssqirf1xpsr7z9jmi1lrh7qg2m061ypipxf";
        libraryHaskellDepends = [
          base blaze-builder bytestring containers mtl text transformers
        ];
@@ -206886,6 +207017,18 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "network-run_0_2_5" = callPackage
+    ({ mkDerivation, base, bytestring, network }:
+     mkDerivation {
+       pname = "network-run";
+       version = "0.2.5";
+       sha256 = "08662w7ja9w4a4fwikaawxnxcszkd0mdmaajmshas2dd25xyikwi";
+       libraryHaskellDepends = [ base bytestring network ];
+       description = "Simple network runner library";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "network-server" = callPackage
     ({ mkDerivation, base, network, unix }:
      mkDerivation {
@@ -214825,17 +214968,17 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
-  "optparse-applicative_0_18_0_0" = callPackage
+  "optparse-applicative_0_18_1_0" = callPackage
     ({ mkDerivation, base, prettyprinter, prettyprinter-ansi-terminal
-     , process, QuickCheck, transformers, transformers-compat
+     , process, QuickCheck, text, transformers, transformers-compat
      }:
      mkDerivation {
        pname = "optparse-applicative";
-       version = "0.18.0.0";
-       sha256 = "1ixmjb32b41d7iz87m6bjhf9a2y0k0zj5kv84qkcgmivcqd0n3fj";
+       version = "0.18.1.0";
+       sha256 = "14f4xihvklrdbc0banwzh5wwqfmyi1d34r43hsw2ks16zns1m0b3";
        libraryHaskellDepends = [
-         base prettyprinter prettyprinter-ansi-terminal process transformers
-         transformers-compat
+         base prettyprinter prettyprinter-ansi-terminal process text
+         transformers transformers-compat
        ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Utilities and combinators for parsing command line options";
@@ -235804,8 +235947,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "5.15";
-       sha256 = "0106ayiadnam0mz1836la0fya4s82cv591r3vc6cdyafzpjzjphk";
+       version = "5.16";
+       sha256 = "12ywc4riq4wr1ylm4gqp4fcszssfz1a6n1xa5da0mwxydklmw6l1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -243073,8 +243216,8 @@ self: {
      }:
      mkDerivation {
        pname = "reactive-banana-automation";
-       version = "0.5.5";
-       sha256 = "13vpmyn68ad1g9885aj6dvgyn07f5blr91k4c3gf77ymlwj1a1zn";
+       version = "0.5.6";
+       sha256 = "161blkyhkff3z0blbrmrwmclhac481njn9ikb3x4ax0yfa1lpsvq";
        libraryHaskellDepends = [
          base reactive-banana stm time transformers
        ];
@@ -248354,6 +248497,23 @@ self: {
        license = lib.licenses.bsd2;
      }) {};
 
+  "replace-attoparsec_1_5_0_0" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, hspec, HUnit
+     , parsers, text
+     }:
+     mkDerivation {
+       pname = "replace-attoparsec";
+       version = "1.5.0.0";
+       sha256 = "1pv24qlng92ywy6xpprvn3yzcndngww4ki6nih4vpd4hzsp534zl";
+       libraryHaskellDepends = [ attoparsec base bytestring text ];
+       testHaskellDepends = [
+         attoparsec base bytestring hspec HUnit parsers text
+       ];
+       description = "Find, replace, split string patterns with Attoparsec parsers (instead of regex)";
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "replace-megaparsec" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, megaparsec
      , parser-combinators, text
@@ -248371,6 +248531,24 @@ self: {
        maintainers = [ lib.maintainers.maralorn ];
      }) {};
 
+  "replace-megaparsec_1_5_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, megaparsec
+     , parser-combinators, text
+     }:
+     mkDerivation {
+       pname = "replace-megaparsec";
+       version = "1.5.0.1";
+       sha256 = "134ns97fhsg0a0jn5pjfnbv9jj40p0ljinx7y572gaw0lpfwc4x1";
+       libraryHaskellDepends = [
+         base bytestring megaparsec parser-combinators text
+       ];
+       testHaskellDepends = [ base bytestring hspec megaparsec text ];
+       description = "Find, replace, split string patterns with Megaparsec parsers (instead of regex)";
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
+       maintainers = [ lib.maintainers.maralorn ];
+     }) {};
+
   "replica" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, Diff
      , file-embed, http-types, QuickCheck, quickcheck-instances
@@ -255157,15 +255335,15 @@ self: {
      }:
      mkDerivation {
        pname = "sasha";
-       version = "0.1";
-       sha256 = "08975i8qayq2ybsk13wkz930f66j5r00l0j924lzs6bs05min81j";
+       version = "0.2";
+       sha256 = "1z99hdbn94ngfinijgsd5x4lllwpyxc8jkf67lk0f6p12jfq7qv0";
        libraryHaskellDepends = [
          base bytestring containers lattices QuickCheck template-haskell
          th-letrec wide-word word8set
        ];
        testHaskellDepends = [
          aeson array base bytestring deepseq lattices tasty tasty-bench
-         tasty-hunit tasty-quickcheck text
+         tasty-hunit tasty-quickcheck template-haskell text
        ];
        testToolDepends = [ alex ];
        description = "A staged lexer generator";
@@ -255482,7 +255660,7 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
-  "sbp_4_14_0" = callPackage
+  "sbp_4_15_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, array, base
      , base64-bytestring, basic-prelude, binary, binary-conduit
      , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754
@@ -255491,8 +255669,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbp";
-       version = "4.14.0";
-       sha256 = "1ycz6yqab4l9idsr2ks5mwa9mnbvq9vsjyki4lnxaxqg83f8a0lm";
+       version = "4.15.0";
+       sha256 = "1x8gqrrds6ci2s33vrrmw5ndzj22k271zd0wsbvfqg7wpz8ry37f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -266790,6 +266968,18 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "simple-prompt_0_2_0_1" = callPackage
+    ({ mkDerivation, base, exceptions, extra, haskeline, time }:
+     mkDerivation {
+       pname = "simple-prompt";
+       version = "0.2.0.1";
+       sha256 = "1bmq1x7raibnlqkjay3gnvsqiiggv2n911vk02z1glly90b5yg21";
+       libraryHaskellDepends = [ base exceptions extra haskeline time ];
+       description = "Simple commandline text prompt functions";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "simple-reflect" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -279758,8 +279948,8 @@ self: {
     ({ mkDerivation, array, base, io-classes, stm }:
      mkDerivation {
        pname = "strict-stm";
-       version = "1.1.0.0";
-       sha256 = "15yq90fa5i0v3mgrb7yhc6c753ypzpw08lh0ramx38kpv7l1gxvx";
+       version = "1.1.0.1";
+       sha256 = "01lw137aarcwbr5vgrkjrfh1kp9bn7ql31xw9ivw9nwfdhjblz04";
        libraryHaskellDepends = [ array base io-classes stm ];
        description = "Strict STM interface polymorphic over stm implementation";
        license = lib.licenses.asl20;
@@ -289577,8 +289767,8 @@ self: {
      }:
      mkDerivation {
        pname = "terraform-http-backend-pass";
-       version = "0.1.0.0";
-       sha256 = "0cw9vzj5kigz84r2nwxmvva5fmn9r6y78g40icwi1yaby9g9s809";
+       version = "0.1.0.1";
+       sha256 = "0jxgp63b6bwa0402p03inj6sr0slm8ynhf0vin8nq346z7296aij";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -292285,8 +292475,8 @@ self: {
        pname = "th-test-utils";
        version = "1.2.1";
        sha256 = "1vk5fj66w7smq4yc614ixh7s78n3djggpzcxmakyxfz01vz20gay";
-       revision = "1";
-       editedCabalFile = "0v8z6pzvbbxywafgmkhkrv5s3cskc1ilabwsbg1ga2hvimm4hgi9";
+       revision = "2";
+       editedCabalFile = "0sjxy0v6g567n0vs8myi3vx0hbhhmd8k3jgjwsmp7zrvhzbfyw91";
        libraryHaskellDepends = [
          base template-haskell th-orphans transformers
        ];
@@ -299356,11 +299546,11 @@ self: {
     ({ mkDerivation, base, ghc-prim, hspec, template-haskell }:
      mkDerivation {
        pname = "tuple-append";
-       version = "0.2.0.0";
-       sha256 = "18516636w3bgwvymdbzw1971fhja7lrpwx78nz5n67qq23il7rrq";
+       version = "0.3.0.0";
+       sha256 = "1zg2l5is9329b47cbkkkipgy2xnrpjwvh8mf65jrr2h8mc3bka6h";
        libraryHaskellDepends = [ base ghc-prim template-haskell ];
        testHaskellDepends = [ base ghc-prim hspec ];
-       description = "A package to append items and tuples into new tuples";
+       description = "A package to append, sequence and fold items and tuples into new tuples";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
        broken = true;

From ec0c8471022d591f88a46bca9046ea0ba317ea09 Mon Sep 17 00:00:00 2001
From: Ellie Hermaszewska <git@monoid.al>
Date: Tue, 30 May 2023 15:47:21 +0800
Subject: [PATCH 3/8] haskellPackages.hspec*: 2_11_0_1 -> 2_11_1

---
 .../haskell-modules/configuration-common.nix  | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index f624348c661d..f2b2f7377024 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/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.
@@ -969,12 +969,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 +1641,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

From a83735c6a2da97c2376bc1cdc4f0ac60af81f2c7 Mon Sep 17 00:00:00 2001
From: ners <ners@gmx.ch>
Date: Fri, 26 May 2023 09:47:26 +0200
Subject: [PATCH 4/8] haskell.compiler.ghc962: init at 9.6.2

https://www.haskell.org/ghc/blog/20230523-ghc-9.6.2-released.html
---
 pkgs/development/compilers/ghc/9.6.2.nix |  4 ++++
 pkgs/top-level/haskell-packages.nix      | 27 ++++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/compilers/ghc/9.6.2.nix

diff --git a/pkgs/development/compilers/ghc/9.6.2.nix b/pkgs/development/compilers/ghc/9.6.2.nix
new file mode 100644
index 000000000000..a0f764d016b5
--- /dev/null
+++ b/pkgs/development/compilers/ghc/9.6.2.nix
@@ -0,0 +1,4 @@
+import ./common-hadrian.nix rec {
+  version = "9.6.2";
+  sha256 = "1b510c5f8753c3ba24851702c6c9da7d81dc5e47fe3ecb7af39c7c2613abf170";
+}
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 86da7a6bbc9f..95362f845287 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -29,6 +29,7 @@ let
     "ghc94"
     "ghc96"
     "ghc961"
+    "ghc962"
     "ghcHEAD"
   ];
 
@@ -48,6 +49,7 @@ let
     "ghc945"
     "ghc96"
     "ghc961"
+    "ghc962"
     "ghcHEAD"
   ];
 
@@ -368,6 +370,26 @@ in {
       buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_14;
       llvmPackages = pkgs.llvmPackages_14;
     };
+    ghc962 = callPackage ../development/compilers/ghc/9.6.2.nix {
+      bootPkgs =
+        # For GHC 9.2 no armv7l bindists are available.
+        if stdenv.hostPlatform.isAarch32 then
+          packages.ghc924
+        else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then
+          packages.ghc924
+        else if stdenv.isAarch64 then
+          packages.ghc924BinaryMinimal
+        else
+          packages.ghc924Binary;
+      inherit (buildPackages.python3Packages) sphinx;
+      # Need to use apple's patched xattr until
+      # https://github.com/xattr/xattr/issues/44 and
+      # https://github.com/xattr/xattr/issues/55 are solved.
+      inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
+      # Support range >= 11 && < 16
+      buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;
+      llvmPackages = pkgs.llvmPackages_15;
+    };
     ghc96 = ghc961;
     ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
       bootPkgs =
@@ -536,6 +558,11 @@ in {
       ghc = bh.compiler.ghc961;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { };
     };
+    ghc962 = callPackage ../development/haskell-modules {
+      buildHaskellPackages = bh.packages.ghc962;
+      ghc = bh.compiler.ghc962;
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { };
+    };
     ghc96 = ghc961;
     ghcHEAD = callPackage ../development/haskell-modules {
       buildHaskellPackages = bh.packages.ghcHEAD;

From b6813c0b0c827ca0d25a1c725c79d0a54235074e Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Tue, 30 May 2023 13:36:07 +0200
Subject: [PATCH 5/8] haskellPackages.thyme: drop stale override

https://github.com/haskell-github-trust/thyme/issues/36 has been fixed
quite a while ago.
---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index f2b2f7377024..652c8ede6aab 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -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;

From 9d886b026546ede5ff40c6e09d2f6161c8fb1269 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Tue, 30 May 2023 13:42:03 +0200
Subject: [PATCH 6/8] haskell.compiler.ghc96: 9.6.1 -> 9.6.2

---
 pkgs/top-level/haskell-packages.nix | 4 ++--
 pkgs/top-level/release-haskell.nix  | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 95362f845287..6001039689c4 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -390,7 +390,7 @@ in {
       buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;
       llvmPackages = pkgs.llvmPackages_15;
     };
-    ghc96 = ghc961;
+    ghc96 = ghc962;
     ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
       bootPkgs =
         # For GHC 9.2 no armv7l bindists are available.
@@ -563,7 +563,7 @@ in {
       ghc = bh.compiler.ghc962;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { };
     };
-    ghc96 = ghc961;
+    ghc96 = ghc962;
     ghcHEAD = callPackage ../development/haskell-modules {
       buildHaskellPackages = bh.packages.ghcHEAD;
       ghc = bh.compiler.ghcHEAD;
diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index 5a16c97f7c50..09087a3c73e1 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -70,6 +70,7 @@ let
     ghc928
     ghc945
     ghc961
+    ghc962
   ];
 
   # packagePlatforms applied to `haskell.packages.*`
@@ -487,12 +488,15 @@ let
       Cabal-syntax_3_10_1_0 = released;
       cabal2nix = lib.subtractLists [
         compilerNames.ghc961
+        compilerNames.ghc962
       ] released;
       cabal2nix-unstable = lib.subtractLists [
         compilerNames.ghc961
+        compilerNames.ghc962
       ] released;
       funcmp = lib.subtractLists [
         compilerNames.ghc961
+        compilerNames.ghc962
       ] released;
       haskell-language-server = lib.subtractLists [
         # Support ceased as of 1.9.0.0
@@ -500,17 +504,21 @@ let
       ] released;
       hoogle = lib.subtractLists [
         compilerNames.ghc961
+        compilerNames.ghc962
       ] released;
       hlint = lib.subtractLists [
         compilerNames.ghc961
+        compilerNames.ghc962
       ] released;
       hpack = lib.subtractLists [
         compilerNames.ghc961
+        compilerNames.ghc962
       ] released;
       hsdns = released;
       jailbreak-cabal = released;
       language-nix = lib.subtractLists [
         compilerNames.ghc961
+        compilerNames.ghc962
       ] released;
       nix-paths = released;
       titlecase = released;

From 7041bc7a1fef67cadafda2dcec55d79708310002 Mon Sep 17 00:00:00 2001
From: Ellie Hermaszewska <git@monoid.al>
Date: Wed, 31 May 2023 08:25:17 +0800
Subject: [PATCH 7/8] haskellPackages.streamly-0.9.0: Add required framework on
 Darwin

---
 pkgs/development/haskell-modules/configuration-darwin.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix
index a5bac147d148..b800debe15ee 100644
--- a/pkgs/development/haskell-modules/configuration-darwin.nix
+++ b/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

From c400efcf3f7d84bf191ac5affb4b45fdc173a37f Mon Sep 17 00:00:00 2001
From: Ellie Hermaszewska <git@monoid.al>
Date: Wed, 31 May 2023 14:50:27 +0800
Subject: [PATCH 8/8] haskellPackages: mark builds failing on hydra as broken

This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on
*evaluation [1795767](https://hydra.nixos.org/eval/1795767) of nixpkgs commit [7041bc7](https://github.com/NixOS/nixpkgs/commits/7041bc7a1fef67cadafda2dcec55d79708310002) as of 2023-05-31 06:47 UTC*
from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates
---
 .../haskell-modules/configuration-hackage2nix/broken.yaml       | 1 +
 pkgs/development/haskell-modules/hackage-packages.nix           | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index c1e391aea738..62eb388064b3 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/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
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 495149a19a26..9f4e09bae16e 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -157630,6 +157630,8 @@ self: {
        ];
        description = "Auto-generated httpstan API Client";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "htune" = callPackage