From da9e653a110cfd6ccc74b2dc702b3ce9f6255353 Mon Sep 17 00:00:00 2001
From: Luigy Leon <luigy@outlook.com>
Date: Mon, 19 Dec 2022 18:42:03 -0500
Subject: [PATCH 01/29] Bump iOS SDK 16.1

---
 default.nix         | 4 ++--
 nixpkgs/github.json | 4 ++--
 nixpkgs/thunk.nix   | 5 ++++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/default.nix b/default.nix
index e215656ef..a400b1af8 100644
--- a/default.nix
+++ b/default.nix
@@ -9,7 +9,7 @@
 , useTextJSString ? true # Use an implementation of "Data.Text" that uses the more performant "Data.JSString" from ghcjs-base under the hood.
 , __useTemplateHaskell ? true # Deprecated, just here until we remove feature from reflex and stop CIing it
 , __useNewerCompiler ? false
-, iosSdkVersion ? "15.0"
+, iosSdkVersion ? "16.1"
 , nixpkgsOverlays ? []
 , haskellOverlays ? [] # TODO deprecate
 , haskellOverlaysPre ? []
@@ -21,7 +21,7 @@ let iosSupport = system == "x86_64-darwin";
     androidSupport = lib.elem system [ "x86_64-linux" ];
 
     xcodeVer = {
-      "15.0" = "13";
+      "16.1" = "14.1";
     }.${iosSdkVersion} or (throw "Unknown iosSdkVersion: ${iosSdkVersion}");
 
     # Overlay for GHC which supports the external splices plugin
diff --git a/nixpkgs/github.json b/nixpkgs/github.json
index a394f3ce1..48a47f785 100644
--- a/nixpkgs/github.json
+++ b/nixpkgs/github.json
@@ -3,6 +3,6 @@
   "repo": "nixpkgs",
   "branch": "dg/reflex-platform-21.05",
   "private": false,
-  "rev": "633bd0092e4c3ae5b3dcc956febe137c256b6ae6",
-  "sha256": "sha256:1byam3fcif4ip85y7xhkrr7w1y34pz2n3mma4m5jqf7jhivqv26a"
+  "rev": "40f8295215ed3d5fecdb000e26f988a4b43ec65a",
+  "sha256": "04kx305bypinl7wv81i4z7x0jlmrkf6sv9hwcv9ym3mi9zsyx970"
 }
diff --git a/nixpkgs/thunk.nix b/nixpkgs/thunk.nix
index bbf2dc18f..20f2d28c2 100644
--- a/nixpkgs/thunk.nix
+++ b/nixpkgs/thunk.nix
@@ -2,7 +2,10 @@
 let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
   if !fetchSubmodules && !private then builtins.fetchTarball {
     url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
-  } else (import <nixpkgs> {}).fetchFromGitHub {
+  } else (import (builtins.fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
+  sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
+}) {}).fetchFromGitHub {
     inherit owner repo rev sha256 fetchSubmodules private;
   };
   json = builtins.fromJSON (builtins.readFile ./github.json);

From 2c376792e54aef2d5afcb47fa5aae23694183a03 Mon Sep 17 00:00:00 2001
From: Luigy Leon <luigy@outlook.com>
Date: Mon, 9 Jan 2023 15:52:16 -0500
Subject: [PATCH 02/29] ios: update defaultInfoPlist for 16.1 sdk bump

---
 ios/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/ios/default.nix b/ios/default.nix
index 4c1bec1a0..5aa5e17af 100644
--- a/ios/default.nix
+++ b/ios/default.nix
@@ -92,16 +92,17 @@ let
       };
     };
 
-    DTSDKName = "iphoneos15.0";
-    DTXcode = "130"; # XCode 13.0
-    DTXcodeBuild = "13A233";
-    DTSDKBuild = "19A339"; # iOS 15.0
-    BuildMachineOSBuild = "19G73"; # Catalina
+    DTSDKName = "iphoneos16.1";
+    DTXcode = "1410"; # Xcode 14.1
+    DTXcodeBuild = "14B47b";
+    DTXcodeBuildDistribution = "14B47b";
+    DTSDKBuild = "20B71"; # iOS 16.1
+    BuildMachineOSBuild = "21G320"; # macOS Monterey 12.6.2
     DTPlatformName = "iphoneos";
     DTCompiler = "com.apple.compilers.llvm.clang.1_0";
-    MinimumOSVersion = "15.0";
-    DTPlatformVersion = "15.0";
-    DTPlatformBuild = "19A339"; # iOS 15.0
+    MinimumOSVersion = "16.1";
+    DTPlatformVersion = "16.1";
+    DTPlatformBuild = "20B71";
     NSPhotoLibraryUsageDescription = "Allow access to photo library.";
     NSCameraUsageDescription = "Allow access to camera.";
   };

From 86279e63937101c87bcb29812ace95561f078d8c Mon Sep 17 00:00:00 2001
From: Sean Chalmers <sean.chalmers@obsidian.systems>
Date: Mon, 22 May 2023 15:10:57 +0100
Subject: [PATCH 03/29] Add changelog entry

---
 ChangeLog.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ChangeLog.md b/ChangeLog.md
index 252a24e74..05902f8d3 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -2,6 +2,10 @@
 
 This project's release branch is `master`. This log is written from the perspective of the release branch: when changes hit `master`, they are considered released.
 
+## Unreleased
+
+* iOS: Bump SDK version from 15.0 -> 16.1
+
 ## v1.0.0.0
 
 * Nix

From 7d8d0bd0cad80100085b0c3a16cf7fdebf3984a1 Mon Sep 17 00:00:00 2001
From: Luigy Leon <luigy@outlook.com>
Date: Fri, 3 Feb 2023 11:59:54 -0500
Subject: [PATCH 04/29] Newer aeson 2.1.1.0, including text-jsstring

---
 haskell-overlays/any-8.6.nix                  |  4 +--
 haskell-overlays/any-head.nix                 |  2 --
 haskell-overlays/default.nix                  |  1 +
 haskell-overlays/reflex-packages/default.nix  | 16 ++++++----
 .../dep/reflex-dom/github.json                |  8 ++---
 .../text-jsstring-8.10/default.nix            |  2 +-
 .../text-jsstring-8.6/default.nix             |  2 +-
 .../dep/attoparsec/default.nix                |  2 ++
 .../dep/attoparsec/github.json                |  6 ++--
 .../dep/attoparsec/thunk.nix                  | 12 ++++++++
 haskell-overlays/text-jsstring/default.nix    |  2 +-
 .../text-jsstring/dep/aeson/github.json       |  6 ++--
 haskell-overlays/untriaged.nix                | 30 +++++++++++++++++--
 nixpkgs-overlays/all-cabal-hashes/default.nix |  4 +--
 14 files changed, 71 insertions(+), 26 deletions(-)
 create mode 100644 haskell-overlays/text-jsstring-8.6/dep/attoparsec/default.nix
 create mode 100644 haskell-overlays/text-jsstring-8.6/dep/attoparsec/thunk.nix

