Merge pull request #820 from reflex-frp/aa/reflex-0.9.0.1

haskell-overlays: update all-cabal-hashes, reflex-0.9.1.0, reflex-vty…
reflex-frp · Jul 17, 2023 · 4aa4e25 · 4aa4e25
2 parents 8ae879b + 2c66ff4
commit 4aa4e25
Show file tree

Hide file tree

Showing 19 changed files with 85 additions and 44 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -2,12 +2,23 @@
 
 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.1.0.0
 
-* Bump `some` to 1.0.4
-* Bump `dependent-sum-template` to 0.1.2.0
-
-(The thunk for `dependent-sum` is also changed, but there is no corresponding code change so the version is the same. This is just part of separating it from `dependent-sum-template`.)
+* *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.1.0
+  * 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
+  * beam-core 0.10.0.0
+  * beam-migrate 0.5.2.0
+  * beam-postgres 0.5.3.0
+  * beam-automigrate 0.1.3.0
+  * some 1.0.4
+  * dependent-sum-template 0.1.2.0
 
 ## v1.0.1.0
 

diff --git 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
@@ -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;
           };
@@ -330,14 +331,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;
@@ -397,6 +397,8 @@ in let this = rec {
           ghc8_6
           ghc8_10
           ghcIosSimulator64
+          ghcIosSimulator64-8_6
+          ghcIosSimulator64-8_10
           ghcIosAarch64
           ghcIosAarch64-8_6
           ghcIosAarch64-8_10
@@ -593,7 +595,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/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
@@ -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);

diff --git 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/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
@@ -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": "f14e954310115cd0d2d1679e1059a3e588ad4762",
+  "sha256": "0fdil74zq7d6drc1lzx3nfdsajqfw5p3llqkakvh6ga207s8ll97"
 }
diff --git a/haskell-overlays/reflex-packages/dep/reflex-fsnotify/default.nix b/haskell-overlays/reflex-packages/dep/reflex-fsnotify/default.nix
@@ -0,0 +1,2 @@
+# DO NOT HAND-EDIT THIS FILE
+import (import ./thunk.nix)
diff --git a/haskell-overlays/reflex-packages/dep/reflex-fsnotify/github.json 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
@@ -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
diff --git 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"
 }
diff --git 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.2.0",
   "private": false,
-  "rev": "5642543d14950b99bde8b046e4582cedda158e2b",
-  "sha256": "044xm2w6dkjdw38n41b4362ax1yhwyhbcv35xg8hrsj51dyls79d"
+  "rev": "b1e0606ec895f3942b8d8aae7a011f69062cb1c5",
+  "sha256": "0i15z9nlkprxq84sh5w159lq67z51q1ml3g89icir8l6biasymx4"
 }
diff --git 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
@@ -1,8 +1,8 @@
 {
   "owner": "reflex-frp",
   "repo": "reflex",
-  "branch": "release/0.8.2.2",
+  "branch": "release/0.9.1.0",
   "private": false,
-  "rev": "0166290bf680cc55fc30cd0cd701275f61de2f7e",
-  "sha256": "087vfjfqr0v7jq3id9hqrcf34fi2q1myab9p9gsnpsd1dvg12k8k"
+  "rev": "2e726a2995965539900a3879fc78ac72c553c706",
+  "sha256": "1a4fcp2v779dlp81fj1fxz7dagix4y1z254ia3013irzkak57pf0"
 }
diff --git 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
@@ -86,5 +86,9 @@ 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" {};
-
+  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" {};
 }
diff --git 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/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=";
   };
-
 }
diff --git 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/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": "466d823b4deafd1159c5e8fb05a257a7792d31e0",
+  "sha256": "1r83w8z1n0x445py7qf9db7ak8q1wm90ap7il66ag1vv5k8adgpl"
 }