Merge branch 'aa/reflex-0.8.1.0' into develop

* aa/reflex-0.8.1.0: haskell-overlays: jsaddle-dom -> 0.9.4.1 haskell-overlays: add dependent-monoidal-map
reflex-frp · Apr 16, 2021 · 95ab759 · 95ab759
2 parents 90252b6 + 0cf69c9
commit 95ab759
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 11 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -7,8 +7,11 @@ This project's release branch is `master`. This log is written from the perspect
 * Bump
   * reflex to 0.8.1.0
   * reflex-dom-core to 0.6.2.0
+  * jsaddle to 0.9.7.1
+  * jsaddle-dom to 0.9.4.1
 * New pins
   * hnix 0.12.0.1 and dependencies
+  * dependent-monoidal-map 0.1.1.2
 
 ## v0.7.0.0
 

diff --git a/haskell-overlays/reflex-packages/default.nix b/haskell-overlays/reflex-packages/default.nix
@@ -115,11 +115,11 @@ in
   ## GHCJS and JSaddle
   ##
 
-  jsaddle = self.callCabal2nix "jsaddle" (jsaddleSrc + /jsaddle) {};
-  jsaddle-clib = self.callCabal2nix "jsaddle-clib" (jsaddleSrc + /jsaddle-clib) {};
-  jsaddle-webkit2gtk = self.callCabal2nix "jsaddle-webkit2gtk" (jsaddleSrc + /jsaddle-webkit2gtk) {};
-  jsaddle-webkitgtk = self.callCabal2nix "jsaddle-webkitgtk" (jsaddleSrc + /jsaddle-webkitgtk) {};
-  jsaddle-wkwebview = overrideCabal (self.callCabal2nix "jsaddle-wkwebview" (jsaddleSrc + /jsaddle-wkwebview) {}) (drv: {
+  jsaddle = self.callCabal2nix "jsaddle" (jsaddleSrc + "/jsaddle") {};
+  jsaddle-clib = self.callCabal2nix "jsaddle-clib" (jsaddleSrc + "/jsaddle-clib") {};
+  jsaddle-webkit2gtk = self.callCabal2nix "jsaddle-webkit2gtk" (jsaddleSrc + "/jsaddle-webkit2gtk") {};
+  jsaddle-webkitgtk = self.callCabal2nix "jsaddle-webkitgtk" (jsaddleSrc + "/jsaddle-webkitgtk") {};
+  jsaddle-wkwebview = overrideCabal (self.callCabal2nix "jsaddle-wkwebview" (jsaddleSrc + "/jsaddle-wkwebview") {}) (drv: {
     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"
@@ -130,10 +130,10 @@ 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 = dontCheck (self.callCabal2nix "jsaddle-warp" (jsaddleSrc + "/jsaddle-warp") {});
 
   jsaddle-dom = self.callCabal2nix "jsaddle-dom" self._dep.jsaddle-dom {};
-  jsaddle-wasm = self.callCabal2nix "jsaddle-wasm" (hackGet (wasmCross + /jsaddle-wasm)) {};
+  jsaddle-wasm = self.callCabal2nix "jsaddle-wasm" (hackGet (wasmCross + "/jsaddle-wasm")) {};
   ghcjs-dom = self.callCabal2nix "ghcjs-dom" (self._dep.ghcjs-dom + "/ghcjs-dom") {};
   ghcjs-dom-jsaddle = self.callCabal2nix "ghcjs-dom-jsaddle" (self._dep.ghcjs-dom + "/ghcjs-dom-jsaddle") {};
   ghcjs-dom-jsffi = self.callCabal2nix "ghcjs-dom-jsffi" (self._dep.ghcjs-dom + "/ghcjs-dom-jsffi") {};
@@ -180,6 +180,7 @@ in
   prim-uniq = self.callHackage "prim-uniq" "0.2" {};
   aeson-gadt-th = self.callHackage "aeson-gadt-th" "0.2.4" {};
   dependent-map = self.callHackage "dependent-map" "0.4.0.0" {};
+  dependent-monoidal-map = self.callCabal2nix "dependent-monoidal-map" self._dep.dependent-monoidal-map {};
   dependent-sum = self.callHackage "dependent-sum" "0.7.1.0" {};
   dependent-sum-template = self.callHackage "dependent-sum-template" "0.1.0.3" {};
   dependent-sum-universe-orphans = self.callCabal2nix "dependent-sum-universe-orphans" self._dep.dependent-sum-universe-orphans {};

diff --git a/haskell-overlays/reflex-packages/dep/dependent-monoidal-map/default.nix b/haskell-overlays/reflex-packages/dep/dependent-monoidal-map/default.nix
@@ -0,0 +1,2 @@
+# DO NOT HAND-EDIT THIS FILE
+import (import ./thunk.nix)
diff --git a/haskell-overlays/reflex-packages/dep/dependent-monoidal-map/github.json b/haskell-overlays/reflex-packages/dep/dependent-monoidal-map/github.json
@@ -0,0 +1,7 @@
+{
+  "owner": "obsidiansystems",
+  "repo": "dependent-monoidal-map",
+  "private": false,
+  "rev": "d1e6457d24dd3aee4ca8efb3747b193969a98d38",
+  "sha256": "0qa1cpcfwq2zf0ym62j2f25z1k4j68m2654krwi2bpfrcmrak3yn"
+}
diff --git a/haskell-overlays/reflex-packages/dep/dependent-monoidal-map/thunk.nix b/haskell-overlays/reflex-packages/dep/dependent-monoidal-map/thunk.nix
@@ -0,0 +1,9 @@
+# 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 <nixpkgs> {}).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/jsaddle-dom/github.json b/haskell-overlays/reflex-packages/dep/jsaddle-dom/github.json
@@ -2,6 +2,7 @@
   "owner": "ghcjs",
   "repo": "jsaddle-dom",
   "branch": "master",
-  "rev": "da15a025eb06888cabf2e463b4f87ce14f65742b",
-  "sha256": "0rdwn3g2yy247am714xz3rid98d8j7ccjq8hhsp3mpvpf2w5ipmj"
+  "private": false,
+  "rev": "5f5094277d4b11f3dc3e2df6bb437b75712d268f",
+  "sha256": "07azigc19wjkni49f5mrvr75vd276w0616sb28j0y63q54gp2k3p"
 }
diff --git a/haskell-overlays/reflex-packages/dep/jsaddle/github.json b/haskell-overlays/reflex-packages/dep/jsaddle/github.json
@@ -1,6 +1,8 @@
 {
   "owner": "ghcjs",
   "repo": "jsaddle",
-  "rev": "4b135448f425edf968d5058b901b57064c9d2b7a",
-  "sha256": "0xpsv1pp1a13vq5vk1wjj1iq0cfnq9cv7lkrv2rl6yd47slwmn2a"
+  "branch": "master",
+  "private": false,
+  "rev": "97273656e28790ab6e35c827f8086cf47bfbedca",
+  "sha256": "1bdgi348ndhjvsr60q1vl9f12yigqy604y6wrrsp4bkb79hfax3d"
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# DO NOT HAND-EDIT THIS FILE
		import (import ./thunk.nix)