diff --git a/haskell-overlays/any-8.6.nix b/haskell-overlays/any-8.6.nix
index 4bf32413e..b50e49217 100644
--- a/haskell-overlays/any-8.6.nix
+++ b/haskell-overlays/any-8.6.nix
@@ -5,8 +5,8 @@ self: super: {
   haddock-library-ghcjs = dontCheck super.haddock-library-ghcjs;
   haddock-api-ghcjs = dontCheck super.haddock-api-ghcjs;
   ghc-lib-parser = self.callHackage "ghc-lib-parser" "8.10.2.20200808" {};
-  ghc-lib-parser-ex = self.callHackage "ghc-lib-parser-ex" "8.10.0.16" {};
-  hlint = self.callHackage "hlint" "3.1.6" {};
+  hlint = self.callHackage "hlint" "3.2.8" {};
+  http-date = dontCheck super.http-date;
   resolv = haskellLib.doJailbreak (super.resolv.override {
     base16-bytestring = super.base16-bytestring_0_1_1_7;
   });
diff --git a/haskell-overlays/any-head.nix b/haskell-overlays/any-head.nix
index 386f382b5..214771848 100644
--- a/haskell-overlays/any-head.nix
+++ b/haskell-overlays/any-head.nix
@@ -29,8 +29,6 @@ self: super: {
   exceptions = haskellLib.doJailbreak super.exceptions;
   keycode = haskellLib.doJailbreak super.keycode;
 
-  aeson = super.aeson_1_4_0_0;
-
   tagged = self.callHackage "tagged" "0.8.6" {};
   contravariant = self.callHackage "contravariant" "1.5" {};
 
diff --git a/haskell-overlays/default.nix b/haskell-overlays/default.nix
index 2079b2ebf..87c07e6ae 100644
--- a/haskell-overlays/default.nix
+++ b/haskell-overlays/default.nix
@@ -51,6 +51,7 @@ rec {
     # Careful when you touch this, anything modifying ghcjs-base is incredibly fragile
     (optionalExtension (super.ghc.version == "8.10.7") (self: super: rec {
       ghcjs-base = self.callHackage "ghcjs-base" "0.2.1.0" { };
+      hlint = self.callHackage "hlint" "3.2.8" {};
     }))
 
     (optionalExtension enableExposeAllUnfoldings exposeAllUnfoldings)
diff --git a/haskell-overlays/reflex-packages/default.nix b/haskell-overlays/reflex-packages/default.nix
index fb22065dd..dd03d91fb 100644
--- a/haskell-overlays/reflex-packages/default.nix
+++ b/haskell-overlays/reflex-packages/default.nix
@@ -39,12 +39,12 @@ in
   ## Reflex family
   ##
 
-  reflex = self.callCabal2nixWithOptions "reflex" self._dep.reflex (lib.concatStringsSep " " (lib.concatLists [
+  reflex = nixpkgs.haskell.lib.doJailbreak (self.callCabal2nixWithOptions "reflex" self._dep.reflex (lib.concatStringsSep " " (lib.concatLists [
     (lib.optional enableTraceReflexEvents "-fdebug-trace-events")
     reflexOptimizerFlag
     useTemplateHaskellFlag
     (lib.optional useFastWeak "-ffast-weak")
-  ])) {};
+  ])) {});
 
   reflex-todomvc = self.callPackage self._dep.reflex-todomvc {};
   reflex-aeson-orphans = self.callCabal2nix "reflex-aeson-orphans" self._dep.reflex-aeson-orphans {};
@@ -122,9 +122,11 @@ in
   ## GHCJS and JSaddle
   ##
 
-  jsaddle = self.callCabal2nix "jsaddle" (jsaddleSrc + "/jsaddle") {};
+  jsaddle = doJailbreak (self.callCabal2nix "jsaddle" (jsaddleSrc + "/jsaddle") {});
   jsaddle-clib = self.callCabal2nix "jsaddle-clib" (jsaddleSrc + "/jsaddle-clib") {};
-  jsaddle-webkit2gtk = self.callCabal2nix "jsaddle-webkit2gtk" (jsaddleSrc + "/jsaddle-webkit2gtk") {};
+  jsaddle-webkit2gtk = overrideCabal (self.callCabal2nix "jsaddle-webkit2gtk" (jsaddleSrc + "/jsaddle-webkit2gtk") {}) (drv: {
+    preConfigure = "substituteInPlace jsaddle-webkit2gtk.cabal --replace 'aeson >=0.8.0.2 && <2.1' aeson";
+  });
   jsaddle-webkitgtk = self.callCabal2nix "jsaddle-webkitgtk" (jsaddleSrc + "/jsaddle-webkitgtk") {};
   jsaddle-wkwebview = overrideCabal (self.callCabal2nix "jsaddle-wkwebview" (jsaddleSrc + "/jsaddle-wkwebview") {}) (drv: {
     libraryFrameworkDepends = (drv.libraryFrameworkDepends or []) ++
@@ -137,7 +139,9 @@ in
   # another broken test
   # phantomjs has issues with finding the right port
   # jsaddle-warp = dontCheck (addTestToolDepend (self.callCabal2nix "jsaddle-warp" "${jsaddleSrc}/jsaddle-warp" {}));
-  jsaddle-warp = dontCheck (self.callCabal2nix "jsaddle-warp" (jsaddleSrc + "/jsaddle-warp") {});
+  jsaddle-warp = overrideCabal (dontCheck (self.callCabal2nix "jsaddle-warp" (jsaddleSrc + "/jsaddle-warp") {})) (derv: {
+    preConfigure = "substituteInPlace jsaddle-warp.cabal --replace 'aeson >=0.8.0.2 && <2.1' aeson";
+  });
 
   jsaddle-dom = self.callCabal2nix "jsaddle-dom" self._dep.jsaddle-dom {};
   jsaddle-wasm = self.callCabal2nix "jsaddle-wasm" (hackGet (wasmCross + "/jsaddle-wasm")) {};
@@ -168,7 +172,7 @@ in
   ##
 
   haskell-gi-overloading = dontHaddock (self.callHackage "haskell-gi-overloading" "0.0" {});
-  monoidal-containers = self.callHackage "monoidal-containers" "0.6.2.0" {};
+  monoidal-containers = doJailbreak (self.callHackage "monoidal-containers" "0.6.2.0" {});
   patch = self.callCabal2nix "patch" self._dep.patch {};
   commutative-semigroups = self.callCabal2nix "commutative-semigroups" self._dep.commutative-semigroups {};
   witherable = self.callHackage "witherable" "0.4.2" {};
diff --git a/haskell-overlays/reflex-packages/dep/reflex-dom/github.json b/haskell-overlays/reflex-packages/dep/reflex-dom/github.json
index 87111a186..ba99ceb69 100644
--- a/haskell-overlays/reflex-packages/dep/reflex-dom/github.json
+++ b/haskell-overlays/reflex-packages/dep/reflex-dom/github.json
@@ -1,8 +1,8 @@
 {
-  "owner": "reflex-frp",
+  "owner": "luigy",
   "repo": "reflex-dom",
-  "branch": "aa/version-bounds",
+  "branch": "ll/relax-bounds",
   "private": false,
-  "rev": "567015558bbe9538890a3655e23b57e5759f12a3",
-  "sha256": "0wxd9k46zggn3hpxcvk65pila8yhslj5r7ahgxr7smf6lrrr5pz6"
+  "rev": "eea6765f5642949083029f8c3355f7c37331217a",
+  "sha256": "130x9i5nh7hhdgiiz4ii3jyhm2qnjw7r406h585g2sa70z7xjsw4"
 }
diff --git a/haskell-overlays/text-jsstring-8.10/default.nix b/haskell-overlays/text-jsstring-8.10/default.nix
index 2c5b24144..c22f7b2ef 100644
--- a/haskell-overlays/text-jsstring-8.10/default.nix
+++ b/haskell-overlays/text-jsstring-8.10/default.nix
@@ -7,7 +7,7 @@ self: super: {
   _dep = super._dep or {} // thunkSet ./dep // {
   };
 
-  attoparsec = dontCheck (self.callCabal2nix "attoparsec" self._dep.attoparsec {});
+  attoparsec = self.callCabal2nix "attoparsec" self._dep.attoparsec {};
   buffer-builder = appendPatch super.buffer-builder ./buffer-builder-text-jsstring.patch;
   conduit-extra =  (appendPatch super.conduit-extra ./conduit-extra-text-jsstring.patch);
   double-conversion = appendPatch super.double-conversion ./double-conversion-Add-text-jsstring.patch;
diff --git a/haskell-overlays/text-jsstring-8.6/default.nix b/haskell-overlays/text-jsstring-8.6/default.nix
index c38e4531e..f6e5a4273 100644
--- a/haskell-overlays/text-jsstring-8.6/default.nix
+++ b/haskell-overlays/text-jsstring-8.6/default.nix
@@ -7,7 +7,7 @@ self: super: {
   _dep = super._dep or {} // thunkSet ./dep // {
   };
 
-  attoparsec = dontCheck (self.callCabal2nix "attoparsec" self._dep.attoparsec {});
+  attoparsec = self.callCabal2nix "attoparsec" self._dep.attoparsec {};
   buffer-builder = overrideCabal super.buffer-builder (drv: {
     doCheck = false;
     src = fetchFromGitHub {
diff --git a/haskell-overlays/text-jsstring-8.6/dep/attoparsec/default.nix b/haskell-overlays/text-jsstring-8.6/dep/attoparsec/default.nix
new file mode 100644
index 000000000..2b4d4ab11
--- /dev/null
+++ b/haskell-overlays/text-jsstring-8.6/dep/attoparsec/default.nix
@@ -0,0 +1,2 @@
+# DO NOT HAND-EDIT THIS FILE
+import (import ./thunk.nix)
\ No newline at end of file
diff --git a/haskell-overlays/text-jsstring-8.6/dep/attoparsec/github.json b/haskell-overlays/text-jsstring-8.6/dep/attoparsec/github.json
index e4d4e6254..0ddd25eef 100644
--- a/haskell-overlays/text-jsstring-8.6/dep/attoparsec/github.json
+++ b/haskell-overlays/text-jsstring-8.6/dep/attoparsec/github.json
@@ -1,6 +1,8 @@
 {
   "owner": "obsidiansystems",
   "repo": "attoparsec",
-  "rev": "e3ae044b430d2c2edfbad82c089a7b5b291564ce",
-  "sha256": "0k6l7zknak6v14aaq5q7g33ns0a3r016xrh4fm6wz6l1v53f089v"
+  "branch": "v0.14.4-text-jsstring",
+  "private": false,
+  "rev": "a8ccf1df99f52c8bf145ba34263838386c634e8b",
+  "sha256": "1381s405pixzbsmbdrzryp524f821zcpmcyck5kc7f1b228y95if"
 }
diff --git a/haskell-overlays/text-jsstring-8.6/dep/attoparsec/thunk.nix b/haskell-overlays/text-jsstring-8.6/dep/attoparsec/thunk.nix
new file mode 100644
index 000000000..20f2d28c2
--- /dev/null
+++ b/haskell-overlays/text-jsstring-8.6/dep/attoparsec/thunk.nix
@@ -0,0 +1,12 @@
+# DO NOT HAND-EDIT THIS FILE
+let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
+  if !fetchSubmodules && !private then builtins.fetchTarball {
+    url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
+  } else (import (builtins.fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
+  sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
+}) {}).fetchFromGitHub {
+    inherit owner repo rev sha256 fetchSubmodules private;
+  };
+  json = builtins.fromJSON (builtins.readFile ./github.json);
+in fetch json
\ No newline at end of file
diff --git a/haskell-overlays/text-jsstring/default.nix b/haskell-overlays/text-jsstring/default.nix
index b17cddc69..29444c2e6 100644
--- a/haskell-overlays/text-jsstring/default.nix
+++ b/haskell-overlays/text-jsstring/default.nix
@@ -14,7 +14,7 @@ self: super: {
     ];
   });
 
-  aeson = dontCheck (self.callCabal2nix "aeson" self._dep.aeson {});
+  aeson = doJailbreak (self.callCabal2nix "aeson" self._dep.aeson {});
   # attoparsec = dontCheck (self.callCabal2nix "attoparsec" self._dep.attoparsec {});
   hashable = overrideCabal (self.callCabal2nix "hashable" self._dep.hashable {}) (drv: {
     revision = null;
diff --git a/haskell-overlays/text-jsstring/dep/aeson/github.json b/haskell-overlays/text-jsstring/dep/aeson/github.json
index 8e79b75fa..488ace20f 100644
--- a/haskell-overlays/text-jsstring/dep/aeson/github.json
+++ b/haskell-overlays/text-jsstring/dep/aeson/github.json
@@ -1,8 +1,8 @@
 {
   "owner": "obsidiansystems",
   "repo": "aeson",
-  "branch": "v1541-text-jsstring",
+  "branch": "v2.1.1.0-text-jsstring",
   "private": false,
-  "rev": "afa2d0b8a3c5bb9ea533929e4c77dd01e8f1fc27",
-  "sha256": "0nsmnc5npkig9mhpj0j7yqydp0nkqq370f2lqskgj5z16d4vc0vm"
+  "rev": "c718cd1150eb9de38a07ad64145be915bfb57e54",
+  "sha256": "13ccw0pqim9zmhsi26ka2a9421r42yba1ray4yds15xwsx5crv5k"
 }
diff --git a/haskell-overlays/untriaged.nix b/haskell-overlays/untriaged.nix
index e3ea2fe85..9fee86415 100644
--- a/haskell-overlays/untriaged.nix
+++ b/haskell-overlays/untriaged.nix
@@ -18,7 +18,7 @@ self: super: {
 
   # These take over an hour to run, each
   cryptonite = dontCheck super.cryptonite;
-  scientific = dontCheck super.scientific;
+  scientific = haskellLib.dontCheck (self.callHackage "scientific" "0.3.7.0" {});
 
   # pandoc 2.16 and dependencies
   pandoc = self.callHackage "pandoc" "2.16.2" {};
@@ -46,7 +46,7 @@ self: super: {
     self.callCabal2nix "hnix" (nixpkgs.hackGet ./hnix/hnix-store + "/hnix-store-core") {};
   hnix-store-remote =
     self.callCabal2nix "hnix" (nixpkgs.hackGet ./hnix/hnix-store + "/hnix-store-remote") {};
-  data-fix = self.callHackage "data-fix" "0.3.0" {};
+  data-fix = self.callHackage "data-fix" "0.3.2" {};
   neat-interpolation = self.callHackage "neat-interpolation" "0.4" {};
   prettyprinter = self.callHackage "prettyprinter" "1.7.0" {};
   cryptohash-sha512 = doJailbreak super.cryptohash-sha512;
@@ -57,4 +57,30 @@ self: super: {
 
   utf8-string = self.callHackage "utf8-string" "1.0.1.1" {};
 
+  # aeson 2 support
+  # jailbreak to allow older primitive version
+  aeson = doJailbreak (self.callHackage "aeson" "2.1.1.0" {});
+  aeson-pretty = overrideCabal (self.callHackage "aeson-pretty" "0.8.9" {}) (drv: {
+    jailbreak = true;
+    # support our version of unordered-containers
+    preConfigure = ''
+      substituteInPlace Data/Aeson/Encode/Pretty.hs \
+        --replace "import qualified Data.HashMap.Strict as H (toList, mapKeys)" "import qualified Data.HashMap.Strict as H (toList)"
+    '';
+  });
+  hashable = self.callHackage "hashable" "1.3.5.0" {};
+  generically = self.callHackage "generically" "0.1" {};
+  OneTuple = self.callHackage "OneTuple" "0.3.1" {};
+  attoparsec = self.callHackage "attoparsec" "0.14.4" {};
+  quickcheck-instances = self.callHackage "quickcheck-instances" "0.3.28" {};
+  vector = self.callHackage "vector" "0.12.3.1" {};
+  indexed-traversable = self.callHackage "indexed-traversable" "0.1.2" {};
+  semialign = self.callHackage "semialign" "1.2.0.1" {};
+  text-short = self.callHackage "text-short" "0.1.5" {};
+  time-compat = self.callHackage "time-compat" "1.9.6.1" {};
+  base-orphans = self.callHackage "base-orphans" "0.8.7" {};
+  yaml = self.callHackage "yaml" "0.11.7.0" {};
+  websockets = self.callHackage "websockets" "0.12.7.3" {};
+  http2 = self.callHackage "http2" "3.0.3" {};
+
 }
diff --git a/nixpkgs-overlays/all-cabal-hashes/default.nix b/nixpkgs-overlays/all-cabal-hashes/default.nix
index 8f0afa9e3..33139e32a 100644
--- a/nixpkgs-overlays/all-cabal-hashes/default.nix
+++ b/nixpkgs-overlays/all-cabal-hashes/default.nix
@@ -1,8 +1,8 @@
 self: _: {
 
   all-cabal-hashes = self.fetchurl {
-    url = https://github.com/commercialhaskell/all-cabal-hashes/archive/bac0fa366110399233b0a0820f9944b95ffc58c8.tar.gz;
-    sha256 = "sha256-xDvCxka8Aqnw09uRXZMiOlY9pKvhGmSg9hlRjMmIPic=";
+    url = https://github.com/commercialhaskell/all-cabal-hashes/archive/75d1bbbd68d9ae36d527666e2f140343323b02fa.tar.gz;
+    sha256 = "018lz90f12bw8n8g4rbwfbnpmw6g3vblc12pd4qzq727h1d27p5l";
   };
 
 }

From 3b34b4de3710d406dd71ab2d820aaccb31ebed92 Mon Sep 17 00:00:00 2001
From: Luigy Leon <luigy@outlook.com>
Date: Fri, 3 Feb 2023 22:55:14 -0500
Subject: [PATCH 05/29] Fix useTextJSString=false build

---
 haskell-overlays/any-8.6.nix                  |  1 -
 haskell-overlays/default.nix                  |  6 ---
 .../attoparsec-rm-internal-lib.patch          | 49 +++++++++++++++++++
 haskell-overlays/ghcjs-8.6/default.nix        | 13 +++--
 haskell-overlays/untriaged.nix                |  3 ++
 5 files changed, 62 insertions(+), 10 deletions(-)
 create mode 100644 haskell-overlays/ghcjs-8.6/attoparsec-rm-internal-lib.patch

diff --git a/haskell-overlays/any-8.6.nix b/haskell-overlays/any-8.6.nix
index b50e49217..1833ca6dd 100644
--- a/haskell-overlays/any-8.6.nix
+++ b/haskell-overlays/any-8.6.nix
@@ -5,7 +5,6 @@ self: super: {
   haddock-library-ghcjs = dontCheck super.haddock-library-ghcjs;
   haddock-api-ghcjs = dontCheck super.haddock-api-ghcjs;
   ghc-lib-parser = self.callHackage "ghc-lib-parser" "8.10.2.20200808" {};
-  hlint = self.callHackage "hlint" "3.2.8" {};
   http-date = dontCheck super.http-date;
   resolv = haskellLib.doJailbreak (super.resolv.override {
     base16-bytestring = super.base16-bytestring_0_1_1_7;
diff --git a/haskell-overlays/default.nix b/haskell-overlays/default.nix
index 87c07e6ae..03f5ac3e7 100644
--- a/haskell-overlays/default.nix
+++ b/haskell-overlays/default.nix
@@ -48,12 +48,6 @@ rec {
     profiling
     untriaged
 
-    # Careful when you touch this, anything modifying ghcjs-base is incredibly fragile
-    (optionalExtension (super.ghc.version == "8.10.7") (self: super: rec {
-      ghcjs-base = self.callHackage "ghcjs-base" "0.2.1.0" { };
-      hlint = self.callHackage "hlint" "3.2.8" {};
-    }))
-
     (optionalExtension enableExposeAllUnfoldings exposeAllUnfoldings)
 
     # Force "gold" on Android due to a linker bug on bfd
diff --git a/haskell-overlays/ghcjs-8.6/attoparsec-rm-internal-lib.patch b/haskell-overlays/ghcjs-8.6/attoparsec-rm-internal-lib.patch
new file mode 100644
index 000000000..df66f855d
--- /dev/null
+++ b/haskell-overlays/ghcjs-8.6/attoparsec-rm-internal-lib.patch
@@ -0,0 +1,49 @@
+diff --git a/attoparsec.cabal b/attoparsec.cabal
+index ecbd5db..4e57b1f 100644
+--- a/attoparsec.cabal
++++ b/attoparsec.cabal
+@@ -34,8 +34,8 @@ Flag developer
+ 
+ -- We need to test and benchmark these modules,
+ -- but do not want to expose them to end users
+-library attoparsec-internal
+-  hs-source-dirs: internal
++library
++  hs-source-dirs: internal, .
+   build-depends: array,
+                  base >= 4.3 && < 5,
+                  bytestring <0.12,
+@@ -51,7 +51,6 @@ library attoparsec-internal
+   ghc-options: -O2 -Wall
+   default-language: Haskell2010
+ 
+-library
+   build-depends: array,
+                  base >= 4.3 && < 5,
+                  bytestring <0.12,
+@@ -60,8 +59,7 @@ library
+                  scientific >= 0.3.1 && < 0.4,
+                  transformers >= 0.2 && (< 0.4 || >= 0.4.1.0) && < 0.7,
+                  text >= 1.1.1.3,
+-                 ghc-prim <0.9,
+-                 attoparsec-internal
++                 ghc-prim <0.9
+   if impl(ghc < 7.4)
+     build-depends:
+       bytestring < 0.10.4.0
+@@ -120,7 +118,6 @@ test-suite attoparsec-tests
+   build-depends:
+     array,
+     attoparsec,
+-    attoparsec-internal,
+     base,
+     bytestring,
+     deepseq >= 1.1,
+@@ -167,7 +164,6 @@ benchmark attoparsec-benchmarks
+   build-depends:
+     array,
+     attoparsec,
+-    attoparsec-internal,
+     base == 4.*,
+     bytestring >= 0.10.4.0,
+     case-insensitive,
diff --git a/haskell-overlays/ghcjs-8.6/default.nix b/haskell-overlays/ghcjs-8.6/default.nix
index 6ad9fe969..a216ca36a 100644
--- a/haskell-overlays/ghcjs-8.6/default.nix
+++ b/haskell-overlays/ghcjs-8.6/default.nix
@@ -70,7 +70,14 @@ self: super: {
   # Haddock internal error
   patch = dontHaddock super.patch;
   # When we don't use text-jsstring, we hit cabal version too new issue.
-  # NOTE(Dylan Green): We need to have an "updated" version of ghcjs-base, although the patch is still needed
-  _ghcjsbase = self.callHackage "ghcjs-base" "0.2.0.3" {};
-  ghcjs-base = if useTextJSString then self._ghcjsbase else appendPatch (self._ghcjsbase) ./ghcjs-base-cabal-version.patch;
+  ghcjs-base = if useTextJSString
+    then super.ghcjs-base
+    else appendPatch super.ghcjs-base ./ghcjs-base-cabal-version.patch;
+  # ghcjs 8.6 has trouble with internal libs usage.
+  attoparsec = overrideCabal (appendPatch super.attoparsec ./attoparsec-rm-internal-lib.patch) {
+    editedCabalFile = null;
+    revision = null;
+    prePatch = "${nixpkgs.buildPackages.dos2unix}/bin/dos2unix attoparsec.cabal";
+  };
+
 }
diff --git a/haskell-overlays/untriaged.nix b/haskell-overlays/untriaged.nix
index 9fee86415..cab44056f 100644
--- a/haskell-overlays/untriaged.nix
+++ b/haskell-overlays/untriaged.nix
@@ -57,6 +57,9 @@ self: super: {
 
   utf8-string = self.callHackage "utf8-string" "1.0.1.1" {};
 
+  ghcjs-base = doJailbreak (self.callHackage "ghcjs-base" "0.2.1.0" {});
+  hlint = self.callHackage "hlint" "3.2.8" {};
+
   # aeson 2 support
   # jailbreak to allow older primitive version
   aeson = doJailbreak (self.callHackage "aeson" "2.1.1.0" {});

From b900c276e3f4f8de2c5d9e2233c5ff3aae774fcf Mon Sep 17 00:00:00 2001
From: Luigy Leon <luigy@outlook.com>
Date: Sat, 4 Feb 2023 01:56:57 -0500
Subject: [PATCH 06/29] Fix HsYAML-aesonn build

---
 haskell-overlays/untriaged.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/haskell-overlays/untriaged.nix b/haskell-overlays/untriaged.nix
index cab44056f..fc5d3014b 100644
--- a/haskell-overlays/untriaged.nix
+++ b/haskell-overlays/untriaged.nix
@@ -85,5 +85,6 @@ self: super: {
   yaml = self.callHackage "yaml" "0.11.7.0" {};
   websockets = self.callHackage "websockets" "0.12.7.3" {};
   http2 = self.callHackage "http2" "3.0.3" {};
+  HsYAML-aeson = self.callHackage "HsYAML-aeson" "0.2.0.1" {};
 
 }

From 791d9152dc1fd7296fe53439e5259476af60be3f Mon Sep 17 00:00:00 2001
From: Luigy Leon <luigy@outlook.com>
Date: Sat, 4 Feb 2023 09:37:20 -0500
Subject: [PATCH 07/29] Fix hoogle

---
 haskell-overlays/untriaged.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/haskell-overlays/untriaged.nix b/haskell-overlays/untriaged.nix
index fc5d3014b..2530149f8 100644
--- a/haskell-overlays/untriaged.nix
+++ b/haskell-overlays/untriaged.nix
@@ -86,5 +86,6 @@ self: super: {
   websockets = self.callHackage "websockets" "0.12.7.3" {};
   http2 = self.callHackage "http2" "3.0.3" {};
   HsYAML-aeson = self.callHackage "HsYAML-aeson" "0.2.0.1" {};
+  hoogle = self.callHackage "hoogle" "5.0.18.3" {};
 
 }

From 348c58c069f3aee5f20d6d0cd861d7ed90b5c6c6 Mon Sep 17 00:00:00 2001
From: Luigy Leon <luigy@outlook.com>
Date: Sat, 4 Feb 2023 13:42:32 -0500
Subject: [PATCH 08/29] Bump hpack and only override hoogle for ghc

---
 haskell-overlays/default.nix   | 4 ++++
 haskell-overlays/untriaged.nix | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/haskell-overlays/default.nix b/haskell-overlays/default.nix
index 03f5ac3e7..4c667ec10 100644
--- a/haskell-overlays/default.nix
+++ b/haskell-overlays/default.nix
@@ -107,6 +107,10 @@ rec {
     super;
 
   combined-ghc = self: super: foldExtensions [
+    (self: super: {
+      hoogle = self.callHackage "hoogle" "5.0.18.3" {};
+      hpack = self.callHackage "hpack" "0.34.5" {};
+    })
     (optionalExtension (versionWildcard [ 8 6 ] super.ghc.version) ghc-8_6)
     (optionalExtension (lib.versionOlder "8.11" super.ghc.version) ghc-head)
   ]
diff --git a/haskell-overlays/untriaged.nix b/haskell-overlays/untriaged.nix
index 2530149f8..fc5d3014b 100644
--- a/haskell-overlays/untriaged.nix
+++ b/haskell-overlays/untriaged.nix
@@ -86,6 +86,5 @@ self: super: {
   websockets = self.callHackage "websockets" "0.12.7.3" {};
   http2 = self.callHackage "http2" "3.0.3" {};
   HsYAML-aeson = self.callHackage "HsYAML-aeson" "0.2.0.1" {};
-  hoogle = self.callHackage "hoogle" "5.0.18.3" {};
 
 }

From b10af8ec883272ecba0c1a61f6e801c4c21df9e3 Mon Sep 17 00:00:00 2001
From: Luigy Leon <luigy@outlook.com>
Date: Sat, 4 Feb 2023 14:04:10 -0500
Subject: [PATCH 09/29] Bump reflex-dom

to relax aeson bounds
---
 haskell-overlays/reflex-packages/dep/reflex-dom/github.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/haskell-overlays/reflex-packages/dep/reflex-dom/github.json b/haskell-overlays/reflex-packages/dep/reflex-dom/github.json
index ba99ceb69..ae4ac2814 100644
--- a/haskell-overlays/reflex-packages/dep/reflex-dom/github.json
+++ b/haskell-overlays/reflex-packages/dep/reflex-dom/github.json
@@ -3,6 +3,6 @@
   "repo": "reflex-dom",
   "branch": "ll/relax-bounds",
   "private": false,
-  "rev": "eea6765f5642949083029f8c3355f7c37331217a",
-  "sha256": "130x9i5nh7hhdgiiz4ii3jyhm2qnjw7r406h585g2sa70z7xjsw4"
+  "rev": "8d7ac07c0dee6de3e8be1faae983cd657ccb04e7",
+  "sha256": "1hwsgp9iggh1qaw69i4q0pv7xbnh6i1jg3gjhd5gsncd69hn8lda"
 }

From f51e2fd9992db99daf1224091b9700dcbc97727f Mon Sep 17 00:00:00 2001
From: Luigy Leon <luigy@outlook.com>
Date: Sun, 5 Feb 2023 13:02:33 -0500
Subject: [PATCH 10/29] Relax jsaddle-wkwebview aeson bounds

---
 haskell-overlays/reflex-packages/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/haskell-overlays/reflex-packages/default.nix b/haskell-overlays/reflex-packages/default.nix
index dd03d91fb..5680ca149 100644
--- a/haskell-overlays/reflex-packages/default.nix
+++ b/haskell-overlays/reflex-packages/default.nix
@@ -129,6 +129,7 @@ in
   });
   jsaddle-webkitgtk = self.callCabal2nix "jsaddle-webkitgtk" (jsaddleSrc + "/jsaddle-webkitgtk") {};
   jsaddle-wkwebview = overrideCabal (self.callCabal2nix "jsaddle-wkwebview" (jsaddleSrc + "/jsaddle-wkwebview") {}) (drv: {
+    preConfigure = "substituteInPlace jsaddle-webkit2gtk.cabal --replace 'aeson >=0.8.0.2 && <2.1' aeson";
     libraryFrameworkDepends = (drv.libraryFrameworkDepends or []) ++
       (if nixpkgs.stdenv.hostPlatform.useiOSPrebuilt then [
          "${nixpkgs.buildPackages.darwin.xcode}/Contents/Developer/Platforms/${nixpkgs.stdenv.hostPlatform.xcodePlatform}.platform/Developer/SDKs/${nixpkgs.stdenv.hostPlatform.xcodePlatform}.sdk/System"

From 0ad8e0dcfee8193517d7846e5c3296dda8e29bef Mon Sep 17 00:00:00 2001
From: Luigy Leon <luigy@outlook.com>
Date: Sun, 5 Feb 2023 13:04:31 -0500
Subject: [PATCH 11/29] fixup

---
 haskell-overlays/reflex-packages/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/haskell-overlays/reflex-packages/default.nix b/haskell-overlays/reflex-packages/default.nix
index 5680ca149..b8f195caa 100644
--- a/haskell-overlays/reflex-packages/default.nix
+++ b/haskell-overlays/reflex-packages/default.nix
@@ -129,7 +129,7 @@ in
   });
   jsaddle-webkitgtk = self.callCabal2nix "jsaddle-webkitgtk" (jsaddleSrc + "/jsaddle-webkitgtk") {};
   jsaddle-wkwebview = overrideCabal (self.callCabal2nix "jsaddle-wkwebview" (jsaddleSrc + "/jsaddle-wkwebview") {}) (drv: {
-    preConfigure = "substituteInPlace jsaddle-webkit2gtk.cabal --replace 'aeson >=0.8.0.2 && <2.1' aeson";
+    preConfigure = "substituteInPlace jsaddle-wkwebview.cabal --replace 'aeson >=0.8.0.2 && <2.1' aeson";
     libraryFrameworkDepends = (drv.libraryFrameworkDepends or []) ++
       (if nixpkgs.stdenv.hostPlatform.useiOSPrebuilt then [
          "${nixpkgs.buildPackages.darwin.xcode}/Contents/Developer/Platforms/${nixpkgs.stdenv.hostPlatform.xcodePlatform}.platform/Developer/SDKs/${nixpkgs.stdenv.hostPlatform.xcodePlatform}.sdk/System"

From 2e849c2af8dbb5c8e453911d40c9371705154aa6 Mon Sep 17 00:00:00 2001
From: Luigy Leon <luigy@outlook.com>
Date: Mon, 6 Feb 2023 11:42:14 -0500
Subject: [PATCH 12/29] Update attoparsec text-jsstring patch for ghcjs-8.10

---
 .../text-jsstring-8.10/dep/attoparsec/github.json         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/haskell-overlays/text-jsstring-8.10/dep/attoparsec/github.json b/haskell-overlays/text-jsstring-8.10/dep/attoparsec/github.json
index 682ad1b30..6b0337caf 100644
--- a/haskell-overlays/text-jsstring-8.10/dep/attoparsec/github.json
+++ b/haskell-overlays/text-jsstring-8.10/dep/attoparsec/github.json
@@ -1,8 +1,8 @@
 {
-  "owner": "dfordivam",
+  "owner": "obsidiansystems",
   "repo": "attoparsec",
-  "branch": "text-jsstring",
+  "branch": "v0.14.4-text-jsstring",
   "private": false,
-  "rev": "cbfb944aeff61144059a28ada93c579e93ccf7d2",
-  "sha256": "0bbr4943439sy3grwpwbna4mk7iv87ijaiv3jjfhxhp7y67z51h8"
+  "rev": "4dddf2d3160722ae088cba1ac3953353c4dfb785",
+  "sha256": "09qs91pclcm8f000fh3knl3kp6fqm8dbymxs8pg28qfb96h3p9n8"
 }

From 4ba5fe638c99634471aad566f31ace64e885f7e5 Mon Sep 17 00:00:00 2001
From: Luigy Leon <luigy@outlook.com>
Date: Mon, 6 Feb 2023 13:55:10 -0500
Subject: [PATCH 13/29] Cleanups

---
 haskell-overlays/reflex-packages/default.nix | 6 +++---
 haskell-overlays/untriaged.nix               | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/haskell-overlays/reflex-packages/default.nix b/haskell-overlays/reflex-packages/default.nix
index b8f195caa..c2ade1882 100644
--- a/haskell-overlays/reflex-packages/default.nix
+++ b/haskell-overlays/reflex-packages/default.nix
@@ -39,12 +39,12 @@ in
   ## Reflex family
   ##
 
-  reflex = nixpkgs.haskell.lib.doJailbreak (self.callCabal2nixWithOptions "reflex" self._dep.reflex (lib.concatStringsSep " " (lib.concatLists [
+  reflex = self.callCabal2nixWithOptions "reflex" self._dep.reflex (lib.concatStringsSep " " (lib.concatLists [
     (lib.optional enableTraceReflexEvents "-fdebug-trace-events")
     reflexOptimizerFlag
     useTemplateHaskellFlag
     (lib.optional useFastWeak "-ffast-weak")
-  ])) {});
+  ])) {};
 
   reflex-todomvc = self.callPackage self._dep.reflex-todomvc {};
   reflex-aeson-orphans = self.callCabal2nix "reflex-aeson-orphans" self._dep.reflex-aeson-orphans {};
@@ -173,7 +173,7 @@ in
   ##
 
   haskell-gi-overloading = dontHaddock (self.callHackage "haskell-gi-overloading" "0.0" {});
-  monoidal-containers = doJailbreak (self.callHackage "monoidal-containers" "0.6.2.0" {});
+  monoidal-containers = self.callHackage "monoidal-containers" "0.6.3.0" {};
   patch = self.callCabal2nix "patch" self._dep.patch {};
   commutative-semigroups = self.callCabal2nix "commutative-semigroups" self._dep.commutative-semigroups {};
   witherable = self.callHackage "witherable" "0.4.2" {};
diff --git a/haskell-overlays/untriaged.nix b/haskell-overlays/untriaged.nix
index fc5d3014b..ba68ebb53 100644
--- a/haskell-overlays/untriaged.nix
+++ b/haskell-overlays/untriaged.nix
@@ -18,7 +18,7 @@ self: super: {
 
   # These take over an hour to run, each
   cryptonite = dontCheck super.cryptonite;
-  scientific = haskellLib.dontCheck (self.callHackage "scientific" "0.3.7.0" {});
+  scientific = dontCheck (self.callHackage "scientific" "0.3.7.0" {});
 
   # pandoc 2.16 and dependencies
   pandoc = self.callHackage "pandoc" "2.16.2" {};

From 03ac7c7c06c1298287ef39a4f885ca8b7ac511c8 Mon Sep 17 00:00:00 2001
From: Ali Abrar <ali.abrar@obsidian.systems>
Date: Mon, 22 May 2023 09:14:20 -0400
Subject: [PATCH 14/29] haskell-overlays: reflex-dom-core -> 0.7.0.3

---
 ChangeLog.md                                              | 5 ++++-
 .../reflex-packages/dep/reflex-dom/github.json            | 8 ++++----
 haskell-overlays/reflex-packages/dep/reflex-dom/thunk.nix | 5 ++++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 05902f8d3..904bd7449 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -2,9 +2,12 @@
 
 This project's release branch is `master`. This log is written from the perspective of the release branch: when changes hit `master`, they are considered released.
 
-## Unreleased
+## v1.0.1.0
 
 * iOS: Bump SDK version from 15.0 -> 16.1
+* Haskell Library Updates
+  * reflex-dom-core to 0.7.0.3
+  * aeson to 2.1.1.0
 
 ## v1.0.0.0
 
diff --git a/haskell-overlays/reflex-packages/dep/reflex-dom/github.json b/haskell-overlays/reflex-packages/dep/reflex-dom/github.json
index ae4ac2814..0b6e5a28b 100644
--- a/haskell-overlays/reflex-packages/dep/reflex-dom/github.json
+++ b/haskell-overlays/reflex-packages/dep/reflex-dom/github.json
@@ -1,8 +1,8 @@
 {
-  "owner": "luigy",
+  "owner": "reflex-frp",
   "repo": "reflex-dom",
-  "branch": "ll/relax-bounds",
+  "branch": "release/reflex-dom-core/0.7.0.3",
   "private": false,
-  "rev": "8d7ac07c0dee6de3e8be1faae983cd657ccb04e7",
-  "sha256": "1hwsgp9iggh1qaw69i4q0pv7xbnh6i1jg3gjhd5gsncd69hn8lda"
+  "rev": "3b379600f8d74ce732ef54d62fb0a48ffbd559f9",
+  "sha256": "17d1h2fygnk95h07fs8js2hkxm3jzfw5jzd4hd7f1j9vc6sc2plz"
 }
diff --git a/haskell-overlays/reflex-packages/dep/reflex-dom/thunk.nix b/haskell-overlays/reflex-packages/dep/reflex-dom/thunk.nix
index bbf2dc18f..20f2d28c2 100644
--- a/haskell-overlays/reflex-packages/dep/reflex-dom/thunk.nix
+++ b/haskell-overlays/reflex-packages/dep/reflex-dom/thunk.nix
@@ -2,7 +2,10 @@
 let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
   if !fetchSubmodules && !private then builtins.fetchTarball {
     url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
-  } else (import <nixpkgs> {}).fetchFromGitHub {
+  } else (import (builtins.fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
+  sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
+}) {}).fetchFromGitHub {
     inherit owner repo rev sha256 fetchSubmodules private;
   };
   json = builtins.fromJSON (builtins.readFile ./github.json);

From dfe69c12a7eb036ce6e6fe6cc290dadaf383c924 Mon Sep 17 00:00:00 2001
From: Ali Abrar <ali.abrar@obsidian.systems>
Date: Thu, 25 May 2023 09:21:05 -0400
Subject: [PATCH 15/29] haskell-overlays: reflex-0.9.0.1, reflex-vty-0.4.1.1,
 reflex-dom-core-0.8

Also update all-cabal-hashes
---
 ChangeLog.md                                             | 9 +++++++++
 default.nix                                              | 7 +++----
 haskell-overlays/reflex-packages/dep/patch/github.json   | 6 +++---
 .../reflex-packages/dep/reflex-dom/github.json           | 6 +++---
 .../reflex-packages/dep/reflex-vty/github.json           | 6 +++---
 haskell-overlays/reflex-packages/dep/reflex/github.json  | 6 +++---
 nixpkgs-overlays/all-cabal-hashes/default.nix            | 5 ++---
 7 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 904bd7449..4deb1c547 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -2,6 +2,15 @@
 
 This project's release branch is `master`. This log is written from the perspective of the release branch: when changes hit `master`, they are considered released.
 
+## v1.1.0.0
+
+* *Breaking change*: GHC 8.10.7 is now selected by default. Set `__useNewerCompiler` in default.nix to false if you'd like to keep using GHC 8.6.5.
+* Haskell Library Updates
+  * all-cabal-hashes "Update from Hackage at 2023-05-25T12:06:44Z" ([f297f1f3](https://github.com/commercialhaskell/all-cabal-hashes/commit/f297f1f3fc337e2f94783f254cb6db1ee2022adb))
+  * reflex 0.9.0.1
+  * reflex-dom-core 0.8.0.0
+  * reflex-vty 0.4.1.1
+
 ## v1.0.1.0
 
 * iOS: Bump SDK version from 15.0 -> 16.1
diff --git a/default.nix b/default.nix
index a400b1af8..d2c28b2da 100644
--- a/default.nix
+++ b/default.nix
@@ -8,7 +8,7 @@
 , useReflexOptimizer ? false
 , useTextJSString ? true # Use an implementation of "Data.Text" that uses the more performant "Data.JSString" from ghcjs-base under the hood.
 , __useTemplateHaskell ? true # Deprecated, just here until we remove feature from reflex and stop CIing it
-, __useNewerCompiler ? false
+, __useNewerCompiler ? true
 , iosSdkVersion ? "16.1"
 , nixpkgsOverlays ? []
 , haskellOverlays ? [] # TODO deprecate
@@ -330,14 +330,13 @@ let iosSupport = system == "x86_64-darwin";
   ghcAndroidAarch32-8_10 = makeRecursivelyOverridableBHPToo ((makeRecursivelyOverridable nixpkgsCross.android.aarch32.haskell.packages.integer-simple.ghcSplices-8_10).override {
     overrides = nixpkgsCross.android.aarch32.haskell.overlays.combined;
   });
-
-  ghcIosSimulator64 = if __useNewerCompiler then ghcIosSimulator64-8_10 else ghcIosSimulator64-8_6;
   ghcIosSimulator64-8_6 = makeRecursivelyOverridableBHPToo ((makeRecursivelyOverridable nixpkgsCross.ios.simulator64.haskell.packages.integer-simple.ghcSplices-8_6).override {
     overrides = nixpkgsCross.ios.simulator64.haskell.overlays.combined;
   });
   ghcIosSimulator64-8_10 = makeRecursivelyOverridableBHPToo ((makeRecursivelyOverridable nixpkgsCross.ios.simulator64.haskell.packages.integer-simple.ghcSplices-8_10).override {
     overrides = nixpkgsCross.ios.simulator64.haskell.overlays.combined;
   });
+  ghcIosSimulator64 = if __useNewerCompiler then ghcIosSimulator64-8_10 else ghcIosSimulator64-8_6;
   ghcIosAarch64 = if __useNewerCompiler then ghcIosAarch64-8_10 else ghcIosAarch64-8_6;
   ghcIosAarch64-8_6 = makeRecursivelyOverridableBHPToo ((makeRecursivelyOverridable nixpkgsCross.ios.aarch64.haskell.packages.integer-simple.ghcSplices-8_6).override {
     overrides = nixpkgsCross.ios.aarch64.haskell.overlays.combined;
@@ -593,7 +592,7 @@ in let this = rec {
 };
 
 # Deprecated reexports. These were made for `./scripts/*`, but are reexported
-# here for backwards compatability.
+# here for backwards compatibility.
 legacy = {
   # Added 2019-12, will be removed 2020-06.
   inherit
diff --git a/haskell-overlays/reflex-packages/dep/patch/github.json b/haskell-overlays/reflex-packages/dep/patch/github.json
index f67d50afc..0ece292a0 100644
--- a/haskell-overlays/reflex-packages/dep/patch/github.json
+++ b/haskell-overlays/reflex-packages/dep/patch/github.json
@@ -1,8 +1,8 @@
 {
   "owner": "reflex-frp",
   "repo": "patch",
-  "branch": "release/0.0.8.0",
+  "branch": "release/0.0.8.2",
   "private": false,
-  "rev": "054b12f99973c4636a2784c1db2c19e92f868492",
-  "sha256": "01c9vwyd0l9llqpqggkiggzwc32l4wfwkjqh1wyasxkw7y7zs97z"
+  "rev": "35af1b3a032858bafd6fd5cfc07523f1d4208b5d",
+  "sha256": "002h0n8ii834lj69gmbrkjgd99ajpyp97gbpq1hr3k0b3ckpwa4i"
 }
diff --git a/haskell-overlays/reflex-packages/dep/reflex-dom/github.json b/haskell-overlays/reflex-packages/dep/reflex-dom/github.json
index 0b6e5a28b..5316dd5c9 100644
--- a/haskell-overlays/reflex-packages/dep/reflex-dom/github.json
+++ b/haskell-overlays/reflex-packages/dep/reflex-dom/github.json
@@ -1,8 +1,8 @@
 {
   "owner": "reflex-frp",
   "repo": "reflex-dom",
-  "branch": "release/reflex-dom-core/0.7.0.3",
+  "branch": "release/reflex-dom-core/0.8.0.0",
   "private": false,
-  "rev": "3b379600f8d74ce732ef54d62fb0a48ffbd559f9",
-  "sha256": "17d1h2fygnk95h07fs8js2hkxm3jzfw5jzd4hd7f1j9vc6sc2plz"
+  "rev": "e43faf868d4e3f07622441b1cc40ec8ece53dd6a",
+  "sha256": "0h1fsz77csyfbxw4k6r7bgm4fv6b3gmi0bsn110vry4ws5mnpnq8"
 }
diff --git a/haskell-overlays/reflex-packages/dep/reflex-vty/github.json b/haskell-overlays/reflex-packages/dep/reflex-vty/github.json
index 2b1c4ee4c..2b70ceb0b 100644
--- a/haskell-overlays/reflex-packages/dep/reflex-vty/github.json
+++ b/haskell-overlays/reflex-packages/dep/reflex-vty/github.json
@@ -1,8 +1,8 @@
 {
   "owner": "reflex-frp",
   "repo": "reflex-vty",
-  "branch": "release/0.3.0.0",
+  "branch": "release/0.4.1.1",
   "private": false,
-  "rev": "bf12e274d233ddb823d6bea0928dfdd4d38de44e",
-  "sha256": "1z3ji3nhviyrd55dz562kh809cbxjc6vdbhdaavn1h3wcsqf4f7l"
+  "rev": "d8c402ac6ece57008a99269f640cae617eb13688",
+  "sha256": "1hc17c4b0p99vgjgjy3xq72qxgxgdjfh7qq16yq6vjqihcmly6k0"
 }
diff --git a/haskell-overlays/reflex-packages/dep/reflex/github.json b/haskell-overlays/reflex-packages/dep/reflex/github.json
index 92540ed3d..7bc5c5e99 100644
--- a/haskell-overlays/reflex-packages/dep/reflex/github.json
+++ b/haskell-overlays/reflex-packages/dep/reflex/github.json
@@ -1,8 +1,8 @@
 {
   "owner": "reflex-frp",
   "repo": "reflex",
-  "branch": "release/0.8.2.2",
+  "branch": "release/0.9.0.1",
   "private": false,
-  "rev": "0166290bf680cc55fc30cd0cd701275f61de2f7e",
-  "sha256": "087vfjfqr0v7jq3id9hqrcf34fi2q1myab9p9gsnpsd1dvg12k8k"
+  "rev": "2fb31a258b06d5f79204ccec89be0dbeee64177e",
+  "sha256": "0nbnyli3pma8rfps7v9ddvivj3vp1rqk4j646bpwmh47nn0grql1"
 }
diff --git a/nixpkgs-overlays/all-cabal-hashes/default.nix b/nixpkgs-overlays/all-cabal-hashes/default.nix
index 33139e32a..c2e7be659 100644
--- a/nixpkgs-overlays/all-cabal-hashes/default.nix
+++ b/nixpkgs-overlays/all-cabal-hashes/default.nix
@@ -1,8 +1,7 @@
 self: _: {
 
   all-cabal-hashes = self.fetchurl {
-    url = https://github.com/commercialhaskell/all-cabal-hashes/archive/75d1bbbd68d9ae36d527666e2f140343323b02fa.tar.gz;
-    sha256 = "018lz90f12bw8n8g4rbwfbnpmw6g3vblc12pd4qzq727h1d27p5l";
+    url = https://github.com/commercialhaskell/all-cabal-hashes/archive/f297f1f3fc337e2f94783f254cb6db1ee2022adb.tar.gz;
+    sha256 = "sha256-j2HovXCSBkPircuu6N0ZVTIFUTvET7UC4eaiRITrk2g=";
   };
-
 }

From 344fa2d58d8ea7005b086bb77fa4f6676d85c4d7 Mon Sep 17 00:00:00 2001
From: cidkidnix <cidkidnix@protonmail.com>
Date: Fri, 26 May 2023 10:16:29 -0500
Subject: [PATCH 16/29] Add ghcIosSimulator* to 'this'

---
 default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/default.nix b/default.nix
index d2c28b2da..d01dbf3cb 100644
--- a/default.nix
+++ b/default.nix
@@ -396,6 +396,8 @@ in let this = rec {
           ghc8_6
           ghc8_10
           ghcIosSimulator64
+          ghcIosSimulator64-8_6
+          ghcIosSimulator64-8_10
           ghcIosAarch64
           ghcIosAarch64-8_6
           ghcIosAarch64-8_10

From 6758f84ae56f6775031fc977c19cd013b7acec05 Mon Sep 17 00:00:00 2001
From: Ali Abrar <ali.abrar@obsidian.systems>
Date: Fri, 26 May 2023 11:25:13 -0400
Subject: [PATCH 17/29] example: Update reflex-project-skeleton to work with
 ghc810

---
 examples/project/reflex-project-skeleton/github.json | 6 +++---
 examples/project/reflex-project-skeleton/thunk.nix   | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/examples/project/reflex-project-skeleton/github.json b/examples/project/reflex-project-skeleton/github.json
index 44f6e6fdf..10c5bbc94 100644
--- a/examples/project/reflex-project-skeleton/github.json
+++ b/examples/project/reflex-project-skeleton/github.json
@@ -1,8 +1,8 @@
 {
   "owner": "obsidiansystems",
   "repo": "reflex-project-skeleton",
+  "branch": "master",
   "private": false,
-  "fetchSubmodules": false,
-  "rev": "30d29322d74e98d189b755c3d25fffecfee32fe1",
-  "sha256": "14vcmi3bdmlcj228wj0hzjyqmixyfrd0ch8qzp2655kzik7dbgga"
+  "rev": "62a1c81f094bf39e694b03ac5aecc5ab13605955",
+  "sha256": "0cahpv5s2jcwb6qhyl7d35f4vj340hv0cki39vf1zhpcxnymamkv"
 }
diff --git a/examples/project/reflex-project-skeleton/thunk.nix b/examples/project/reflex-project-skeleton/thunk.nix
index bbf2dc18f..20f2d28c2 100644
--- a/examples/project/reflex-project-skeleton/thunk.nix
+++ b/examples/project/reflex-project-skeleton/thunk.nix
@@ -2,7 +2,10 @@
 let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
   if !fetchSubmodules && !private then builtins.fetchTarball {
     url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
-  } else (import <nixpkgs> {}).fetchFromGitHub {
+  } else (import (builtins.fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
+  sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
+}) {}).fetchFromGitHub {
     inherit owner repo rev sha256 fetchSubmodules private;
   };
   json = builtins.fromJSON (builtins.readFile ./github.json);

From 48169408fbceb0617e30a0ec038d189997bc7f9d Mon Sep 17 00:00:00 2001
From: Ali Abrar <ali.abrar@obsidian.systems>
Date: Fri, 26 May 2023 11:28:22 -0400
Subject: [PATCH 18/29] haskell-overlays: update reflex-process and
 reflex-fsnotify

---
 ChangeLog.md                                         |  2 ++
 haskell-overlays/reflex-packages/default.nix         |  2 +-
 .../reflex-packages/dep/reflex-fsnotify/default.nix  |  2 ++
 .../reflex-packages/dep/reflex-fsnotify/github.json  |  8 ++++++++
 .../reflex-packages/dep/reflex-fsnotify/thunk.nix    | 12 ++++++++++++
 .../reflex-packages/dep/reflex-process/github.json   |  6 +++---
 6 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 haskell-overlays/reflex-packages/dep/reflex-fsnotify/default.nix
 create mode 100644 haskell-overlays/reflex-packages/dep/reflex-fsnotify/github.json
 create mode 100644 haskell-overlays/reflex-packages/dep/reflex-fsnotify/thunk.nix

diff --git a/ChangeLog.md b/ChangeLog.md
index 4deb1c547..23c69ca71 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -10,6 +10,8 @@ This project's release branch is `master`. This log is written from the perspect
   * reflex 0.9.0.1
   * reflex-dom-core 0.8.0.0
   * reflex-vty 0.4.1.1
+  * reflex-fsnotify 0.3.0.0
+  * reflex-process 0.3.1.2-r1
 
 ## v1.0.1.0
 
diff --git a/haskell-overlays/reflex-packages/default.nix b/haskell-overlays/reflex-packages/default.nix
index c2ade1882..091e4b181 100644
--- a/haskell-overlays/reflex-packages/default.nix
+++ b/haskell-overlays/reflex-packages/default.nix
@@ -110,7 +110,7 @@ in
 
   reflex-vty = self.callCabal2nix "reflex-vty" self._dep.reflex-vty {};
   reflex-process = self.callCabal2nix "reflex-process" self._dep.reflex-process {};
-  reflex-fsnotify = self.callHackage "reflex-fsnotify" "0.2.1.2" {};
+  reflex-fsnotify = self.callCabal2nix "reflex-fsnotify" self._dep.reflex-fsnotify {};
 
   ##
   ## Tooling
diff --git a/haskell-overlays/reflex-packages/dep/reflex-fsnotify/default.nix b/haskell-overlays/reflex-packages/dep/reflex-fsnotify/default.nix
new file mode 100644
index 000000000..2b4d4ab11
--- /dev/null
+++ b/haskell-overlays/reflex-packages/dep/reflex-fsnotify/default.nix
@@ -0,0 +1,2 @@
+# DO NOT HAND-EDIT THIS FILE
+import (import ./thunk.nix)
\ No newline at end of file
diff --git a/haskell-overlays/reflex-packages/dep/reflex-fsnotify/github.json b/haskell-overlays/reflex-packages/dep/reflex-fsnotify/github.json
new file mode 100644
index 000000000..fcc672feb
--- /dev/null
+++ b/haskell-overlays/reflex-packages/dep/reflex-fsnotify/github.json
@@ -0,0 +1,8 @@
+{
+  "owner": "reflex-frp",
+  "repo": "reflex-fsnotify",
+  "branch": "release/0.3.0.0",
+  "private": false,
+  "rev": "f75d5f4ae0a50c47fe245fc0c46d2d0fa5dbf8e8",
+  "sha256": "19l8b4psd9lhdkd51f9arg6y5l1gdjwx5pq9r6jbabib2i7dkn4m"
+}
diff --git a/haskell-overlays/reflex-packages/dep/reflex-fsnotify/thunk.nix b/haskell-overlays/reflex-packages/dep/reflex-fsnotify/thunk.nix
new file mode 100644
index 000000000..20f2d28c2
--- /dev/null
+++ b/haskell-overlays/reflex-packages/dep/reflex-fsnotify/thunk.nix
@@ -0,0 +1,12 @@
+# DO NOT HAND-EDIT THIS FILE
+let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
+  if !fetchSubmodules && !private then builtins.fetchTarball {
+    url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
+  } else (import (builtins.fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
+  sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
+}) {}).fetchFromGitHub {
+    inherit owner repo rev sha256 fetchSubmodules private;
+  };
+  json = builtins.fromJSON (builtins.readFile ./github.json);
+in fetch json
\ No newline at end of file
diff --git a/haskell-overlays/reflex-packages/dep/reflex-process/github.json b/haskell-overlays/reflex-packages/dep/reflex-process/github.json
index 4896d49f3..ac3d0b756 100644
--- a/haskell-overlays/reflex-packages/dep/reflex-process/github.json
+++ b/haskell-overlays/reflex-packages/dep/reflex-process/github.json
@@ -1,8 +1,8 @@
 {
   "owner": "reflex-frp",
   "repo": "reflex-process",
-  "branch": "release/0.3.1.2",
+  "branch": "release/0.3.1.2-r1",
   "private": false,
-  "rev": "5642543d14950b99bde8b046e4582cedda158e2b",
-  "sha256": "044xm2w6dkjdw38n41b4362ax1yhwyhbcv35xg8hrsj51dyls79d"
+  "rev": "6fcc24d293effa49a18fdbc32df2e6ceb5fcb969",
+  "sha256": "0pm4d622nq4ya2hw2ayhinrcklvdva4ids6hhk18ks8wqa24g1w6"
 }

From 92c5f6607c8c1e860ed2cdc2ac05e247d2b525f9 Mon Sep 17 00:00:00 2001
From: Ali Abrar <ali.abrar@obsidian.systems>
Date: Fri, 26 May 2023 15:11:17 -0400
Subject: [PATCH 19/29] haskell-overlays: update beam packages, fsnotify

---
 ChangeLog.md                   |  4 ++++
 haskell-overlays/untriaged.nix | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 23c69ca71..b265ccee7 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -12,6 +12,10 @@ This project's release branch is `master`. This log is written from the perspect
   * reflex-vty 0.4.1.1
   * reflex-fsnotify 0.3.0.0
   * reflex-process 0.3.1.2-r1
+  * beam-core 0.10.0.0
+  * beam-migrate 0.5.2.0
+  * beam-postgres 0.5.3.0
+  * beam-automigrate 0.1.3.0
 
 ## v1.0.1.0
 
diff --git a/haskell-overlays/untriaged.nix b/haskell-overlays/untriaged.nix
index 9d8bc2b57..e095b2fe4 100644
--- a/haskell-overlays/untriaged.nix
+++ b/haskell-overlays/untriaged.nix
@@ -31,10 +31,10 @@ self: super: {
   unicode-collation = self.callHackage "unicode-collation" "0.1.3.1" {};
 
   # beam packages
-  beam-core = self.callHackage "beam-core" "0.9.1.0" {};
-  beam-migrate = self.callHackage "beam-migrate" "0.5.1.0" {};
-  beam-postgres = haskellLib.dontCheck (self.callHackage "beam-postgres" "0.5.1.0" {});
-  beam-automigrate = self.callHackage "beam-automigrate" "0.1.2.0" {};
+  beam-core = self.callHackage "beam-core" "0.10.0.0" {};
+  beam-migrate = self.callHackage "beam-migrate" "0.5.2.0" {};
+  beam-postgres = haskellLib.dontCheck (self.callHackage "beam-postgres" "0.5.3.0" {});
+  beam-automigrate = self.callHackage "beam-automigrate" "0.1.3.0" {};
 
   # hnix 0.12 and dependencies
   hnix = dontCheck
@@ -87,5 +87,5 @@ self: super: {
   http2 = self.callHackage "http2" "3.0.3" {};
   HsYAML-aeson = self.callHackage "HsYAML-aeson" "0.2.0.1" {};
   fsnotify = self.callHackage "fsnotify" "0.4.1.0" {};
-
+  unliftio = self.callHackage "unliftio" "0.2.24.0" {};
 }

From 76edc6f0e5ced652b7b0e579538c2f7db0fdda2a Mon Sep 17 00:00:00 2001
From: Ali Abrar <ali.abrar@obsidian.systems>
Date: Fri, 26 May 2023 15:17:29 -0400
Subject: [PATCH 20/29] haskell-overlays: update sandwich

---
 haskell-overlays/untriaged.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/haskell-overlays/untriaged.nix b/haskell-overlays/untriaged.nix
index e095b2fe4..90e1ffa63 100644
--- a/haskell-overlays/untriaged.nix
+++ b/haskell-overlays/untriaged.nix
@@ -88,4 +88,5 @@ self: super: {
   HsYAML-aeson = self.callHackage "HsYAML-aeson" "0.2.0.1" {};
   fsnotify = self.callHackage "fsnotify" "0.4.1.0" {};
   unliftio = self.callHackage "unliftio" "0.2.24.0" {};
+  sandwich = self.callHackage "sandwich" "0.1.0.6" {};
 }

From d4e30043bfff3148320e188e135316f8d02c0e36 Mon Sep 17 00:00:00 2001
From: Ali Abrar <ali.abrar@obsidian.systems>
Date: Fri, 26 May 2023 15:25:08 -0400
Subject: [PATCH 21/29] haskell-overlays: fix reflex-dom thunk

---
 haskell-overlays/reflex-packages/dep/reflex-dom/github.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/haskell-overlays/reflex-packages/dep/reflex-dom/github.json b/haskell-overlays/reflex-packages/dep/reflex-dom/github.json
index 5316dd5c9..9fd99e604 100644
--- a/haskell-overlays/reflex-packages/dep/reflex-dom/github.json
+++ b/haskell-overlays/reflex-packages/dep/reflex-dom/github.json
@@ -3,6 +3,6 @@
   "repo": "reflex-dom",
   "branch": "release/reflex-dom-core/0.8.0.0",
   "private": false,
-  "rev": "e43faf868d4e3f07622441b1cc40ec8ece53dd6a",
-  "sha256": "0h1fsz77csyfbxw4k6r7bgm4fv6b3gmi0bsn110vry4ws5mnpnq8"
+  "rev": "f14e954310115cd0d2d1679e1059a3e588ad4762",
+  "sha256": "0fdil74zq7d6drc1lzx3nfdsajqfw5p3llqkakvh6ga207s8ll97"
 }

From fbad79d203e2d65b10c1866da9f6e8899859c4c6 Mon Sep 17 00:00:00 2001
From: Ali Abrar <ali.abrar@obsidian.systems>
Date: Fri, 26 May 2023 15:49:19 -0400
Subject: [PATCH 22/29] haskell-overlays: misc packages

---
 haskell-overlays/untriaged.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/haskell-overlays/untriaged.nix b/haskell-overlays/untriaged.nix
index 90e1ffa63..c214ad02a 100644
--- a/haskell-overlays/untriaged.nix
+++ b/haskell-overlays/untriaged.nix
@@ -89,4 +89,6 @@ self: super: {
   fsnotify = self.callHackage "fsnotify" "0.4.1.0" {};
   unliftio = self.callHackage "unliftio" "0.2.24.0" {};
   sandwich = self.callHackage "sandwich" "0.1.0.6" {};
+  ghcid = self.callHackage "ghcid" "0.8.8" {};
+  postgresql-simple = self.callHackage "postgresql-simple" "0.6.5" {};
 }

From 384191d6f924a52d523aab863f7f39331fde9008 Mon Sep 17 00:00:00 2001
From: Ali Abrar <ali.abrar@obsidian.systems>
Date: Tue, 27 Jun 2023 00:42:40 -0400
Subject: [PATCH 23/29] haskell-overlays: reflex-process -> 0.3.2.0

---
 ChangeLog.md                                                | 2 +-
 .../reflex-packages/dep/reflex-process/github.json          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index b265ccee7..ce03b3d1b 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -11,7 +11,7 @@ This project's release branch is `master`. This log is written from the perspect
   * reflex-dom-core 0.8.0.0
   * reflex-vty 0.4.1.1
   * reflex-fsnotify 0.3.0.0
-  * reflex-process 0.3.1.2-r1
+  * reflex-process 0.3.2.0
   * beam-core 0.10.0.0
   * beam-migrate 0.5.2.0
   * beam-postgres 0.5.3.0
diff --git a/haskell-overlays/reflex-packages/dep/reflex-process/github.json b/haskell-overlays/reflex-packages/dep/reflex-process/github.json
index ac3d0b756..e10c11489 100644
--- a/haskell-overlays/reflex-packages/dep/reflex-process/github.json
+++ b/haskell-overlays/reflex-packages/dep/reflex-process/github.json
@@ -1,8 +1,8 @@
 {
   "owner": "reflex-frp",
   "repo": "reflex-process",
-  "branch": "release/0.3.1.2-r1",
+  "branch": "release/0.3.2.0",
   "private": false,
-  "rev": "6fcc24d293effa49a18fdbc32df2e6ceb5fcb969",
-  "sha256": "0pm4d622nq4ya2hw2ayhinrcklvdva4ids6hhk18ks8wqa24g1w6"
+  "rev": "b1e0606ec895f3942b8d8aae7a011f69062cb1c5",
+  "sha256": "0i15z9nlkprxq84sh5w159lq67z51q1ml3g89icir8l6biasymx4"
 }

From 833b7d70fd2b58ffdc48e362dc1ba01a7a7dbd41 Mon Sep 17 00:00:00 2001
From: Ali Abrar <ali.abrar@obsidian.systems>
Date: Tue, 27 Jun 2023 09:00:54 -0400
Subject: [PATCH 24/29] reflex-ghci -> 0.2.0.0

---
 ChangeLog.md                                                | 1 +
 .../reflex-packages/dep/reflex-ghci/github.json             | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index ce03b3d1b..6e8a7ba32 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -9,6 +9,7 @@ This project's release branch is `master`. This log is written from the perspect
   * all-cabal-hashes "Update from Hackage at 2023-05-25T12:06:44Z" ([f297f1f3](https://github.com/commercialhaskell/all-cabal-hashes/commit/f297f1f3fc337e2f94783f254cb6db1ee2022adb))
   * reflex 0.9.0.1
   * reflex-dom-core 0.8.0.0
+  * reflex-ghci 0.2.0.0
   * reflex-vty 0.4.1.1
   * reflex-fsnotify 0.3.0.0
   * reflex-process 0.3.2.0
diff --git a/haskell-overlays/reflex-packages/dep/reflex-ghci/github.json b/haskell-overlays/reflex-packages/dep/reflex-ghci/github.json
index fd5efe2cd..fec038d11 100644
--- a/haskell-overlays/reflex-packages/dep/reflex-ghci/github.json
+++ b/haskell-overlays/reflex-packages/dep/reflex-ghci/github.json
@@ -1,8 +1,8 @@
 {
   "owner": "reflex-frp",
   "repo": "reflex-ghci",
-  "branch": "release/0.1.5.4",
+  "branch": "release/0.2.0.0",
   "private": false,
-  "rev": "ae6fbd8fd5990005c2afd18cb22c99ba11c6dbc4",
-  "sha256": "0zvb71188sacvwwkadv1b9zvl2w3yzgv7dpgp8hvcxdk20wp1n7h"
+  "rev": "dbef3dd7075e4e0b0499bf00d686123512961009",
+  "sha256": "1lnaij8i3aslk9v2r7sssfihz5cc3climw6s4p1qgkfifzdjljff"
 }

From ee6a6b49df624fe77731e010714ff8f0c43edb80 Mon Sep 17 00:00:00 2001
From: cidkidnix <cidkidnix@protonmail.com>
Date: Tue, 27 Jun 2023 13:00:35 -0500
Subject: [PATCH 25/29] Disable iOSSimulator

---
 nix-utils/benchmark/dep/js-framework-benchmark/git.json | 2 +-
 nixpkgs-overlays/hack-get/default.nix                   | 2 +-
 release.nix                                             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nix-utils/benchmark/dep/js-framework-benchmark/git.json b/nix-utils/benchmark/dep/js-framework-benchmark/git.json
index e59d2a253..29830ef61 100644
--- a/nix-utils/benchmark/dep/js-framework-benchmark/git.json
+++ b/nix-utils/benchmark/dep/js-framework-benchmark/git.json
@@ -1,5 +1,5 @@
 {
-  "url": "git://github.com/obsidiansystems/js-framework-benchmark.git",
+  "url": "https://github.com/obsidiansystems/js-framework-benchmark.git",
   "rev": "dfcf229cb5280a25aa54ab506fe9b8a4aa108179",
   "sha256": "0jikl7yljmkcapybh012b906lqa7hvab6cv99l8b7wv6kk9lnxs9",
   "fetchSubmodules": false
diff --git a/nixpkgs-overlays/hack-get/default.nix b/nixpkgs-overlays/hack-get/default.nix
index ef0f0748c..a327c93bb 100644
--- a/nixpkgs-overlays/hack-get/default.nix
+++ b/nixpkgs-overlays/hack-get/default.nix
@@ -37,7 +37,7 @@ self:
       else if hasValidThunk "git.json" then (
         let gitArgs = filterArgs (builtins.fromJSON (builtins.readFile (p + "/git.json")));
         in if builtins.elem "@" (lib.stringToCharacters gitArgs.url)
-          then self.fetchgitPrivate gitArgs
+          then builtins.fetchGit (builtins.removeAttrs gitArgs ["sha256" "fetchSubmodules"])
           else self.fetchgit gitArgs
         )
       else if hasValidThunk "github.json" then
diff --git a/release.nix b/release.nix
index 670ae7172..ee6885551 100644
--- a/release.nix
+++ b/release.nix
@@ -97,7 +97,7 @@ let
         inherit (reflex-platform) iosReflexTodomvc;
         inherit (reflex-platform) iosReflexTodomvc-8_6;
         inherit (reflex-platform) iosReflexTodomvc-8_10;
-        inherit (reflex-platform) iosSimulatorReflexTodomvc;
+        #inherit (reflex-platform) iosSimulatorReflexTodomvc;
         skeleton-test-project-ios = skeleton-test.project.ios;
       } // drvListToAttrs otherDeps
         # TODO uncomment this once GHCJS profiling builds are fixed

From 5f50136c12ecd3b98e97e0d48d4c78b5d2767f60 Mon Sep 17 00:00:00 2001
From: cidkidnix <cidkidnix@protonmail.com>
Date: Tue, 27 Jun 2023 17:31:00 -0500
Subject: [PATCH 26/29] Fix iOS Simulator GHC build, and re-enable caching

---
 default.nix         | 1 +
 nixpkgs/github.json | 4 ++--
 release.nix         | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/default.nix b/default.nix
index d01dbf3cb..4a2831513 100644
--- a/default.nix
+++ b/default.nix
@@ -182,6 +182,7 @@ let iosSupport = system == "x86_64-darwin";
       ios = lib.mapAttrs (_: args: nixpkgsFunc (nixpkgsArgs // args)) rec {
         simulator64 = {
           crossSystem = lib.systems.examples.iphone64-simulator // {
+            isStatic = true;
             sdkVer = iosSdkVersion;
             inherit xcodeVer;
           };
diff --git a/nixpkgs/github.json b/nixpkgs/github.json
index 48a47f785..800952832 100644
--- a/nixpkgs/github.json
+++ b/nixpkgs/github.json
@@ -3,6 +3,6 @@
   "repo": "nixpkgs",
   "branch": "dg/reflex-platform-21.05",
   "private": false,
-  "rev": "40f8295215ed3d5fecdb000e26f988a4b43ec65a",
-  "sha256": "04kx305bypinl7wv81i4z7x0jlmrkf6sv9hwcv9ym3mi9zsyx970"
+  "rev": "ccc5b08f203bf76d37717e04738bcb56576c9959",
+  "sha256": "1hs5q9lzqhw855l7y813y31xj2l0ykgc3vsffyysy9jcv1c3n3nk"
 }
diff --git a/release.nix b/release.nix
index ee6885551..670ae7172 100644
--- a/release.nix
+++ b/release.nix
@@ -97,7 +97,7 @@ let
         inherit (reflex-platform) iosReflexTodomvc;
         inherit (reflex-platform) iosReflexTodomvc-8_6;
         inherit (reflex-platform) iosReflexTodomvc-8_10;
-        #inherit (reflex-platform) iosSimulatorReflexTodomvc;
+        inherit (reflex-platform) iosSimulatorReflexTodomvc;
         skeleton-test-project-ios = skeleton-test.project.ios;
       } // drvListToAttrs otherDeps
         # TODO uncomment this once GHCJS profiling builds are fixed

From 96a036c19a33db2151bcb7b425890bae0b6ec2ea Mon Sep 17 00:00:00 2001
From: Ali Abrar <ali.abrar@obsidian.systems>
Date: Tue, 27 Jun 2023 20:31:20 -0400
Subject: [PATCH 27/29] reflex -> 0.9.1.0

---
 ChangeLog.md                                            | 2 +-
 haskell-overlays/reflex-packages/dep/reflex/github.json | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 6e8a7ba32..bf55fff8e 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -7,7 +7,7 @@ This project's release branch is `master`. This log is written from the perspect
 * *Breaking change*: GHC 8.10.7 is now selected by default. Set `__useNewerCompiler` in default.nix to false if you'd like to keep using GHC 8.6.5.
 * Haskell Library Updates
   * all-cabal-hashes "Update from Hackage at 2023-05-25T12:06:44Z" ([f297f1f3](https://github.com/commercialhaskell/all-cabal-hashes/commit/f297f1f3fc337e2f94783f254cb6db1ee2022adb))
-  * reflex 0.9.0.1
+  * reflex 0.9.1.0
   * reflex-dom-core 0.8.0.0
   * reflex-ghci 0.2.0.0
   * reflex-vty 0.4.1.1
diff --git a/haskell-overlays/reflex-packages/dep/reflex/github.json b/haskell-overlays/reflex-packages/dep/reflex/github.json
index 7bc5c5e99..d70515fe5 100644
--- a/haskell-overlays/reflex-packages/dep/reflex/github.json
+++ b/haskell-overlays/reflex-packages/dep/reflex/github.json
@@ -1,8 +1,8 @@
 {
   "owner": "reflex-frp",
   "repo": "reflex",
-  "branch": "release/0.9.0.1",
+  "branch": "release/0.9.1.0",
   "private": false,
-  "rev": "2fb31a258b06d5f79204ccec89be0dbeee64177e",
-  "sha256": "0nbnyli3pma8rfps7v9ddvivj3vp1rqk4j646bpwmh47nn0grql1"
+  "rev": "2e726a2995965539900a3879fc78ac72c553c706",
+  "sha256": "1a4fcp2v779dlp81fj1fxz7dagix4y1z254ia3013irzkak57pf0"
 }

From 665f970f9bba06e873723b8245fe238dce84f21f Mon Sep 17 00:00:00 2001
From: cidkidnix <cidkidnix@protonmail.com>
Date: Thu, 29 Jun 2023 01:01:26 -0500
Subject: [PATCH 28/29] Get iOSSimulator building again

---
 default.nix         | 2 +-
 nixpkgs/github.json | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/default.nix b/default.nix
index 4a2831513..1d63c10c5 100644
--- a/default.nix
+++ b/default.nix
@@ -182,7 +182,7 @@ let iosSupport = system == "x86_64-darwin";
       ios = lib.mapAttrs (_: args: nixpkgsFunc (nixpkgsArgs // args)) rec {
         simulator64 = {
           crossSystem = lib.systems.examples.iphone64-simulator // {
-            isStatic = true;
+            #isStatic = true;
             sdkVer = iosSdkVersion;
             inherit xcodeVer;
           };
diff --git a/nixpkgs/github.json b/nixpkgs/github.json
index 800952832..f21369849 100644
--- a/nixpkgs/github.json
+++ b/nixpkgs/github.json
@@ -3,6 +3,6 @@
   "repo": "nixpkgs",
   "branch": "dg/reflex-platform-21.05",
   "private": false,
-  "rev": "ccc5b08f203bf76d37717e04738bcb56576c9959",
-  "sha256": "1hs5q9lzqhw855l7y813y31xj2l0ykgc3vsffyysy9jcv1c3n3nk"
+  "rev": "1b8131b286ad031ad185f90fa8f9c03a0d8c95e8",
+  "sha256": "05n5vb0za4bjp89ikbc1gmvqa9n459r4dk6725rvpi8rv6m3r90p"
 }

From 154f4d58867b1af09a2e0fc302c4d279334fdde5 Mon Sep 17 00:00:00 2001
From: cidkidnix <cidkidnix@protonmail.com>
Date: Tue, 11 Jul 2023 15:22:10 -0500
Subject: [PATCH 29/29] Bump nixpkgs

---
 nixpkgs/github.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixpkgs/github.json b/nixpkgs/github.json
index f21369849..c79282fdf 100644
--- a/nixpkgs/github.json
+++ b/nixpkgs/github.json
@@ -3,6 +3,6 @@
   "repo": "nixpkgs",
   "branch": "dg/reflex-platform-21.05",
   "private": false,
-  "rev": "1b8131b286ad031ad185f90fa8f9c03a0d8c95e8",
-  "sha256": "05n5vb0za4bjp89ikbc1gmvqa9n459r4dk6725rvpi8rv6m3r90p"
+  "rev": "466d823b4deafd1159c5e8fb05a257a7792d31e0",
+  "sha256": "1r83w8z1n0x445py7qf9db7ak8q1wm90ap7il66ag1vv5k8adgpl"
 }