From cd13a2074b6c8c909b1f73cc641e2481d921db02 Mon Sep 17 00:00:00 2001
From: Michael Livshin <repo@cmm.kakpryg.net>
Date: Fri, 24 Jun 2022 20:43:40 +0300
Subject: [PATCH 01/22] nixos/network-interfaces-scripted: don't bindTo absent
 network-setup.service

---
 nixos/modules/tasks/network-interfaces-scripted.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index dce72b36fc50..f44dafc9706a 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -85,12 +85,14 @@ let
         hasDefaultGatewaySet = (cfg.defaultGateway != null && cfg.defaultGateway.address != "")
                             || (cfg.enableIPv6 && cfg.defaultGateway6 != null && cfg.defaultGateway6.address != "");
 
-        networkLocalCommands = {
+        needNetworkSetup = cfg.resolvconf.enable || cfg.defaultGateway != null || cfg.defaultGateway6 != null;
+
+        networkLocalCommands = lib.mkIf needNetworkSetup {
           after = [ "network-setup.service" ];
           bindsTo = [ "network-setup.service" ];
         };
 
-        networkSetup = lib.mkIf (config.networking.resolvconf.enable || cfg.defaultGateway != null || cfg.defaultGateway6 != null)
+        networkSetup = lib.mkIf needNetworkSetup
           { description = "Networking Setup";
 
             after = [ "network-pre.target" "systemd-udevd.service" "systemd-sysctl.service" ];

From 096ea49aa8b463cc444c56dbac2ad292fe263acf Mon Sep 17 00:00:00 2001
From: Artur Cygan <arczicygan@gmail.com>
Date: Sun, 10 Jul 2022 04:01:27 +0200
Subject: [PATCH 02/22] haskellPackages.clash-prelude: fix build by disabling
 tests

---
 pkgs/development/haskell-modules/configuration-common.nix      | 3 +++
 .../configuration-hackage2nix/transitive-broken.yaml           | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index cbb6abe9daa8..852dec373e3f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -2614,4 +2614,7 @@ in {
   purescript-ast = purescriptStOverride super.purescript-ast;
 
   purenix = purescriptStOverride super.purenix;
+
+  # tests use doctest-parallel which produces some errors during testing
+  clash-prelude = dontCheck super.clash-prelude;
 })
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
index a68cf2b513a3..de787ebbcd2d 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@@ -957,8 +957,6 @@ dont-distribute-packages:
  - clash-lib
  - clash-lib-hedgehog
  - clash-multisignal
- - clash-prelude
- - clash-prelude-hedgehog
  - clash-prelude-quickcheck
  - clash-shake
  - clash-systemverilog

From f498e6f4b5477df4cfdfc10e3c7e89a3b3f1ccc1 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Sun, 17 Jul 2022 11:00:54 +0200
Subject: [PATCH 03/22] all-cabal-hashes: 2022-07-12T21:40:07Z ->
 2022-07-17T05:56:49Z

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 4bd6c541ea26..758f0cbec590 100644
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@@ -1,6 +1,6 @@
 {
-  "commit": "0b418fc93e5dd9f19c4ca625c57e2cf984267e90",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0b418fc93e5dd9f19c4ca625c57e2cf984267e90.tar.gz",
-  "sha256": "0rvx383fyl39spw0qr7a1rpqnyzfsjykakia4y2z3658aw4k72cx",
-  "msg": "Update from Hackage at 2022-07-12T21:40:07Z"
+  "commit": "ed7ce097be7422b359f02c2dc7e829abbdb9a6e8",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/ed7ce097be7422b359f02c2dc7e829abbdb9a6e8.tar.gz",
+  "sha256": "09sz6m2mhb16n5xrp6k96ng2mjb1zsnpw0qxdlbgca1l8ad1pdha",
+  "msg": "Update from Hackage at 2022-07-17T05:56:49Z"
 }

From 42343a63f48f4658e2bdd1dde75c43b01d67bc74 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Sun, 17 Jul 2022 11:02:04 +0200
Subject: [PATCH 04/22] 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      | 769 +++++++++++++++---
 1 file changed, 635 insertions(+), 134 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 40299e1a230a..13221f938f8a 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -10145,8 +10145,8 @@ self: {
      }:
      mkDerivation {
        pname = "HangmanAscii";
-       version = "0.1.0.2";
-       sha256 = "103f603vfri1ilhga7h2gwbzp4iyb59hzpdxgmfa1j4x7hq1myv6";
+       version = "0.1.1.1";
+       sha256 = "1yhpblx3q4pkngzb030va0k3ncydbc6c5d8b71llghzv5w9pj3cq";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -21621,8 +21621,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "WeakSets";
-       version = "0.1.0.0";
-       sha256 = "1qlvlwwif93lm3q072lmp9gs6zp2zy1rsl76d51s7mbvxr9lyrq8";
+       version = "0.4.0.0";
+       sha256 = "0nldjwm25kc7l0vfbh89qgxhd87273982g7d38qad67av6wgjghw";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Simple set types. Useful to create sets of arbitrary types and nested sets.";
@@ -24991,6 +24991,43 @@ self: {
        broken = true;
      }) {};
 
+  "aern2-fun" = callPackage
+    ({ mkDerivation, aern2-mp, aern2-real, base, collect-errors
+     , containers, hspec, mixed-types-num, psqueues, QuickCheck
+     }:
+     mkDerivation {
+       pname = "aern2-fun";
+       version = "0.2.9.0";
+       sha256 = "06smjpim77lfvqls36pdph0ysr04f3w8kc2h19766b2y3b71f3vr";
+       libraryHaskellDepends = [
+         aern2-mp aern2-real base collect-errors containers hspec
+         mixed-types-num psqueues QuickCheck
+       ];
+       description = "Generic operations for real functions";
+       license = lib.licenses.bsd3;
+     }) {};
+
+  "aern2-mfun" = callPackage
+    ({ mkDerivation, aern2-fun, aern2-mp, base, collect-errors
+     , mixed-types-num, vector
+     }:
+     mkDerivation {
+       pname = "aern2-mfun";
+       version = "0.2.9.0";
+       sha256 = "1da7zjr609kbh3rjccigqf8idrdxc079sk6wndaf6aa3p37zsc3n";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aern2-fun aern2-mp base collect-errors mixed-types-num vector
+       ];
+       executableHaskellDepends = [
+         aern2-fun aern2-mp base collect-errors mixed-types-num vector
+       ];
+       description = "Multi-variate real function optimisation and proving";
+       license = lib.licenses.bsd3;
+       mainProgram = "aern2-mfun-benchmark-optimisation";
+     }) {};
+
   "aern2-mp" = callPackage
     ({ mkDerivation, base, cdar-mBound, collect-errors, deepseq, hspec
      , integer-logarithms, mixed-types-num, QuickCheck, reflection
@@ -25012,6 +25049,28 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "aern2-mp_0_2_9_1" = callPackage
+    ({ mkDerivation, base, cdar-mBound, collect-errors, deepseq, hspec
+     , integer-logarithms, mixed-types-num, QuickCheck, reflection
+     , regex-tdfa, template-haskell
+     }:
+     mkDerivation {
+       pname = "aern2-mp";
+       version = "0.2.9.1";
+       sha256 = "0fygbfrww0qjjjfj21crkv5najrnk57qizfh8q43s4z1szad9lk1";
+       libraryHaskellDepends = [
+         base cdar-mBound collect-errors deepseq hspec integer-logarithms
+         mixed-types-num QuickCheck reflection regex-tdfa template-haskell
+       ];
+       testHaskellDepends = [
+         base cdar-mBound collect-errors deepseq hspec integer-logarithms
+         mixed-types-num QuickCheck reflection regex-tdfa template-haskell
+       ];
+       description = "Multi-precision ball (interval) arithmetic";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "aern2-real" = callPackage
     ({ mkDerivation, aern2-mp, base, collect-errors, hspec
      , integer-logarithms, mixed-types-num, QuickCheck
@@ -25032,6 +25091,27 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "aern2-real_0_2_9_1" = callPackage
+    ({ mkDerivation, aern2-mp, base, collect-errors, hspec
+     , integer-logarithms, mixed-types-num, QuickCheck
+     }:
+     mkDerivation {
+       pname = "aern2-real";
+       version = "0.2.9.1";
+       sha256 = "09h1x62jz30spfbshriznb9nczxiigd6nhs8n2xgnsjbdrspy45q";
+       libraryHaskellDepends = [
+         aern2-mp base collect-errors hspec integer-logarithms
+         mixed-types-num QuickCheck
+       ];
+       testHaskellDepends = [
+         aern2-mp base collect-errors hspec integer-logarithms
+         mixed-types-num QuickCheck
+       ];
+       description = "Real numbers as convergent sequences of intervals";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "aeson_1_5_6_0" = callPackage
     ({ mkDerivation, attoparsec, base, base-compat
      , base-compat-batteries, base-orphans, base16-bytestring
@@ -33867,8 +33947,8 @@ self: {
      }:
      mkDerivation {
        pname = "arduino-copilot";
-       version = "1.7.1";
-       sha256 = "1w42y0avx032i7s208p1rkc24c7hy7lbjia5qjgixzv8qcc0693b";
+       version = "1.7.2";
+       sha256 = "13lhjqz6yngmw4vhvsmk3rx0r37pz3y3qwy6zm5q551w31r3nhr7";
        libraryHaskellDepends = [
          base containers copilot copilot-c99 copilot-language directory
          filepath mtl optparse-applicative sketch-frp-copilot temporary
@@ -37274,8 +37354,8 @@ self: {
      }:
      mkDerivation {
        pname = "autodocodec";
-       version = "0.1.0.2";
-       sha256 = "05sx66bdk6l2p26cvh24ynak4gp2dr8xdiw78jxbvgknsvrjkgf6";
+       version = "0.1.0.3";
+       sha256 = "1vj4klvkzh0ahvpwjgcsvxmcgnbcy0z06fpjbgpl0g9g54pv8fhj";
        libraryHaskellDepends = [
          aeson base bytestring containers hashable mtl scientific text time
          unordered-containers validity validity-scientific vector
@@ -49808,6 +49888,8 @@ self: {
        pname = "bytehash";
        version = "0.1.0.0";
        sha256 = "1jc8fz8rv7072is0srcp730ff37xkb68xl6s6yssba4anxc8s5nm";
+       revision = "1";
+       editedCabalFile = "0wipnznxav1c0pfjv4r6nb44gidz9c6z8qi919yzg2xmwhdz631v";
        libraryHaskellDepends = [
          base byte-order byteslice bytestring entropy primitive
          primitive-unlifted transformers
@@ -49853,27 +49935,32 @@ self: {
      }) {};
 
   "bytepatch" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, either, generic-optics
-     , hspec, hspec-discover, megaparsec, mtl, optics
-     , optparse-applicative, QuickCheck, text, vinyl, yaml
+    ({ mkDerivation, aeson, base, binrep, blake3, bytestring, either
+     , generic-optics, heystone, hspec, hspec-discover, megaparsec
+     , memory, mtl, optics, optparse-applicative, QuickCheck, refined
+     , singletons, singletons-base, singletons-th, text, text-short
+     , vinyl, yaml
      }:
      mkDerivation {
        pname = "bytepatch";
-       version = "0.3.1";
-       sha256 = "0qfiai8kfrvrxv3s2p9ik3f9mxyyn2k5743agvhinfpjb6bl1pi6";
+       version = "0.4.0";
+       sha256 = "0algbhwzkhj5l98djzhy6ayd4wpldxv75zvqhpp6ckm94ryvb4v9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring either generic-optics megaparsec mtl optics
-         text vinyl
+         aeson base binrep blake3 bytestring either generic-optics heystone
+         megaparsec memory mtl optics singletons singletons-base
+         singletons-th text text-short vinyl
        ];
        executableHaskellDepends = [
-         aeson base bytestring either generic-optics megaparsec mtl optics
-         optparse-applicative text vinyl yaml
+         aeson base binrep blake3 bytestring either generic-optics heystone
+         megaparsec memory mtl optics optparse-applicative refined
+         singletons singletons-base singletons-th text text-short vinyl yaml
        ];
        testHaskellDepends = [
-         aeson base bytestring either generic-optics hspec megaparsec mtl
-         optics QuickCheck text vinyl
+         aeson base binrep blake3 bytestring either generic-optics heystone
+         hspec megaparsec memory mtl optics QuickCheck singletons
+         singletons-base singletons-th text text-short vinyl
        ];
        testToolDepends = [ hspec-discover ];
        description = "Patch byte-representable data in a bytestream";
@@ -49941,8 +50028,8 @@ self: {
      }:
      mkDerivation {
        pname = "bytesmith";
-       version = "0.3.8.0";
-       sha256 = "0rfqpnc1awnpn50yfjxgwb65byhdcg5rivg3mbsd5clmq337cz12";
+       version = "0.3.9.0";
+       sha256 = "0jmx4flf3j5a4gyrw79cxiybp6f7y0rm9ifmrxypxpwrwc220zjg";
        libraryHaskellDepends = [
          base byteslice bytestring contiguous primitive run-st text-short
          wide-word
@@ -57383,6 +57470,8 @@ self: {
        pname = "chronos";
        version = "1.1.4";
        sha256 = "1v7h0qlckliid2zd3ff2l9l4xrdxacaw8my8bjj8grysj4vvyn5q";
+       revision = "1";
+       editedCabalFile = "1238mgjk7v0qf7n3c9qrzp7c6gmdcmx80x1ndgsy2nvzsdn5xklg";
        libraryHaskellDepends = [
          aeson attoparsec base bytebuild byteslice bytesmith bytestring
          deepseq hashable natural-arithmetic primitive semigroups text
@@ -58071,6 +58160,8 @@ self: {
        pname = "citeproc";
        version = "0.6.0.1";
        sha256 = "015ansq3a710s0hzs2157fx12bc4f1hy45l4dbi6j477sy800bqc";
+       revision = "1";
+       editedCabalFile = "1mzhq6s0jcncm71s825bvc289lq7i45rxmmi33x2j5i0v93zci4b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -58097,6 +58188,8 @@ self: {
        pname = "citeproc";
        version = "0.8";
        sha256 = "13f89nnx1g91cpnw1cp28nv33lrvp8swdkxlcbgvsfm38gs684qc";
+       revision = "1";
+       editedCabalFile = "1v8rb3k6wcx8995hs0zdd1gwvs42rb2ggpa526md5fjag0qxx5y2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -63730,6 +63823,25 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "composite-xml" = callPackage
+    ({ mkDerivation, base, composite-base, containers, tasty
+     , tasty-hunit, text, vinyl, xml-conduit
+     }:
+     mkDerivation {
+       pname = "composite-xml";
+       version = "0.1.0.0";
+       sha256 = "100fjbh1cw6igsyi043zml1fj1livyvwxbdv1gphf8wg4mfnygan";
+       libraryHaskellDepends = [
+         base composite-base containers text vinyl xml-conduit
+       ];
+       testHaskellDepends = [
+         base composite-base containers tasty tasty-hunit text vinyl
+         xml-conduit
+       ];
+       description = "RecXML Type";
+       license = lib.licenses.mit;
+     }) {};
+
   "composite-xstep" = callPackage
     ({ mkDerivation, base, composite-base, vinyl }:
      mkDerivation {
@@ -70075,6 +70187,24 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "crypto-rng-effectful" = callPackage
+    ({ mkDerivation, base, bytestring, crypto-rng, effectful-core
+     , random, tasty, tasty-hunit
+     }:
+     mkDerivation {
+       pname = "crypto-rng-effectful";
+       version = "1.0.0.0";
+       sha256 = "185ax4v4bfg944igscjg0vb0p15af4vwqdfn239x6xayfgy4xzl0";
+       libraryHaskellDepends = [
+         base bytestring crypto-rng effectful-core random
+       ];
+       testHaskellDepends = [
+         base bytestring crypto-rng effectful-core tasty tasty-hunit
+       ];
+       description = "Adaptation of the crypto-rng library for the effectful ecosystem";
+       license = lib.licenses.mit;
+     }) {};
+
   "crypto-simple" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, hspec, QuickCheck }:
      mkDerivation {
@@ -79017,19 +79147,20 @@ self: {
      }) {};
 
   "diagnose" = callPackage
-    ({ mkDerivation, base, data-default, hashable, prettyprinter
-     , prettyprinter-ansi-terminal, text, unordered-containers, wcwidth
+    ({ mkDerivation, array, base, data-default, dlist, hashable
+     , prettyprinter, prettyprinter-ansi-terminal, text
+     , unordered-containers, wcwidth
      }:
      mkDerivation {
        pname = "diagnose";
-       version = "2.1.1";
-       sha256 = "1ydga65py1bbxhgm76mmzsy3khklb4ay72nn8idc6bp1z1qdk0pa";
+       version = "2.2.0";
+       sha256 = "04l3d9inhs0zwsvszgynchs0mzz3bixx0xyk5z5jg03alvy6s4mg";
        libraryHaskellDepends = [
-         base data-default hashable prettyprinter
+         array base data-default dlist hashable prettyprinter
          prettyprinter-ansi-terminal text unordered-containers wcwidth
        ];
        testHaskellDepends = [
-         base data-default hashable prettyprinter
+         array base data-default dlist hashable prettyprinter
          prettyprinter-ansi-terminal text unordered-containers wcwidth
        ];
        description = "Beautiful error reporting done easily";
@@ -83481,6 +83612,8 @@ self: {
        pname = "doctest-parallel";
        version = "0.2.3";
        sha256 = "0sk1990ksqcgc13kppbh0xljakn3qsqaxi19990fixwakhzh229v";
+       revision = "1";
+       editedCabalFile = "1xk6d3b56y8lvngw6q9m5qhm1v59gyk48n4677p7vrr64x0mvmzx";
        libraryHaskellDepends = [
          base base-compat Cabal code-page containers deepseq directory
          exceptions extra filepath ghc ghc-paths Glob pretty process random
@@ -84656,14 +84789,18 @@ self: {
      }) {};
 
   "drama" = callPackage
-    ({ mkDerivation, base, ki, transformers, unagi-chan }:
+    ({ mkDerivation, base, ki-unlifted, stm, transformers, unagi-chan
+     , unliftio-core
+     }:
      mkDerivation {
        pname = "drama";
-       version = "0.4.0.0";
-       sha256 = "15p8pac1xcl5iifv1g0bs09l99x6q8skid71wlyxh4g9j7hrgpdr";
+       version = "0.5.0.0";
+       sha256 = "1ypmy17rir7y18xsvwh9izmrpszg47pkc7f0rpa90h38fz98nmr7";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base ki transformers unagi-chan ];
+       libraryHaskellDepends = [
+         base ki-unlifted stm transformers unagi-chan unliftio-core
+       ];
        executableHaskellDepends = [ base ];
        description = "Actor library for Haskell";
        license = lib.licenses.bsd3;
@@ -87165,24 +87302,78 @@ self: {
      }) {};
 
   "effectful" = callPackage
-    ({ mkDerivation, base, containers, exceptions, fused-effects
-     , ghc-prim, lifted-async, lifted-base, monad-control, mtl
-     , primitive, resourcet, tasty, tasty-bench, tasty-hunit
-     , transformers, transformers-base, unliftio, unliftio-core
+    ({ mkDerivation, async, base, bytestring, containers, directory
+     , effectful-core, exceptions, lifted-base, process, stm, tasty
+     , tasty-bench, tasty-hunit, text, time, unix, unliftio
      }:
      mkDerivation {
        pname = "effectful";
-       version = "0.0.0.0";
-       sha256 = "1k0cfryskdgqldsf7pan42bq6zc7n5xmm2j00sizdlxd0ssd9axd";
+       version = "1.0.0.0";
+       sha256 = "0z1jnlmxwvacnira88rh5syd3p2rwy71cqb7nq4wlza43ym1vifa";
+       revision = "1";
+       editedCabalFile = "14y45ykqrxcl980rbn1pvzh7vldrg0hf55710544ssgbh9m71mrb";
        libraryHaskellDepends = [
-         base containers exceptions ghc-prim monad-control primitive
-         resourcet transformers transformers-base unliftio-core
+         async base bytestring directory effectful-core process stm time
+         unliftio
        ];
        testHaskellDepends = [
-         base exceptions lifted-async lifted-base tasty tasty-hunit unliftio
+         base containers effectful-core exceptions lifted-base tasty
+         tasty-hunit unliftio
        ];
-       benchmarkHaskellDepends = [ base fused-effects mtl tasty-bench ];
-       description = "A simple, yet powerful extensible effects library";
+       benchmarkHaskellDepends = [
+         async base tasty-bench text unix unliftio
+       ];
+       description = "An easy to use, performant extensible effects library";
+       license = lib.licenses.bsd3;
+     }) {};
+
+  "effectful-core" = callPackage
+    ({ mkDerivation, base, containers, exceptions, monad-control
+     , primitive, transformers-base, unliftio-core
+     }:
+     mkDerivation {
+       pname = "effectful-core";
+       version = "1.0.0.0";
+       sha256 = "1mnwlq5i1y77f4p2jpyc6ciw600giz9g1n5rs0lwzwnbrjckqfp5";
+       libraryHaskellDepends = [
+         base containers exceptions monad-control primitive
+         transformers-base unliftio-core
+       ];
+       doHaddock = false;
+       description = "An easy to use, performant extensible effects library";
+       license = lib.licenses.bsd3;
+     }) {};
+
+  "effectful-plugin" = callPackage
+    ({ mkDerivation, base, containers, effectful-core, ghc
+     , ghc-tcplugins-extra
+     }:
+     mkDerivation {
+       pname = "effectful-plugin";
+       version = "1.0.0.0";
+       sha256 = "11y9d1ylwhgrrwf0pcpjqix2vrwzbwr2rlma6rm0h8yqpkchbx81";
+       libraryHaskellDepends = [
+         base containers effectful-core ghc ghc-tcplugins-extra
+       ];
+       testHaskellDepends = [ base effectful-core ];
+       description = "A GHC plugin for improving disambiguation of effects";
+       license = lib.licenses.bsd3;
+     }) {};
+
+  "effectful-th" = callPackage
+    ({ mkDerivation, base, containers, effectful, exceptions
+     , template-haskell, th-abstraction
+     }:
+     mkDerivation {
+       pname = "effectful-th";
+       version = "1.0.0.0";
+       sha256 = "0qvsxw1ajmr63r1bkgkchj5ra8g1ypx135ld62bip2mvqaxha9ih";
+       libraryHaskellDepends = [
+         base containers effectful exceptions template-haskell
+         th-abstraction
+       ];
+       testHaskellDepends = [ base effectful ];
+       description = "Template Haskell utilities for the effectful library";
        license = lib.licenses.bsd3;
      }) {};
 
@@ -96993,14 +97184,23 @@ self: {
        broken = true;
      }) {};
 
-  "filepath_1_4_2_2" = callPackage
-    ({ mkDerivation, base, QuickCheck }:
+  "filepath_1_4_100_0" = callPackage
+    ({ mkDerivation, base, bytestring, checkers, deepseq, exceptions
+     , QuickCheck, template-haskell
+     }:
      mkDerivation {
        pname = "filepath";
-       version = "1.4.2.2";
-       sha256 = "0rr6jlzga2siwdizr1kp6s77dq3f3hsk6f57a4k723yvvkj4pmmx";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base QuickCheck ];
+       version = "1.4.100.0";
+       sha256 = "1k0am2fp51fj2bwmgbmf093cip86wvmhn4j0mpx148chkijjs7v9";
+       revision = "1";
+       editedCabalFile = "0xxqs4ir8swvirivix6hjl4wa59bybf9dk68lgdkzcvrqg49z925";
+       libraryHaskellDepends = [
+         base bytestring deepseq exceptions template-haskell
+       ];
+       testHaskellDepends = [
+         base bytestring checkers deepseq QuickCheck
+       ];
+       benchmarkHaskellDepends = [ base bytestring deepseq ];
        description = "Library for manipulating FilePaths in a cross platform way";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
@@ -100683,6 +100883,39 @@ self: {
        mainProgram = "fortran-src";
      }) {};
 
+  "fortran-src_0_10_0" = callPackage
+    ({ mkDerivation, alex, array, base, binary, bytestring, containers
+     , deepseq, directory, either, fgl, filepath, GenericPretty, happy
+     , hspec, hspec-discover, mtl, pretty, QuickCheck, temporary, text
+     , uniplate
+     }:
+     mkDerivation {
+       pname = "fortran-src";
+       version = "0.10.0";
+       sha256 = "0a57blj53g4mgska5xfr48072933hg6c7wfk0ag69x2cdafx24nn";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base binary bytestring containers deepseq directory either
+         fgl filepath GenericPretty mtl pretty temporary text uniplate
+       ];
+       libraryToolDepends = [ alex happy ];
+       executableHaskellDepends = [
+         array base binary bytestring containers deepseq directory either
+         fgl filepath GenericPretty mtl pretty temporary text uniplate
+       ];
+       testHaskellDepends = [
+         array base binary bytestring containers deepseq directory either
+         fgl filepath GenericPretty hspec mtl pretty QuickCheck temporary
+         text uniplate
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Parsers and analyses for Fortran standards 66, 77, 90, 95 and 2003 (partial)";
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
+       mainProgram = "fortran-src";
+     }) {};
+
   "fortran-src-extras" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, containers
      , directory, either, filepath, fortran-src, GenericPretty, hspec
@@ -101344,8 +101577,8 @@ self: {
      }:
      mkDerivation {
        pname = "freckle-app";
-       version = "1.5.0.0";
-       sha256 = "09lrzca5yi67irbjlypqs2pd16swgw0wls5k5d08sipq3q1h9phd";
+       version = "1.5.1.0";
+       sha256 = "01qghpcgsh4fbszq7p21n1gk16v88bna2kr8aax81wl1iqabpyg1";
        libraryHaskellDepends = [
          aeson base Blammo bugsnag bytestring case-insensitive conduit
          containers datadog doctest ekg-core envparse errors exceptions
@@ -103552,8 +103785,8 @@ self: {
     ({ mkDerivation, base, fused-effects, optics-core }:
      mkDerivation {
        pname = "fused-effects-optics";
-       version = "0.2.0.0";
-       sha256 = "1d77lmdf3k8x1hgqhm4vh7gy49p4lizhw10haw89hkp2g15wqp5x";
+       version = "0.2.1.0";
+       sha256 = "0bz366m8g45g6ssc3j3ql5lnqrhix5i47piza2isz8fci8haq6c2";
        libraryHaskellDepends = [ base fused-effects optics-core ];
        description = "Bridge between the optics and fused-effects ecosystems";
        license = lib.licenses.bsd3;
@@ -103630,8 +103863,8 @@ self: {
        pname = "fused-effects-th";
        version = "0.1.0.3";
        sha256 = "01z3fjhbgq2if08fj72mc9xkxg0l9g3nfhwynzrhfwmqwcd9l3dp";
-       revision = "1";
-       editedCabalFile = "0av6mgwx56drmfjh3wqy1wrfi0xirx7c83kgmaq2qc62qcjkc5cw";
+       revision = "2";
+       editedCabalFile = "0lnw0s6ywpldz4l4l8f8n82517n2fm783xhy0i0irqygljw16dch";
        libraryHaskellDepends = [ base fused-effects template-haskell ];
        testHaskellDepends = [
          base fused-effects tasty tasty-hunit template-haskell
@@ -108395,8 +108628,8 @@ self: {
        pname = "ghc-paths";
        version = "0.1.0.12";
        sha256 = "1164w9pqnf7rjm05mmfjznz7rrn415blrkk1kjc0gjvks1vfdjvf";
-       revision = "3";
-       editedCabalFile = "109aygfsji4s9sdy1jyh0p5gy2hhcxp3x07fb88f72kfbn6896av";
+       revision = "4";
+       editedCabalFile = "1d5za4k498q48wk6cz0jm3d68rh5ldz6adr8vp24nn7jv17g770w";
        setupHaskellDepends = [ base Cabal directory ];
        libraryHaskellDepends = [ base ];
        description = "Knowledge of GHC's installation directories";
@@ -121551,35 +121784,36 @@ self: {
 
   "hackport" = callPackage
     ({ mkDerivation, array, async, base, base16-bytestring
-     , base64-bytestring, binary, bytestring, containers
-     , cryptohash-sha256, deepseq, directory, doctest, ed25519
-     , extensible-exceptions, filepath, ghc-prim, hashable, hspec
-     , hspec-discover, HTTP, lukko, mtl, network, network-uri
-     , old-locale, parallel, parsec, pretty, process, QuickCheck, random
-     , split, stm, tar, template-haskell, text, time, transformers, unix
-     , xml, zlib
+     , base64-bytestring, binary, bytestring, cabal-install, containers
+     , cryptohash-sha256, deepseq, directory, doctest, echo, ed25519
+     , edit-distance, extensible-exceptions, filepath, ghc-prim
+     , hashable, hspec, hspec-discover, HTTP, mtl, network, network-uri
+     , parallel, parsec, pretty, process, QuickCheck, random, regex-base
+     , regex-posix, resolv, split, stm, tar, template-haskell, text
+     , time, transformers, unix, xml, zlib
      }:
      mkDerivation {
        pname = "hackport";
-       version = "0.7.1.1";
-       sha256 = "0pqv62wgz8fdn7g46y4z01r60qf5n6d1ssgasslxzdw3sb42i55z";
+       version = "0.7.1.2";
+       sha256 = "0fyrbm5c0yi7a8pgrq2sgr2hml0yyklb4pcszigx4k8fhvgzqprb";
        isLibrary = false;
        isExecutable = true;
-       executableHaskellDepends = [
+       libraryHaskellDepends = [
          array async base base16-bytestring base64-bytestring binary
-         bytestring containers cryptohash-sha256 deepseq directory ed25519
-         extensible-exceptions filepath ghc-prim hashable HTTP lukko mtl
-         network network-uri old-locale parallel parsec pretty process
-         random split stm tar template-haskell text time transformers unix
-         xml zlib
+         bytestring containers cryptohash-sha256 deepseq directory echo
+         ed25519 edit-distance extensible-exceptions filepath ghc-prim
+         hashable HTTP mtl network network-uri parallel parsec pretty
+         process QuickCheck random regex-base regex-posix resolv split stm
+         tar template-haskell text time transformers unix xml zlib
        ];
+       executableHaskellDepends = [ base directory filepath ];
        testHaskellDepends = [
-         array base binary bytestring containers deepseq directory doctest
-         extensible-exceptions filepath hspec mtl network-uri parsec pretty
-         process QuickCheck split template-haskell text time transformers
-         unix xml
+         async base bytestring containers deepseq directory
+         extensible-exceptions filepath hspec network-uri parallel pretty
+         process QuickCheck split text time xml
        ];
-       testToolDepends = [ hspec-discover ];
+       testToolDepends = [ cabal-install doctest hspec-discover ];
+       doHaddock = false;
        description = "Hackage and Portage integration tool";
        license = lib.licenses.gpl3Plus;
        mainProgram = "hackport";
@@ -159191,8 +159425,8 @@ self: {
     ({ mkDerivation, base, hspec, QuickCheck }:
      mkDerivation {
        pname = "interval-tree-clock";
-       version = "0.1.0.2";
-       sha256 = "1v1sdhf43akmnlhp6y10nbp44pj93m7pmbwpss9skam5dasmnzs1";
+       version = "0.2.0.0";
+       sha256 = "0qgn9nlvf9sp9zyrgygd2wda9nrs1inzqi1ywqhng7zc6j85xv54";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Interval Tree Clocks";
@@ -163907,8 +164141,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-query";
-       version = "0.2.0.0";
-       sha256 = "1wlf8vl890lpvffl5f5aj8g6zdyzf5vq1fpcsl5cfrllws8jprln";
+       version = "0.2.1.0";
+       sha256 = "1cla0jwqdbiifl7h8xr61nh0p2d9df77ds8npllik1n4b4wi5v5p";
        libraryHaskellDepends = [
          array-chunks base bytebuild bytestring contiguous json-syntax
          primitive primitive-unlifted profunctors scientific-notation
@@ -164119,26 +164353,26 @@ self: {
 
   "json-syntax" = callPackage
     ({ mkDerivation, aeson, array-builder, array-chunks, base
-     , bytebuild, byteslice, bytesmith, bytestring, contiguous, gauge
-     , integer-gmp, natural-arithmetic, neat-interpolation, primitive
-     , QuickCheck, run-st, scientific, scientific-notation, tasty
-     , tasty-golden, tasty-hunit, tasty-quickcheck, text, text-short
-     , unordered-containers, vector, zigzag
+     , bytebuild, byteslice, bytesmith, bytestring, containers
+     , contiguous, gauge, integer-gmp, natural-arithmetic
+     , neat-interpolation, primitive, QuickCheck, run-st, scientific
+     , scientific-notation, tasty, tasty-golden, tasty-hunit
+     , tasty-quickcheck, text, text-short, vector, word-compat, zigzag
      }:
      mkDerivation {
        pname = "json-syntax";
-       version = "0.2.1.0";
-       sha256 = "132gmadrmkmrsy7mcsy0829sx46zyml9jniabycxa8cy89v22w09";
+       version = "0.2.2.0";
+       sha256 = "1cvr0gz4md5manqi76waf99i5ygiylb2g81zfnrd2q460195qk9b";
        libraryHaskellDepends = [
          array-builder array-chunks base bytebuild byteslice bytesmith
          bytestring contiguous integer-gmp natural-arithmetic primitive
-         run-st scientific-notation text-short zigzag
+         run-st scientific-notation text-short word-compat zigzag
        ];
        testHaskellDepends = [
-         aeson array-chunks base bytebuild byteslice bytestring
+         aeson array-chunks base bytebuild byteslice bytestring containers
          neat-interpolation primitive QuickCheck scientific
          scientific-notation tasty tasty-golden tasty-hunit tasty-quickcheck
-         text text-short unordered-containers vector
+         text text-short vector
        ];
        benchmarkHaskellDepends = [
          aeson base bytebuild byteslice bytestring gauge neat-interpolation
@@ -172143,8 +172377,8 @@ self: {
        pname = "leb128";
        version = "0.1.0.0";
        sha256 = "097xzdj1q17whnzwlpwnfapppgc4lqwmmfcv2694gzlil84rqwk7";
-       revision = "1";
-       editedCabalFile = "02vn6ffdfvrvcnil22hx4v85ykdxj1j0bsnv111rkxi17j2s76sp";
+       revision = "2";
+       editedCabalFile = "12qilpvx1sr1k1k5qsvpk8j678gvkhdzxbkdh6yhkb5w6hg4jzph";
        libraryHaskellDepends = [ base bytestring ghc-prim transformers ];
        testHaskellDepends = [
          base bytestring QuickCheck test-framework
@@ -172615,6 +172849,22 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "lens-family_2_1_2" = callPackage
+    ({ mkDerivation, base, containers, lens-family-core, mtl
+     , transformers
+     }:
+     mkDerivation {
+       pname = "lens-family";
+       version = "2.1.2";
+       sha256 = "0j1n51qx9sszpbksnz35cfsn62mv44g2jvn9iwr6wfy0mz1syq1b";
+       libraryHaskellDepends = [
+         base containers lens-family-core mtl transformers
+       ];
+       description = "Lens Families";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "lens-family-core" = callPackage
     ({ mkDerivation, base, containers, transformers }:
      mkDerivation {
@@ -172626,6 +172876,18 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "lens-family-core_2_1_2" = callPackage
+    ({ mkDerivation, base, containers, transformers }:
+     mkDerivation {
+       pname = "lens-family-core";
+       version = "2.1.2";
+       sha256 = "1dkkd33wh2ykgis92dpshjxz6d2d41dvjj4zz6b7mdy8frr9jnhv";
+       libraryHaskellDepends = [ base containers transformers ];
+       description = "Haskell 2022 Lens Families";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "lens-family-th" = callPackage
     ({ mkDerivation, base, hspec, template-haskell, transformers }:
      mkDerivation {
@@ -183604,6 +183866,18 @@ self: {
        license = lib.licenses.gpl3Only;
      }) {};
 
+  "mathexpr_0_3_1_0" = callPackage
+    ({ mkDerivation, base, data-default-class }:
+     mkDerivation {
+       pname = "mathexpr";
+       version = "0.3.1.0";
+       sha256 = "0s6knkj7274m9zfcv258drd4lqlq0ard4hafnsc8p3j8xrpr96pd";
+       libraryHaskellDepends = [ base data-default-class ];
+       description = "Parse and evaluate math expressions with variables and functions";
+       license = lib.licenses.gpl3Only;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "mathflow" = callPackage
     ({ mkDerivation, base, doctest, hspec, hspec-server, process
      , QuickCheck, shakespeare, singletons, template-haskell, text
@@ -185831,6 +186105,25 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "message-db-temp" = callPackage
+    ({ mkDerivation, base, bytestring, containers, exceptions
+     , postgres-options, postgresql-simple, retry, safe-exceptions, text
+     , tmp-postgres, typed-process
+     }:
+     mkDerivation {
+       pname = "message-db-temp";
+       version = "0.0.1.0";
+       sha256 = "1cfc199lyv55hz8xiqgz4pzlrwx9ipdm8qz67r57ifyqn4hsdl89";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring containers exceptions postgres-options
+         postgresql-simple retry safe-exceptions text tmp-postgres
+         typed-process
+       ];
+       description = "Temporary message-db for integration testing";
+       license = lib.licenses.mit;
+     }) {};
+
   "messagepack" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, deepseq
      , QuickCheck
@@ -186374,8 +186667,8 @@ self: {
        pname = "microaeson";
        version = "0.1.0.1";
        sha256 = "0rx5gm7apazc0sm65v687ab5106ximka9khizxq1lbckd2x0cq3q";
-       revision = "1";
-       editedCabalFile = "0sfz5xc6lvarbb8hfrccwd9b4snafsxjn8iy8ny7mdc1472irfl8";
+       revision = "2";
+       editedCabalFile = "1b9sdks42sl19i3rvsv71bjv0jjxi8b5mkbi14iqmybw18q1a2pk";
        libraryHaskellDepends = [
          array base bytestring containers deepseq fail text
        ];
@@ -188243,6 +188536,26 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "mixed-types-num_0_5_10" = callPackage
+    ({ mkDerivation, base, collect-errors, hspec, hspec-smallcheck, mtl
+     , QuickCheck, smallcheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "mixed-types-num";
+       version = "0.5.10";
+       sha256 = "0vlgqjkvfv4gkfanvy1yzdz706ilw3kbwb7gpnsax6wc1d3csgxx";
+       libraryHaskellDepends = [
+         base collect-errors hspec hspec-smallcheck mtl QuickCheck
+         smallcheck template-haskell
+       ];
+       testHaskellDepends = [
+         base collect-errors hspec hspec-smallcheck QuickCheck smallcheck
+       ];
+       description = "Alternative Prelude with numeric and logic expressions typed bottom-up";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "mixpanel-client" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring, hspec
      , hspec-discover, http-client, http-client-tls, markdown-unlit
@@ -208926,6 +209239,29 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "pandoc-lua-marshal_0_1_7" = callPackage
+    ({ mkDerivation, base, bytestring, containers, exceptions, hslua
+     , hslua-marshalling, lua, pandoc-types, QuickCheck, safe, tasty
+     , tasty-hunit, tasty-lua, tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "pandoc-lua-marshal";
+       version = "0.1.7";
+       sha256 = "0pn9b7f8dln049k76zb4znscl01qms751y1ln4j8irs50rc1b55j";
+       libraryHaskellDepends = [
+         base bytestring containers exceptions hslua hslua-marshalling lua
+         pandoc-types safe text
+       ];
+       testHaskellDepends = [
+         base bytestring containers exceptions hslua hslua-marshalling lua
+         pandoc-types QuickCheck safe tasty tasty-hunit tasty-lua
+         tasty-quickcheck text
+       ];
+       description = "Use pandoc types in Lua";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "pandoc-markdown-ghci-filter" = callPackage
     ({ mkDerivation, aeson, base, containers, ghcid, pandoc
      , pandoc-types, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
@@ -210109,8 +210445,8 @@ self: {
        pname = "parallel-tree-search";
        version = "0.4.2";
        sha256 = "08r8xl3x5zvsy3d3ss9m9l7kb0dyp7hjrwxlnz7g2jl7p5x8rjbd";
-       revision = "1";
-       editedCabalFile = "1d1wm16ydyyd1izm5mvrrxlqix8k98zvmfl418dsj446mfa2ih76";
+       revision = "2";
+       editedCabalFile = "08hfpmvljacm4175i9pjl6a6wj173a12187bpvaz5vs44clb5phd";
        libraryHaskellDepends = [ base parallel tree-monad ];
        description = "Parallel Tree Search";
        license = lib.licenses.publicDomain;
@@ -225096,6 +225432,29 @@ self: {
        license = lib.licenses.mpl20;
      }) {};
 
+  "prob-fx" = callPackage
+    ({ mkDerivation, base, containers, criterion, deepseq, dirichlet
+     , extensible, ghc-prim, lens, log-domain, membership, mtl
+     , mwc-probability, mwc-random, primitive, random, split, statistics
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "prob-fx";
+       version = "0.1.0.1";
+       sha256 = "0076c70gsk1ih4hjc7f9r5da2yhiplrggk9by6ffzf3jhbc7afpb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers criterion deepseq dirichlet extensible ghc-prim
+         lens log-domain membership mtl mwc-probability mwc-random primitive
+         random split statistics transformers vector
+       ];
+       executableHaskellDepends = [ base extensible lens ];
+       description = "A library for modular probabilistic modelling";
+       license = lib.licenses.bsd3;
+       mainProgram = "examples";
+     }) {};
+
   "probability" = callPackage
     ({ mkDerivation, base, containers, random, transformers, utility-ht
      }:
@@ -236247,6 +236606,8 @@ self: {
        pname = "regex-compat-tdfa";
        version = "0.95.1.4";
        sha256 = "1p90fn90yhp7fvljjdqjp41cszidcfz4pw7fwvzyx4739b98x8sg";
+       revision = "1";
+       editedCabalFile = "19jq1ic29mxfhrwxqxb4844cz0hc0bkyjbkjm3m4dinv13sv3sps";
        libraryHaskellDepends = [ array base regex-base regex-tdfa ];
        description = "Unicode Support version of Text.Regex, using regex-tdfa";
        license = lib.licenses.bsd3;
@@ -236565,6 +236926,26 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "regex-tdfa_1_3_1_3" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, directory
+     , filepath, mtl, parsec, regex-base, text, utf8-string
+     }:
+     mkDerivation {
+       pname = "regex-tdfa";
+       version = "1.3.1.3";
+       sha256 = "15yibl968p83badx661gagg43hdqr5ms9nvbvhq2hsx6ac8bpm6z";
+       libraryHaskellDepends = [
+         array base bytestring containers mtl parsec regex-base text
+       ];
+       testHaskellDepends = [
+         array base bytestring containers directory filepath mtl regex-base
+         text utf8-string
+       ];
+       description = "Pure Haskell Tagged DFA Backend for \"Text.Regex\" (regex-base)";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "regex-tdfa-pipes" = callPackage
     ({ mkDerivation, array, base, lens, monads-tf, pipes, regex-base
      , regex-tdfa
@@ -236637,6 +237018,8 @@ self: {
        pname = "regex-tdfa-unittest";
        version = "1.1";
        sha256 = "1b9cca3l46qxvc5ck3z27dg6w1888pabkk0q752bzjqr3fc4nidc";
+       revision = "1";
+       editedCabalFile = "18bi24n2z4y0ndrs7ki7h48azxx2k0vdjxdn51zaf7c8sgfn80n8";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -239132,6 +239515,17 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "resourcet-effectful" = callPackage
+    ({ mkDerivation, base, effectful-core, resourcet }:
+     mkDerivation {
+       pname = "resourcet-effectful";
+       version = "1.0.0.0";
+       sha256 = "0446j4ihj3fn6lkqi2b1642ak27l6cpwfv4b73gpanq3nad69fzg";
+       libraryHaskellDepends = [ base effectful-core resourcet ];
+       description = "Adaptation of the resourcet library for the effectful ecosystem";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "resourcet-pool" = callPackage
     ({ mkDerivation, base, resource-pool, resourcet }:
      mkDerivation {
@@ -239739,6 +240133,28 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "retry_0_9_3_0" = callPackage
+    ({ mkDerivation, base, exceptions, ghc-prim, hedgehog, HUnit, mtl
+     , mtl-compat, random, stm, tasty, tasty-hedgehog, tasty-hunit, time
+     , transformers, unliftio-core
+     }:
+     mkDerivation {
+       pname = "retry";
+       version = "0.9.3.0";
+       sha256 = "1kafm17xk6hylr0lwa98wxjcx7z3rgnqi4fzxcks7dy9dz5ms7n1";
+       libraryHaskellDepends = [
+         base exceptions ghc-prim mtl mtl-compat random transformers
+         unliftio-core
+       ];
+       testHaskellDepends = [
+         base exceptions ghc-prim hedgehog HUnit mtl mtl-compat random stm
+         tasty tasty-hedgehog tasty-hunit time transformers unliftio-core
+       ];
+       description = "Retry combinators for monadic actions that may fail";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "retryer" = callPackage
     ({ mkDerivation, base, optparse-applicative, process }:
      mkDerivation {
@@ -244584,6 +245000,71 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "sandwich_0_1_0_10" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, async, base, brick
+     , bytestring, colour, containers, directory, exceptions, filepath
+     , free, haskell-src-exts, lens, lifted-async, microlens
+     , microlens-th, monad-control, monad-logger, mtl
+     , optparse-applicative, pretty-show, process, safe, safe-exceptions
+     , stm, string-interpolate, template-haskell, text, time
+     , transformers, transformers-base, unix, unliftio-core, vector, vty
+     }:
+     mkDerivation {
+       pname = "sandwich";
+       version = "0.1.0.10";
+       sha256 = "1163l9ammy91aclxf12hk5z65ivw4zz4b04bgpdlwalhlygnlxba";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal async base brick bytestring colour containers
+         directory exceptions filepath free haskell-src-exts lens
+         lifted-async microlens microlens-th monad-control monad-logger mtl
+         optparse-applicative pretty-show process safe safe-exceptions stm
+         string-interpolate template-haskell text time transformers
+         transformers-base unix unliftio-core vector vty
+       ];
+       executableHaskellDepends = [
+         aeson ansi-terminal async base brick bytestring colour containers
+         directory exceptions filepath free haskell-src-exts lens
+         lifted-async microlens microlens-th monad-control monad-logger mtl
+         optparse-applicative pretty-show process safe safe-exceptions stm
+         string-interpolate template-haskell text time transformers
+         transformers-base unix unliftio-core vector vty
+       ];
+       testHaskellDepends = [
+         aeson ansi-terminal async base brick bytestring colour containers
+         directory exceptions filepath free haskell-src-exts lens
+         lifted-async microlens microlens-th monad-control monad-logger mtl
+         optparse-applicative pretty-show process safe safe-exceptions stm
+         string-interpolate template-haskell text time transformers
+         transformers-base unix unliftio-core vector vty
+       ];
+       description = "Yet another test framework for Haskell";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
+  "sandwich-hedgehog" = callPackage
+    ({ mkDerivation, base, free, hedgehog, monad-control, mtl
+     , safe-exceptions, sandwich, string-interpolate, text, time, vty
+     , wl-pprint-annotated
+     }:
+     mkDerivation {
+       pname = "sandwich-hedgehog";
+       version = "0.1.0.10";
+       sha256 = "1yb27zfq1a2320bqxjqjfhyalgk6fy6lwaim1zddwpcw95cbc19g";
+       libraryHaskellDepends = [
+         base free hedgehog monad-control mtl safe-exceptions sandwich
+         string-interpolate text time vty wl-pprint-annotated
+       ];
+       testHaskellDepends = [
+         base free hedgehog monad-control mtl safe-exceptions sandwich
+         string-interpolate text time vty wl-pprint-annotated
+       ];
+       description = "Sandwich integration with Hedgehog";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "sandwich-quickcheck" = callPackage
     ({ mkDerivation, base, free, monad-control, mtl, QuickCheck
      , safe-exceptions, sandwich, text, time
@@ -246020,15 +246501,15 @@ self: {
     ({ mkDerivation, aeson, attoparsec, base, bytebuild, byteslice
      , bytesmith, bytestring, gauge, natural-arithmetic, primitive
      , QuickCheck, run-st, scientific, tasty, tasty-hunit
-     , tasty-quickcheck, text-short
+     , tasty-quickcheck, text-short, word-compat
      }:
      mkDerivation {
        pname = "scientific-notation";
-       version = "0.1.4.0";
-       sha256 = "0s20n1ckk333g6avi4n3lskczya61apv2177y7bzx3vn2wk7cdy0";
+       version = "0.1.5.0";
+       sha256 = "0d9qg3m47np8qyip9f7bkcry7as9jsbg688fyy5idcz2nwzxnxqc";
        libraryHaskellDepends = [
          base bytebuild byteslice bytesmith bytestring natural-arithmetic
-         primitive text-short
+         primitive text-short word-compat
        ];
        testHaskellDepends = [
          base bytebuild byteslice bytesmith bytestring primitive QuickCheck
@@ -257149,8 +257630,8 @@ self: {
      }:
      mkDerivation {
        pname = "sketch-frp-copilot";
-       version = "1.0.2";
-       sha256 = "10r4j3plg70vawczk9fr388ljjqnjn08apv8s9am754g59fnwrd3";
+       version = "1.0.3";
+       sha256 = "014v3aknrsydz5xs3il9m8fda7r4ni6i66wjqbypll6j25ikzdp5";
        libraryHaskellDepends = [
          base containers copilot copilot-c99 copilot-language mtl
          optparse-applicative
@@ -258741,8 +259222,8 @@ self: {
      }:
      mkDerivation {
        pname = "snack";
-       version = "0.3.0.0";
-       sha256 = "10a5bjhq8ncp097gh415mn48cc65l73z9gd2vq9fg4d9qg5v5jp2";
+       version = "0.4.0.0";
+       sha256 = "1gvv5qsajh7w37m0rdw0i38x8kasrqsmr3h2wplvdkbipk13a213";
        libraryHaskellDepends = [ base bytestring bytestring-lexing text ];
        benchmarkHaskellDepends = [
          attoparsec base bytestring criterion string-conversions text
@@ -260317,8 +260798,8 @@ self: {
      }:
      mkDerivation {
        pname = "snowchecked";
-       version = "0.0.1.0";
-       sha256 = "1128b0a4q7vnzz07ddalp6rjcmyvg98r8z77pzj573scrp214abn";
+       version = "0.0.1.2";
+       sha256 = "1dxj23aa2gacf5gjb53bqvy7rfv12b5y8aqijvvj436lzabrlarc";
        libraryHaskellDepends = [
          base bytestring data-default deepseq text text-conversions time
          wide-word
@@ -270740,6 +271221,17 @@ self: {
        mainProgram = "Swish";
      }) {};
 
+  "swiss" = callPackage
+    ({ mkDerivation, base, bytestring, parallel, time }:
+     mkDerivation {
+       pname = "swiss";
+       version = "0.0.1";
+       sha256 = "0n1rlvsbaynqgys23y0rh587hszvgjcd6vdlzhjq1kkdcvprhgvy";
+       libraryHaskellDepends = [ base bytestring parallel time ];
+       description = "Basic functions for development with Core libraries and GHC boot libraries dependencies";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "swiss-ephemeris" = callPackage
     ({ mkDerivation, base, directory, hspec, hspec-discover, QuickCheck
      , random, time, vector
@@ -274317,19 +274809,20 @@ self: {
 
   "tasty-autocollect" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory
-     , explainable-predicates, filepath, ghc, tasty, tasty-golden
-     , tasty-hunit, tasty-quickcheck, template-haskell, temporary, text
-     , transformers, typed-process
+     , explainable-predicates, filepath, ghc, tasty
+     , tasty-expected-failure, tasty-golden, tasty-hunit
+     , tasty-quickcheck, template-haskell, temporary, text, transformers
+     , typed-process
      }:
      mkDerivation {
        pname = "tasty-autocollect";
-       version = "0.2.0.0";
-       sha256 = "1wn8mf1caml2qzsq0b9fhir97lzlydpwr2q711qldiq4vrjszj5n";
+       version = "0.3.0.0";
+       sha256 = "0yk5qfhfnd0lx42bajlr042pj97gljg6ggi8wd2yr0fh4a7gq0gw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers directory filepath ghc tasty template-haskell text
-         transformers
+         base containers directory filepath ghc tasty tasty-expected-failure
+         template-haskell text transformers
        ];
        executableHaskellDepends = [ base text ];
        testHaskellDepends = [
@@ -276825,8 +277318,8 @@ self: {
     ({ mkDerivation, base, reactive-banana, termbox }:
      mkDerivation {
        pname = "termbox-banana";
-       version = "0.3.1";
-       sha256 = "0vni6wpdmqmbm7ypckr17qbjwilwilj3bibbmn6lv096n1wn751h";
+       version = "0.4.0";
+       sha256 = "13n2r3a6gw0lmgk36dsdwhz6hd8h9rn93pk62zlxcycddrwhan5p";
        libraryHaskellDepends = [ base reactive-banana termbox ];
        description = "reactive-banana + termbox";
        license = lib.licenses.bsd3;
@@ -279973,8 +280466,8 @@ self: {
      }:
      mkDerivation {
        pname = "themoviedb";
-       version = "1.2.1";
-       sha256 = "0dd1f0lhq0sdl2i3cz7maf49vif89jlv6ny64pw4ywnwycblq3if";
+       version = "1.2.2";
+       sha256 = "1fxcz64mlbcmjwfjlrc39rqb8hkf2mkh36ngq3mnc62ml8v8x0y0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -281984,6 +282477,18 @@ self: {
        mainProgram = "timestamper";
      }) {};
 
+  "timestats" = callPackage
+    ({ mkDerivation, base, containers, text }:
+     mkDerivation {
+       pname = "timestats";
+       version = "0.1.0";
+       sha256 = "1vmrmvfa3lnyqndqs2y61y4c6xh6ql6x9n86i5yzwayfp2hzrfjb";
+       libraryHaskellDepends = [ base containers text ];
+       testHaskellDepends = [ base text ];
+       description = "A library for profiling time in Haskell applications";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "timeutils" = callPackage
     ({ mkDerivation, base, brick, hspec, microlens, time, vty }:
      mkDerivation {
@@ -285334,10 +285839,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "tree-monad";
-       version = "0.3.1";
-       sha256 = "0ny57rygkgwn8i733gz2zb12i5niq5q7lrqvzfwsnjd0b40yighf";
-       revision = "1";
-       editedCabalFile = "0pw6mzr6x3s5w01bv6b5pcrqkx2zbjf4bk4cgrzww9gs81p3v790";
+       version = "0.3.2";
+       sha256 = "0l7ngbng5qinm7gk1k7vdvx5i9yjjzglpr9ax34b2yfyvg60b7sb";
        libraryHaskellDepends = [ base ];
        description = "Non-Determinism Monad for Tree Search";
        license = lib.licenses.bsd3;
@@ -300699,8 +301202,8 @@ self: {
      }:
      mkDerivation {
        pname = "webauthn";
-       version = "0.4.0.0";
-       sha256 = "1lr5bc69407vb7l55dfzskf01p70zm924r6i53xbf6x8qk0b2nav";
+       version = "0.4.1.0";
+       sha256 = "0afdf2wi0d8d76b2gc3j809diafwib95masi8l0w53b1xbnwac4j";
        libraryHaskellDepends = [
          aeson asn1-encoding asn1-parse asn1-types base base16-bytestring
          base64-bytestring binary bytestring cborg containers cryptonite
@@ -309752,8 +310255,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-middleware-csp";
-       version = "1.0.2";
-       sha256 = "0b024ryklhrf683pzrrrfwfw0cl5nawjgz529xv9pzql1ly56yz3";
+       version = "1.1.0";
+       sha256 = "1jrfd8r7xvyc556q04qvrib1rwwlsy0rnbc7nxrnqpvn1wv1pb0q";
        libraryHaskellDepends = [
          base base64-bytestring bytestring classy-prelude conduit containers
          directory filepath http-client network-uri template-haskell text
@@ -311350,21 +311853,19 @@ self: {
 
   "yst" = callPackage
     ({ mkDerivation, aeson, base, containers, csv, directory, filepath
-     , HDBC, HDBC-sqlite3, HStringTemplate, lucid, old-locale, old-time
-     , pandoc, parsec, scientific, split, text, time
-     , unordered-containers, yaml
+     , HDBC, HDBC-sqlite3, HStringTemplate, lucid, pandoc, parsec
+     , scientific, split, text, time, yaml
      }:
      mkDerivation {
        pname = "yst";
-       version = "0.7.1.2";
-       sha256 = "1wg1vvf7wna5pv2mgs66c82rjan0ig4vv6vv2vlsnxzbpkn7vvf5";
+       version = "0.7.1.3";
+       sha256 = "120ppqk1jpkxjw3ip3q27f3aaghm4s725g6lmi54ma9f0s3m4hy9";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson base containers csv directory filepath HDBC HDBC-sqlite3
-         HStringTemplate lucid old-locale old-time pandoc parsec scientific
-         split text time unordered-containers yaml
+         HStringTemplate lucid pandoc parsec scientific split text time yaml
        ];
        description = "Builds a static website from templates and data in YAML or CSV files";
        license = lib.licenses.gpl2Plus;
@@ -311894,8 +312395,8 @@ self: {
      }:
      mkDerivation {
        pname = "zephyr-copilot";
-       version = "1.0.2";
-       sha256 = "01dvqzh97bw423kwhmgdr8l913p4miq69frv3nkjs889ps16faz0";
+       version = "1.0.3";
+       sha256 = "17cy0jj681mf12f45v6c0qz0c88ksr37gmrh1szk87789lpscb9z";
        libraryHaskellDepends = [
          base containers copilot copilot-c99 copilot-language directory
          filepath mtl optparse-applicative sketch-frp-copilot temporary

From 356f870a83e59d17be28c0fdab0a60003ee17dbc Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sun, 17 Jul 2022 12:20:30 +0200
Subject: [PATCH 05/22] haskellPackages.regex-compat-tdfa: ignore upper bound
 on base

This bound was (rightfully) introduced via a hackage revision, but it
doesn't apply to us because we patch around the incompatibility with
GHC >= 9.0.
---
 pkgs/development/haskell-modules/configuration-common.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 7047c7d7204a..8762545aa48c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -2394,7 +2394,11 @@ self: super: {
   # https://hub.darcs.net/shelarcy/regex-compat-tdfa/issue/3
   regex-compat-tdfa = appendPatches [
     ./patches/regex-compat-tdfa-ghc-9.0.patch
-  ] super.regex-compat-tdfa;
+  ] (overrideCabal super.regex-compat-tdfa {
+    # Revision introduces bound base < 4.15
+    revision = null;
+    editedCabalFile = null;
+  };
 
   # https://github.com/kowainik/validation-selective/issues/64
   validation-selective = doJailbreak super.validation-selective;

From 4030d94564bc4ce730095828ad4465330f490de7 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sun, 17 Jul 2022 15:12:50 +0200
Subject: [PATCH 06/22] haskellPackages: fix eval, missing paren in
 configuration-common.nix

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8762545aa48c..07762d793904 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -2398,7 +2398,7 @@ self: super: {
     # Revision introduces bound base < 4.15
     revision = null;
     editedCabalFile = null;
-  };
+  });
 
   # https://github.com/kowainik/validation-selective/issues/64
   validation-selective = doJailbreak super.validation-selective;

From a4bb1872e1a859493a3ba548faf91303e379d8f6 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sun, 17 Jul 2022 15:32:03 +0200
Subject: [PATCH 07/22] haskellPackages.cabal2nix-unstable: 2022-06-30 ->
 2022-07-17

---
 pkgs/development/haskell-modules/cabal2nix-unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix
index 8e9ec97be0c8..e21c3e1629a1 100644
--- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix
+++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix
@@ -8,10 +8,10 @@
 }:
 mkDerivation {
   pname = "cabal2nix";
-  version = "unstable-2022-06-20";
+  version = "unstable-2022-07-17";
   src = fetchzip {
-    url = "https://github.com/NixOS/cabal2nix/archive/9d18320d76e3f29f1787a8377125812150c59021.tar.gz";
-    sha256 = "1gykznb1fl9d9cqksbxc4qsyspp9xazamv57hmv3jpljzl8lq2aq";
+    url = "https://github.com/NixOS/cabal2nix/archive/6c6fa480dd535a8a6909b60e1130a6b5bfc2a2c4.tar.gz";
+    sha256 = "19dagxhj1aflhf19xab8yss5mia6kfpghn4h0na8zshqab8xxgrd";
   };
   isLibrary = true;
   isExecutable = true;

From 94d1dd4e777d28cf9841799c0710981be6a6fa7c Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sun, 17 Jul 2022 15:53:23 +0200
Subject: [PATCH 08/22] haskellPackages.regex-compat-tdfa: fix arg order in
 override

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 07762d793904..a209ea836225 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -2394,11 +2394,11 @@ self: super: {
   # https://hub.darcs.net/shelarcy/regex-compat-tdfa/issue/3
   regex-compat-tdfa = appendPatches [
     ./patches/regex-compat-tdfa-ghc-9.0.patch
-  ] (overrideCabal super.regex-compat-tdfa {
+  ] (overrideCabal {
     # Revision introduces bound base < 4.15
     revision = null;
     editedCabalFile = null;
-  });
+  } super.regex-compat-tdfa);
 
   # https://github.com/kowainik/validation-selective/issues/64
   validation-selective = doJailbreak super.validation-selective;

From 6da243e26d7eecadd92aea0680c924a050d795ed Mon Sep 17 00:00:00 2001
From: Nikita Volodin <volodin.n@gmail.com>
Date: Thu, 14 Jul 2022 01:43:52 -0400
Subject: [PATCH 09/22] haskellPackages.hspec_2_7_10: fix versions of
 dependencies

---
 pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a209ea836225..ad122d1e8864 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1664,6 +1664,12 @@ self: super: {
     hspec-meta = self.hspec-meta_2_9_3;
   };
 
+  # Point hspec 2.7.10 to correct dependencies
+  hspec_2_7_10 = doDistribute (super.hspec_2_7_10.override {
+    hspec-discover = self.hspec-discover_2_7_10;
+    hspec-core = self.hspec-core_2_7_10;
+  });
+
   # waiting for aeson bump
   servant-swagger-ui-core = doJailbreak super.servant-swagger-ui-core;
 

From d46be5b0e8baad998f8277e04370f0fd30dde11b Mon Sep 17 00:00:00 2001
From: Nikita Volodin <volodin.n@gmail.com>
Date: Thu, 14 Jul 2022 01:44:21 -0400
Subject: [PATCH 10/22] haskellPackages.vector-hashtables: fix versions of
 dependencies

---
 pkgs/development/haskell-modules/configuration-common.nix     | 4 ++++
 .../haskell-modules/configuration-hackage2nix/broken.yaml     | 1 -
 pkgs/development/haskell-modules/hackage-packages.nix         | 2 --
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ad122d1e8864..891f41ea64b7 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -2582,6 +2582,10 @@ self: super: {
     lsp = self.lsp_1_5_0_0;
   };
 
+  # Too strict bounds on hspec
+  # https://github.com/klapaucius/vector-hashtables/issues/11
+  vector-hashtables = doJailbreak super.vector-hashtables;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super // (let
   # We need to build purescript with these dependencies and thus also its reverse
   # dependencies to avoid version mismatches in their dependency closure.
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index ea6e6dd95171..4e968b09d85d 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -5505,7 +5505,6 @@ broken-packages:
   - vector-endian
   - vector-fftw
   - vector-functorlazy
-  - vector-hashtables
   - vector-heterogenous
   - vector-random
   - vector-read-instances
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 13221f938f8a..13f7b0e22ad3 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -295990,8 +295990,6 @@ self: {
        ];
        description = "Efficient vector-based mutable hashtables implementation";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "vector-heterogenous" = callPackage

From 91bb48ab478d5892af019b7531ccd85c4c96f0a3 Mon Sep 17 00:00:00 2001
From: Dennis Gosnell <cdep.illabout@gmail.com>
Date: Mon, 18 Jul 2022 15:07:50 +0900
Subject: [PATCH 11/22] haskellPackages: regenerate package set based on
 current config

This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
---
 pkgs/development/haskell-modules/hackage-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 13f7b0e22ad3..17164e19532d 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -58708,7 +58708,6 @@ self: {
        ];
        description = "Clash: a functional hardware description language - Prelude library";
        license = lib.licenses.bsd2;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "clash-prelude-hedgehog" = callPackage
@@ -58725,7 +58724,6 @@ self: {
        ];
        description = "Hedgehog Generators for clash-prelude";
        license = lib.licenses.bsd2;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "clash-prelude-quickcheck" = callPackage

From 49a5377557a8c3695b96e5cece1db315c72ddc86 Mon Sep 17 00:00:00 2001
From: Dan Fithian <danielf@vitalbio.com>
Date: Tue, 5 Jul 2022 08:12:10 -0400
Subject: [PATCH 12/22] heartbeat service: specify package

Other elastic services can specify the package. Now we can also do it for heartbeat.
---
 nixos/modules/services/logging/heartbeat.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/logging/heartbeat.nix b/nixos/modules/services/logging/heartbeat.nix
index 56fb4deabda5..843ec033911f 100644
--- a/nixos/modules/services/logging/heartbeat.nix
+++ b/nixos/modules/services/logging/heartbeat.nix
@@ -20,6 +20,16 @@ in
 
       enable = mkEnableOption "heartbeat";
 
+      package = mkOption {
+        type = types.package;
+        default = pkgs.heartbeat;
+        defaultText = literalExpression "pkgs.heartbeat";
+        example = literalExpression "pkgs.heartbeat7";
+        description = ''
+          The heartbeat package to use.
+        '';
+      };
+
       name = mkOption {
         type = types.str;
         default = "heartbeat";
@@ -67,7 +77,7 @@ in
       serviceConfig = {
         User = "nobody";
         AmbientCapabilities = "cap_net_raw";
-        ExecStart = "${pkgs.heartbeat}/bin/heartbeat -c \"${heartbeatYml}\" -path.data \"${cfg.stateDir}/data\" -path.logs \"${cfg.stateDir}/logs\"";
+        ExecStart = "${cfg.package}/bin/heartbeat -c \"${heartbeatYml}\" -path.data \"${cfg.stateDir}/data\" -path.logs \"${cfg.stateDir}/logs\"";
       };
     };
   };

From 021f4cac52b81251a65b33081c9fb37e08fc3024 Mon Sep 17 00:00:00 2001
From: Dan Fithian <danielf@vitalbio.com>
Date: Mon, 18 Jul 2022 15:20:34 -0400
Subject: [PATCH 13/22] beats: add dfithian as maintainer

---
 pkgs/misc/logging/beats/6.x.nix | 2 +-
 pkgs/misc/logging/beats/7.x.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix
index bdef9dd21391..1c3e4adccf82 100644
--- a/pkgs/misc/logging/beats/6.x.nix
+++ b/pkgs/misc/logging/beats/6.x.nix
@@ -26,7 +26,7 @@ let beat = package : extraArgs : buildGoPackage (rec {
       meta = with lib; {
         homepage = "https://www.elastic.co/products/beats";
         license = licenses.asl20;
-        maintainers = with maintainers; [ fadenb basvandijk ];
+        maintainers = with maintainers; [ fadenb basvandijk dfithian ];
         platforms = platforms.linux;
       };
     } // extraArgs);
diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix
index 55fed8fb6741..a2a7e7969166 100644
--- a/pkgs/misc/logging/beats/7.x.nix
+++ b/pkgs/misc/logging/beats/7.x.nix
@@ -18,7 +18,7 @@ let beat = package: extraArgs: buildGoModule (rec {
   meta = with lib; {
     homepage = "https://www.elastic.co/products/beats";
     license = licenses.asl20;
-    maintainers = with maintainers; [ fadenb basvandijk ];
+    maintainers = with maintainers; [ fadenb basvandijk dfithian ];
     platforms = platforms.linux;
   };
 } // extraArgs);

From 7af8cc5769c8c8e56a709571d8417bca94ec078f Mon Sep 17 00:00:00 2001
From: Dan Fithian <danielf@vitalbio.com>
Date: Mon, 18 Jul 2022 15:20:44 -0400
Subject: [PATCH 14/22] maintainers: add dfithian

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8cc8ea9d9b62..15ea77b5c29c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -14564,4 +14564,10 @@
     github = "npatsakula";
     githubId = 23001619;
   };
+  dfithian = {
+    email = "daniel.m.fithian@gmail.com";
+    name = "Daniel Fithian";
+    github = "dfithian";
+    githubId = 8409320;
+  };
 }

From 02da3a122947e0ae1c024d276b03cb487f2266bd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Mar 2022 10:47:01 +0000
Subject: [PATCH 15/22] ocamlPackages.ocp-index: 1.3.1 -> 1.3.3

---
 pkgs/development/tools/ocaml/ocp-index/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix
index 1ca8cfb5c52c..b055ccbde5dc 100644
--- a/pkgs/development/tools/ocaml/ocp-index/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-index/default.nix
@@ -2,7 +2,7 @@
 
 buildDunePackage rec {
   pname = "ocp-index";
-  version = "1.3.1";
+  version = "1.3.3";
 
   useDune2 = true;
 
@@ -10,7 +10,7 @@ buildDunePackage rec {
     owner = "OCamlPro";
     repo = "ocp-index";
     rev = version;
-    sha256 = "120w72fqymjp6ibicbp31jyx9yv34mdvgkr0zdfpzvfb7lgd8rc7";
+    sha256 = "sha256-ElCXjUR85tkyBLIpIKefDouE1upzJytQnk4xoQt/cb0=";
   };
 
   strictDeps = true;

From 9c98a3908de7bf4bf48009bfc5045ba8c43a3ed0 Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Mon, 18 Jul 2022 17:31:13 +0200
Subject: [PATCH 16/22] git-annex: wrap with coreutils on all platforms

Co-authored-by: sternenseemann <sternenseemann@systemli.org>
---
 .../development/haskell-modules/configuration-nix.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index c05a207e89e9..3679e6d891bd 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -535,9 +535,7 @@ self: super: builtins.intersectAttrs super {
       })
       (addBuildTools (with pkgs.buildPackages; [makeWrapper python3Packages.sphinx]) super.futhark);
 
-  git-annex = let
-    pathForDarwin = pkgs.lib.makeBinPath [ pkgs.coreutils ];
-  in overrideCabal (drv: pkgs.lib.optionalAttrs (!pkgs.stdenv.isLinux) {
+  git-annex = overrideCabal (drv: {
     # This is an instance of https://github.com/NixOS/nix/pull/1085
     # Fails with:
     #   gpg: can't connect to the agent: File name too long
@@ -545,11 +543,12 @@ self: super: builtins.intersectAttrs super {
       substituteInPlace Test.hs \
         --replace ', testCase "crypto" test_crypto' ""
     '' + (drv.postPatch or "");
-    # On Darwin, git-annex mis-detects options to `cp`, so we wrap the
-    # binary to ensure it uses Nixpkgs' coreutils.
+    # Ensure git-annex uses the exact same coreutils it saw at build-time.
+    # This is especially important on Darwin but also in Linux environments
+    # where non-GNU coreutils are used by default.
     postFixup = ''
       wrapProgram $out/bin/git-annex \
-        --prefix PATH : "${pathForDarwin}"
+        --prefix PATH : "${pkgs.lib.makeBinPath [ pkgs.coreutils ]}"
     '' + (drv.postFixup or "");
     buildTools = [
       pkgs.buildPackages.makeWrapper

From 7e9e6145e68face7eeab9be4466743001fce5882 Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Mon, 18 Jul 2022 17:35:25 +0200
Subject: [PATCH 17/22] git-annex: wrap with lsof

Required by the assistant at runtime:

```
$ nix-shell --pure -p git git-annex
$ git annex assistant
git-annex: The lsof command is needed for watch mode to be safe, and is not in PATH.
To override lsof checks to ensure that files are not open for writing
when added to the annex, you can use --force
Be warned: This can corrupt data in the annex, and make fsck complain.
```
---
 pkgs/development/haskell-modules/configuration-nix.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 3679e6d891bd..f16a2c439f1a 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -548,7 +548,7 @@ self: super: builtins.intersectAttrs super {
     # where non-GNU coreutils are used by default.
     postFixup = ''
       wrapProgram $out/bin/git-annex \
-        --prefix PATH : "${pkgs.lib.makeBinPath [ pkgs.coreutils ]}"
+        --prefix PATH : "${pkgs.lib.makeBinPath (with pkgs; [ coreutils lsof ])}"
     '' + (drv.postFixup or "");
     buildTools = [
       pkgs.buildPackages.makeWrapper

From d5765d51504a3b0bd3e2798e5e15e6caad6deb7f Mon Sep 17 00:00:00 2001
From: Marek Fajkus <marek.faj@gmail.com>
Date: Mon, 18 Jul 2022 22:26:48 +0200
Subject: [PATCH 18/22] elmPackages.elm-json: 0.2.10 -> 0.2.12

---
 .../compilers/elm/packages/elm-json.nix       |  6 ++--
 .../compilers/elm/packages/elm-json.patch     | 28 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/compilers/elm/packages/elm-json.nix b/pkgs/development/compilers/elm/packages/elm-json.nix
index faf6ffd8a2e1..6eb5d10cd471 100644
--- a/pkgs/development/compilers/elm/packages/elm-json.nix
+++ b/pkgs/development/compilers/elm/packages/elm-json.nix
@@ -10,11 +10,11 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "elm-json";
-  version = "0.2.10";
+  version = "0.2.12";
 
   src = fetchurl {
     url = "https://github.com/zwilias/elm-json/archive/v${version}.tar.gz";
-    sha256 = "sha256:03azh7wvl60h6w7ffpvl49s7jr7bxpladcm4fzcasakg26i5a71x";
+    sha256 = "sha256:nlpxlPzWk3wwDgczuMI9T6DFY1YtQpQ1R4BhdPbzZBs=";
   };
 
   cargoPatches = [ ./elm-json.patch ];
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
     curl openssl
   ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 
-  cargoSha256 = "sha256:01zasrqf1va58i52s3kwdkj1rnwy80gv00xi6npfshjirj3ix07f";
+  cargoSha256 = "sha256:8SOpL8nfhYen9vza0LYpB/5fgVmBwG7vGMmFOaJskIc=";
 
   # Tests perform networking and therefore can't work in sandbox
   doCheck = false;
diff --git a/pkgs/development/compilers/elm/packages/elm-json.patch b/pkgs/development/compilers/elm/packages/elm-json.patch
index d7f434c8eb34..54df03019231 100644
--- a/pkgs/development/compilers/elm/packages/elm-json.patch
+++ b/pkgs/development/compilers/elm/packages/elm-json.patch
@@ -1,24 +1,24 @@
 diff --git a/Cargo.lock b/Cargo.lock
-index 5440d72..6e173fa 100644
+index b9bf434..58cfe81 100644
 --- a/Cargo.lock
 +++ b/Cargo.lock
-@@ -774,15 +774,6 @@ version = "0.1.2"
+@@ -685,15 +685,6 @@ version = "0.1.4"
  source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
+ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
  
 -[[package]]
 -name = "openssl-src"
--version = "111.11.0+1.1.1h"
+-version = "111.17.0+1.1.1m"
 -source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "380fe324132bea01f45239fadfec9343adb044615f29930d039bec1ae7b9fa5b"
+-checksum = "05d6a336abd10814198f66e2a91ccd7336611f30334119ca8ce300536666fcf4"
 -dependencies = [
 - "cc",
 -]
 -
  [[package]]
  name = "openssl-sys"
- version = "0.9.58"
-@@ -792,7 +783,6 @@ dependencies = [
+ version = "0.9.72"
+@@ -703,7 +694,6 @@ dependencies = [
   "autocfg",
   "cc",
   "libc",
@@ -27,17 +27,17 @@ index 5440d72..6e173fa 100644
   "vcpkg",
  ]
 diff --git a/Cargo.toml b/Cargo.toml
-index 4d319f2..6f4d0e5 100644
+index bc97f20..54d3b14 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -21,8 +21,8 @@ colored = "2.0"
+@@ -17,8 +17,8 @@ colored = "2.0"
  dialoguer = "0.6"
  dirs = "3.0"
  fs2 = "0.4"
--isahc = { version = "0.9", features = ["static-ssl"] }
--curl = {version = "0.4", features = ["static-curl", "static-ssl", "force-system-lib-on-osx", "http2"]}
-+isahc = "0.9"
-+curl = {version = "0.4", features = ["force-system-lib-on-osx", "http2"]}
+-isahc = { version = "1.6.0", default-features = false, features = ["static-ssl", "static-curl"] }
+-curl = {version = "0.4.42", default-features = false, features = ["ssl", "static-curl", "static-ssl", "force-system-lib-on-osx"]}
++isahc = { version = "1.6.0", default-features = false }
++curl = {version = "0.4.42", default-features = false, features = ["ssl", "force-system-lib-on-osx"]}
  ctrlc = "3.1"
  console = "0.12"
- 
+ anyhow = "1.0"

From 72a19f20adfe1a5cab58cb4c35047a6ca8465fcc Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Mon, 18 Jul 2022 23:20:01 +0200
Subject: [PATCH 19/22] haskellPackages: mark builds failing on hydra as broken

This commit has been generated by maintainers/scripts/haskell/mark-broken.sh
---
 .../configuration-hackage2nix/broken.yaml     |  9 +++++-
 .../transitive-broken.yaml                    | 17 ++--------
 .../haskell-modules/hackage-packages.nix      | 31 ++++++++++---------
 3 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index 4e968b09d85d..0ca1c789d545 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -63,6 +63,7 @@ broken-packages:
   - adp-multi
   - adtrees
   - advent-of-code-ocr
+  - aern2-fun
   - AERN-Basics
   - aeson-applicative
   - aeson-bson
@@ -870,6 +871,7 @@ broken-packages:
   - CoreDump
   - CoreErlang
   - core-haskell
+  - corenlp-parser
   - core-telemetry
   - core-webserver-warp
   - Coroutine
@@ -1891,6 +1893,7 @@ broken-packages:
   - hack-handler-happstack
   - hack-handler-kibro
   - HackMail
+  - hackport
   - hactor
   - hactors
   - haddock-api
@@ -2996,6 +2999,7 @@ broken-packages:
   - libpafe
   - libpq
   - librandomorg
+  - libsecp256k1
   - libsystemd-daemon
   - libsystemd-journal
   - libtagc
@@ -4079,6 +4083,7 @@ broken-packages:
   - PriorityChansConverger
   - priority-queue
   - probable
+  - prob-fx
   - Probnet
   - process-conduit
   - processing
@@ -4457,6 +4462,7 @@ broken-packages:
   - salvia-protocol
   - sandlib
   - sandman
+  - sandwich-hedgehog
   - sarasvati
   - sat
   - satchmo
@@ -4662,7 +4668,6 @@ broken-packages:
   - simple-form
   - simple-genetic-algorithm
   - SimpleH
-  - SimpleServer
   - simple-index
   - simpleirc
   - simple-log
@@ -4673,6 +4678,7 @@ broken-packages:
   - simpleprelude
   - simple-rope
   - simple-server
+  - SimpleServer
   - simplesmtpclient
   - simple-sql-parser
   - simple-stacked-vm
@@ -4999,6 +5005,7 @@ broken-packages:
   - swearjure
   - swf
   - swift-lda
+  - swiss
   - swiss-ephemeris
   - SWMMoutGetMB
   - sws
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
index 4ce0fad75c3e..fbd9eaa389cd 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@@ -427,6 +427,7 @@ dont-distribute-packages:
  - adict
  - adjunction
  - adp-multi-monadiccp
+ - aern2-mfun
  - aeson-native
  - aeson-result
  - affine
@@ -856,6 +857,7 @@ dont-distribute-packages:
  - bytable
  - bytehash
  - bytelog
+ - bytepatch
  - bytestring-builder-varword
  - bytestring-read
  - ca
@@ -952,16 +954,6 @@ dont-distribute-packages:
  - claferIG
  - claferwiki
  - clash
- - clash-ghc
- - clash-lib
- - clash-lib-hedgehog
- - clash-multisignal
- - clash-prelude-quickcheck
- - clash-shake
- - clash-systemverilog
- - clash-verilog
- - clash-vhdl
- - clashilator
  - classify-frog
  - classy-miso
  - clckwrks
@@ -1290,6 +1282,7 @@ dont-distribute-packages:
  - dph-prim-interface
  - dph-prim-par
  - dph-prim-seq
+ - drama
  - dropbox-sdk
  - dropsolve
  - dsh-sql
@@ -2301,7 +2294,6 @@ dont-distribute-packages:
  - hyloutils
  - hyperpublic
  - iException
- - ice40-prim
  - icepeak
  - ide-backend
  - ide-backend-server
@@ -2590,7 +2582,6 @@ dont-distribute-packages:
  - linux-ptrace
  - lio-eci11
  - lio-simple
- - lion
  - liquid-base
  - liquid-bytestring
  - liquid-containers
@@ -3371,8 +3362,6 @@ dont-distribute-packages:
  - restful-snap
  - restricted-workers
  - rethinkdb-model
- - retroclash-lib
- - retroclash-sim
  - rewrite
  - rewriting
  - rezoom
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 17164e19532d..42718c37a1fe 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -25005,6 +25005,8 @@ self: {
        ];
        description = "Generic operations for real functions";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "aern2-mfun" = callPackage
@@ -25025,6 +25027,7 @@ self: {
        ];
        description = "Multi-variate real function optimisation and proving";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        mainProgram = "aern2-mfun-benchmark-optimisation";
      }) {};
 
@@ -49965,6 +49968,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Patch byte-representable data in a bytestream";
        license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
        mainProgram = "bytepatch";
      }) {};
 
@@ -58585,7 +58589,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Clash: a functional hardware description language - GHC frontend";
        license = lib.licenses.bsd2;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "clash-lib" = callPackage
@@ -58632,7 +58635,6 @@ self: {
        ];
        description = "Clash: a functional hardware description language - As a library";
        license = lib.licenses.bsd2;
-       hydraPlatforms = lib.platforms.none;
        mainProgram = "v16-upgrade-primitives";
      }) {};
 
@@ -58654,7 +58656,6 @@ self: {
        ];
        description = "Hedgehog Generators for clash-lib";
        license = lib.licenses.bsd2;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "clash-multisignal" = callPackage
@@ -58669,7 +58670,6 @@ self: {
          base clash-prelude deepseq ghc-typelits-knownnat QuickCheck
        ];
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "clash-prelude" = callPackage
@@ -58736,7 +58736,6 @@ self: {
        libraryHaskellDepends = [ base clash-prelude QuickCheck ];
        description = "QuickCheck instances for various types in the CλaSH Prelude";
        license = "unknown";
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "clash-shake" = callPackage
@@ -58754,7 +58753,6 @@ self: {
        ];
        description = "Shake rules for building Clash programs";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "clash-systemverilog" = callPackage
@@ -58772,7 +58770,6 @@ self: {
        ];
        description = "CAES Language for Synchronous Hardware - SystemVerilog backend";
        license = lib.licenses.bsd2;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "clash-verilog" = callPackage
@@ -58790,7 +58787,6 @@ self: {
        ];
        description = "CAES Language for Synchronous Hardware - Verilog backend";
        license = lib.licenses.bsd2;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "clash-vhdl" = callPackage
@@ -58808,7 +58804,6 @@ self: {
        ];
        description = "CAES Language for Synchronous Hardware - VHDL backend";
        license = lib.licenses.bsd2;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "clashilator" = callPackage
@@ -58832,7 +58827,6 @@ self: {
        ];
        description = "Automated Clash to Verilator bridge";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
        mainProgram = "clashilator";
      }) {};
 
@@ -68090,6 +68084,8 @@ self: {
        librarySystemDepends = [ rocksdb ];
        description = "Launches CoreNLP and parses the JSON output";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) rocksdb;};
 
   "cornea" = callPackage
@@ -84802,6 +84798,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Actor library for Haskell";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "draw-poker" = callPackage
@@ -121814,7 +121811,9 @@ self: {
        doHaddock = false;
        description = "Hackage and Portage integration tool";
        license = lib.licenses.gpl3Plus;
+       hydraPlatforms = lib.platforms.none;
        mainProgram = "hackport";
+       broken = true;
      }) {};
 
   "hactor" = callPackage
@@ -155230,7 +155229,6 @@ self: {
        ];
        description = "Lattice iCE40 Primitive IP";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "icepeak" = callPackage
@@ -174486,6 +174484,8 @@ self: {
        ];
        description = "Bindings for secp256k1";
        license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) secp256k1;};
 
   "libsodium" = callPackage
@@ -176466,7 +176466,6 @@ self: {
        ];
        description = "RISC-V Core";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "lipsum-gen" = callPackage
@@ -225450,7 +225449,9 @@ self: {
        executableHaskellDepends = [ base extensible lens ];
        description = "A library for modular probabilistic modelling";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
        mainProgram = "examples";
+       broken = true;
      }) {};
 
   "probability" = callPackage
@@ -240088,7 +240089,6 @@ self: {
        ];
        description = "Code shared across the code samples in the book \"Retrocomputing with Clash\"";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "retroclash-sim" = callPackage
@@ -240108,7 +240108,6 @@ self: {
        ];
        description = "High-level simulators from the book \"Retrocomputing with Clash\"";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "retry" = callPackage
@@ -245061,6 +245060,8 @@ self: {
        ];
        description = "Sandwich integration with Hedgehog";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "sandwich-quickcheck" = callPackage
@@ -271228,6 +271229,8 @@ self: {
        libraryHaskellDepends = [ base bytestring parallel time ];
        description = "Basic functions for development with Core libraries and GHC boot libraries dependencies";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "swiss-ephemeris" = callPackage

From f2c952b68837c2437b88039ff01149bb0954e6e0 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Mon, 18 Jul 2022 07:32:36 -0400
Subject: [PATCH 20/22] pythonModules.polars: mark as broken

---
 .../python-modules/polars/default.nix         | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix
index 5b1e1a5ecbb5..dd9dbc114b23 100644
--- a/pkgs/development/python-modules/polars/default.nix
+++ b/pkgs/development/python-modules/polars/default.nix
@@ -49,7 +49,36 @@ buildPythonPackage {
   # ];
 
   meta = with lib; {
-    broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
+    # Adding cmake to nativeBuildInputs and using `dontUseCmakeConfigure = true;`
+    # The following error still happens
+
+    # Compiling arrow2 v0.10.1 (https://github.com/ritchie46/arrow2?branch=polars#da703ae3)
+    # error[E0554]: `#![feature]` may not be used on the stable release channel
+    #  --> /build/polars-0.13.19-vendor.tar.gz/arrow2/src/lib.rs:8:39
+    #   |
+    # 8 | #![cfg_attr(feature = "simd", feature(portable_simd))]
+    #   |                                       ^^^^^^^^^^^^^
+    # error: aborting due to previous error
+    # For more information about this error, try `rustc --explain E0554`.
+    # error: could not compile `arrow2` due to 2 previous errors
+    # warning: build failed, waiting for other jobs to finish...
+    #  maturin failed
+    #   Caused by: Failed to build a native library through cargo
+    #   Caused by: Cargo build finished with "exit status: 101": `cargo rustc --message-format json --manifest-path Cargo.toml -j 8 --frozen --target x86_64-unknown-linux-gnu --release --lib -- -C link-arg=-s`
+    # error: builder for '/nix/store/qfnqi5hs3x4xdb6d4f6rpaf63n1w74yn-python3.10-polars-0.13.19.drv' failed with exit code 1;
+    #        last 10 log lines:
+    #        > error: aborting due to previous error
+    #        >
+    #        >
+    #        > For more information about this error, try `rustc --explain E0554`.
+    #        >
+    #        > error: could not compile `arrow2` due to 2 previous errors
+    #        > warning: build failed, waiting for other jobs to finish...
+    #        >  maturin failed
+    #        >   Caused by: Failed to build a native library through cargo
+    #        >   Caused by: Cargo build finished with "exit status: 101": `cargo rustc --message-format json --manifest-path Cargo.toml -j 8 --frozen --target x86_64-unknown-linux-gnu --release --lib -- -C link-arg=-s`
+    #        For full logs, run 'nix log /nix/store/qfnqi5hs3x4xdb6d4f6rpaf63n1w74yn-python3.10-polars-0.13.19.drv'.
+    broken = true;
     description = "Fast multi-threaded DataFrame library in Rust | Python | Node.js ";
     homepage = "https://github.com/pola-rs/polars";
     license = licenses.asl20;

From 69902951316a59601d04c392e115e1953a7afce1 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Mon, 18 Jul 2022 18:15:15 -0400
Subject: [PATCH 21/22] vector: 0.23.0 -> 0.22.3

---
 pkgs/tools/misc/vector/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix
index 0fe8734d4ca7..08617255a23f 100644
--- a/pkgs/tools/misc/vector/default.nix
+++ b/pkgs/tools/misc/vector/default.nix
@@ -24,13 +24,13 @@
 , features ? ([ "sinks" "sources" "transforms" "vrl-cli" ]
     # the second feature flag is passed to the rdkafka dependency
     # building on linux fails without this feature flag (both x86_64 and AArch64)
-    ++ lib.optionals enableKafka [ "rdkafka?/gssapi-vendored" ]
+    ++ lib.optionals enableKafka [ "rdkafka/gssapi-vendored" ]
     ++ lib.optional stdenv.targetPlatform.isUnix "unix")
 }:
 
 let
   pname = "vector";
-  version = "0.23.0";
+  version = "0.22.3";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -39,10 +39,10 @@ rustPlatform.buildRustPackage {
     owner = "vectordotdev";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Y1RysuCWvdbqckW54r1uH/K9YTuAZk8T4M3HRGFm0EM=";
+    sha256 = "sha256-62oPttkdahTeMsd9lpd9/tc95kluVJuWxzP94i+gWhA=";
   };
 
-  cargoSha256 = "sha256-VBmJfRCwSv3t5DPzVj92ajGYk5Ju8xqr4v7IDU17498=";
+  cargoSha256 = "sha256-WWX47pbva7ZmPR6hBstJ5VqOwu3mkhhsHK3LHHqQjDE=";
   nativeBuildInputs = [ pkg-config cmake perl ];
   buildInputs = [ oniguruma openssl protobuf rdkafka zstd ]
     ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ];

From 5d3aac18a259249fdb6f01ae30eca05d691f7f0f Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 19 Jul 2022 07:53:21 +1000
Subject: [PATCH 22/22] clusterctl: 1.1.5 -> 1.2.0

https://github.com/kubernetes-sigs/cluster-api/releases/tag/v1.2.0
---
 pkgs/applications/networking/cluster/clusterctl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix
index c2b313d442e3..f09afe7b65d5 100644
--- a/pkgs/applications/networking/cluster/clusterctl/default.nix
+++ b/pkgs/applications/networking/cluster/clusterctl/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "clusterctl";
-  version = "1.1.5";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = "cluster-api";
     rev = "v${version}";
-    sha256 = "sha256-Nnfy8KOMJqg2sXrNDZlrcrpWfc70sXL1tNlXSgg5ZZg=";
+    sha256 = "sha256-udlIylkaNZIkJS6TgJemmQr/o73i87Nt8pL2Pbe+AqA=";
   };
 
-  vendorSha256 = "sha256-zRdtd/mE9AQtqw9Z/Tatd9vEx9l/XSFge8sOLbS/Wrs=";
+  vendorSha256 = "sha256-jM5qU/KaBf+CzKKOuVXjawn/QqwrCjXKaQFFomEPndg=";
 
   subPackages = [ "cmd/clusterctl" ];