Merge branch 'develop' into dylang/fix-macos

ChangeLog.md

@@ -14,9 +14,6 @@ This project's release branch is `master`. This log is written from the perspect
 * iOS: Make it possible to specify the path to the app's icons and splash images. See `iconPath` in `ios/default.nix`
 * iOS: Make it possible to build a TestFlight/App Store ready ipa. See `isRelease` in `ios/default.nix`
 * iOS: Include Assets Archive if present at `iconPath`
-
-## Unreleased
-
 * Fix SIGBUS crashes on armv7a due unaligned writes ([!774](https://github.com/reflex-frp/reflex-platform/pull/774))
 * Always use GHC 8.10.7, not GHC 8.10.4, for GHC 8.10.
   Previously we were using mixed GHC 8.10 versions to avoid issues.
@@ -41,18 +38,19 @@ This project's release branch is `master`. This log is written from the perspect
 * Haskell Library Updates
   * Intentional bumps:
     * all-cabal-hashes "Update from Hackage at 2022-06-29T01:24:32Z"
+    * dependent-monoidal-map to 0.1.1.3
+    * dependent-sum-aeson-orphans to 0.3.1.1
     * dependent-sum-template to 0.1.1.0
-    * some to 1.0.2
     * monoidal-containers to 0.6.2.0
-    * witherable to 0.4.2
-    * patch to 0.0.7.0
-    * reflex-vty to 0.3.0.0
-    * reflex-ghci to 0.1.5.3
-    * patch to 0.0.7.0
-    * reflex to 0.8.2.1
+    * patch to 0.0.8.0
+    * reflex to 0.8.2.2
     * reflex-dom-core to 0.7.0.2
-    * reflex-process to 0.3.1.2
     * reflex-ghci to 0.1.5.4
+    * reflex-process to 0.3.1.2
+    * reflex-vty to 0.3.0.0
+    * some to 1.0.2
+    * vessel to 0.3.0.0
+    * witherable to 0.4.2
   * Prerequisite bumps:
     * OneTuple 0.3.1
     * QuickCheck 2.14.1

haskell-overlays/reflex-packages/default.nix

@@ -116,7 +116,7 @@ in
   ## Tooling
   ##
 
-  reflex-ghci = self.callCabal2nix "reflex-ghci" self._dep.reflex-ghci {};
+  reflex-ghci = dontCheck (self.callCabal2nix "reflex-ghci" self._dep.reflex-ghci {});
 
   ##
   ## GHCJS and JSaddle
@@ -187,13 +187,13 @@ in
   constraints-extras = self.callCabal2nix "constraints-extras" (hackGet ./dep/constraints-extras) {};
   some = self.callHackage "some" "1.0.2" {};
   prim-uniq = self.callHackage "prim-uniq" "0.2" {};
-  aeson-gadt-th = self.callHackage "aeson-gadt-th" "0.2.4" {};
+  aeson-gadt-th = self.callHackage "aeson-gadt-th" "0.2.5.1" {};
   dependent-map = self.callCabal2nix "dependent-map" (hackGet ./dep/dependent-map) {};
   dependent-monoidal-map = self.callCabal2nix "dependent-monoidal-map" self._dep.dependent-monoidal-map {};
   dependent-sum = self.callCabal2nix "dependent-sum" (hackGet ./dep/dependent-sum + "/dependent-sum") {};
   dependent-sum-template = self.callCabal2nix "dependent-sum-template" (hackGet ./dep/dependent-sum + "/dependent-sum-template") {};
   dependent-sum-universe-orphans = self.callCabal2nix "dependent-sum-universe-orphans" self._dep.dependent-sum-universe-orphans {};
-  dependent-sum-aeson-orphans = self.callHackage "dependent-sum-aeson-orphans" "0.3.0.0" {};
+  dependent-sum-aeson-orphans = self.callCabal2nix "dependent-sum-aeson-orphans" self._dep.dependent-sum-aeson-orphans {};
 
   # Need to use `--subpath` because LICENSE in each dir is a symlink to the repo root.
   universe = self.callCabal2nixWithOptions "universe" universeRepo "--subpath universe" {};
@@ -205,6 +205,8 @@ in
 
   th-abstraction = self.callHackage "th-abstraction" "0.4.3.0" {};
 
+  vessel = self.callCabal2nix "vessel" self._dep.vessel {};
+
   # Slightly newer version to fix
   # https://github.com/danfran/cabal-macosx/issues/13
   cabal-macosx = self.callHackage "cabal-macosx" "0.2.4.2" {};

haskell-overlays/reflex-packages/dep/dependent-monoidal-map/github.json

@@ -1,7 +1,8 @@
 {
   "owner": "obsidiansystems",
   "repo": "dependent-monoidal-map",
+  "branch": "release/0.1.1.3",
   "private": false,
-  "rev": "d1e6457d24dd3aee4ca8efb3747b193969a98d38",
-  "sha256": "0qa1cpcfwq2zf0ym62j2f25z1k4j68m2654krwi2bpfrcmrak3yn"
+  "rev": "5dc00cca79a6340f97475948abaad681c5f838b6",
+  "sha256": "1w4nrv1jd165qzrbn98scq006ibjvya9rhkb47gbhc9z975fg1sc"
 }

haskell-overlays/reflex-packages/dep/dependent-monoidal-map/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);

haskell-overlays/reflex-packages/dep/dependent-sum-aeson-orphans/default.nix

@@ -0,0 +1,2 @@
+# DO NOT HAND-EDIT THIS FILE
+import (import ./thunk.nix)

haskell-overlays/reflex-packages/dep/dependent-sum-aeson-orphans/github.json

@@ -0,0 +1,8 @@
+{
+  "owner": "obsidiansystems",
+  "repo": "dependent-sum-aeson-orphans",
+  "branch": "release/0.3.1.1",
+  "private": false,
+  "rev": "2c09bed287f57d23b1c04542b92325da1144d0a1",
+  "sha256": "1qs50c69c8kb3flnwnamqlrkm05zv35bh5k2nbwsn0carh97mg69"
+}

haskell-overlays/reflex-packages/dep/dependent-sum-aeson-orphans/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

haskell-overlays/reflex-packages/dep/patch/github.json

@@ -1,8 +1,8 @@
 {
   "owner": "reflex-frp",
   "repo": "patch",
-  "branch": "bump-constraints-extras",
+  "branch": "release/0.0.8.0",
   "private": false,
-  "rev": "35c12bd5aeeb2cf5a66d3f2bcca99da527d5fb03",
-  "sha256": "16xhjw92xn0i2x03khn8gyxyy4pqm1hr1snpkcilsx6zgpwl754f"
+  "rev": "054b12f99973c4636a2784c1db2c19e92f868492",
+  "sha256": "01c9vwyd0l9llqpqggkiggzwc32l4wfwkjqh1wyasxkw7y7zs97z"
 }

haskell-overlays/reflex-packages/dep/reflex/github.json

@@ -1,8 +1,8 @@
 {
   "owner": "reflex-frp",
   "repo": "reflex",
-  "branch": "bump-constraints-extras",
+  "branch": "release/0.8.2.2",
   "private": false,
-  "rev": "c85213407452b718242032ac02208aea2966e005",
-  "sha256": "1ffgjnrb4h9hdwrxqjfhhkdilnvrvzmc3fc9a8q7aw2qma4xhlaz"
+  "rev": "0166290bf680cc55fc30cd0cd701275f61de2f7e",
+  "sha256": "087vfjfqr0v7jq3id9hqrcf34fi2q1myab9p9gsnpsd1dvg12k8k"
 }

haskell-overlays/reflex-packages/dep/vessel/default.nix

@@ -0,0 +1,2 @@
+# DO NOT HAND-EDIT THIS FILE
+import (import ./thunk.nix)

haskell-overlays/reflex-packages/dep/vessel/github.json

@@ -0,0 +1,8 @@
+{
+  "owner": "obsidiansystems",
+  "repo": "vessel",
+  "branch": "release/0.3.0.0",
+  "private": false,
+  "rev": "c290833764f4054ee52047e3604c323493c1e5e8",
+  "sha256": "173sq64q3m41s3nlv601zzl171kq5kgd8sql45yrrnjw72rf1hjj"
+}

haskell-overlays/reflex-packages/dep/vessel/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

scripts/hack-on

@@ -6,15 +6,16 @@ DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )
 . "$DIR/scripts/common-setup.sh"
 
 REPO="$(echo "$1" | sed 's_/$__')"
+BASE="$(basename $REPO)"
 
 if [ ! -d "$REPO" ] ; then
     echo "Error: no such directory: $REPO"
     exit 1
 fi
 
-DIFF="$(git -C "$REPO/.." diff HEAD -- "$REPO")"
+DIFF="$(git -C "$REPO/.." diff HEAD -- "$BASE")"
 DIFF_ERR=$?
-STATUS="$(git -C "$REPO/.." status --porcelain --ignored "$REPO")"
+STATUS="$(git -C "$REPO/.." status --porcelain --ignored "$BASE")"
 STATUS_ERR=$?
 
 if [ "$DIFF_ERR" -ne 0 -o "$STATUS_ERR" -ne 0 ] ; then