Merge pull request #501 from reflex-frp/cg-bump-reflex-dom

Bump reflex-dom for hydration fixes.
reflex-frp · Jun 15, 2019 · 716879f · 716879f
2 parents beaa34d + 7ecb4c2
commit 716879f
Show file tree

Hide file tree

Showing 12 changed files with 67 additions and 25 deletions.
diff --git a/haskell-overlays/any-8.4.nix b/haskell-overlays/any-8.4.nix
@@ -19,4 +19,5 @@ self: super: {
   # doctests: doctests: could not execute: markdown-unlit
   # Test suite doctests: FAIL
   rank2classes = dontCheck super.rank2classes;
+
 }
diff --git a/haskell-overlays/reflex-packages/default.nix b/haskell-overlays/reflex-packages/default.nix
@@ -9,6 +9,7 @@ with haskellLib;
 self: super:
 
 let
+  universeRepo = nixpkgs.hackGet ./dep/universe;
   reflexDom = import self._dep.reflex-dom self nixpkgs;
   jsaddleSrc = self._dep.jsaddle;
   gargoylePkgs = self.callPackage self._dep.gargoyle self;
@@ -22,6 +23,7 @@ let
   addFastWeakFlag = drv: if useFastWeak
     then enableCabalFlag drv "fast-weak"
     else drv;
+  hackGet = nixpkgs.hackGet;
 in
 {
   _dep = super._dep or {} // thunkSet ./dep;
@@ -88,27 +90,7 @@ in
 
   monoidal-containers = self.callHackage "monoidal-containers" "0.4.0.0" {};
 
-  # Needs additional instances
-  dependent-sum = self.callCabal2nix "dependent-sum" (fetchFromGitHub {
-    owner = "obsidiansystems";
-    repo = "dependent-sum";
-    rev = "9c649ba33fa95601621b4a3fa3808104dd1ababd";
-    sha256 = "1msnzdb79bal1xl2xq2j415n66gi48ynb02pf03wkahymi5dy4yj";
-  }) {};
-  # Misc new features since Hackage relasese
-  dependent-sum-template = self.callCabal2nix "dependent-sum-template" (fetchFromGitHub {
-    owner = "mokus0";
-    repo = "dependent-sum-template";
-    rev = "bfe9c37f4eaffd8b17c03f216c06a0bfb66f7df7";
-    sha256 = "1w3s7nvw0iw5li3ry7s8r4651qwgd22hmgz6by0iw3rm64fy8x0y";
-  }) {};
   # Not on Hackage yet
-  dependent-sum-universe-orphans = self.callCabal2nix "dependent-sum-universe-orphans" (fetchFromGitHub {
-    owner = "obsidiansystems";
-    repo = "dependent-sum-universe-orphans";
-    rev = "8c28c09991cd7c3588ae6db1be59a0540758f5f5";
-    sha256 = "0dg32s2mgxav68yw6g7b15w0h0z116zx0qri26gprafgy23bxanm";
-  }) {};
   # Version 1.2.1 not on Hackage yet
   hspec-webdriver = self.callCabal2nix "hspec-webdriver" (fetchFromBitbucket {
     owner = "wuzzeb";
@@ -117,4 +99,18 @@ in
     sha256 = "0csmxyxkxqgx0v2vwphz80515nqz1hpw5v7391fqpjm7bfgy47k4";
   } + "/hspec-webdriver") {};
 
+  constraints-extras = self.callCabal2nix "constraints-extras" (hackGet ./dep/constraints-extras) {};
+  dependent-map = self.callCabal2nix "dependent-map" (hackGet ./dep/dependent-map) {};
+  dependent-sum = self.callCabal2nixWithOptions "dependent-sum" (hackGet ./dep/dependent-sum) "--subpath dependent-sum" {};
+  dependent-sum-template = self.callCabal2nixWithOptions "dependent-sum-template" (hackGet ./dep/dependent-sum) "--subpath dependent-sum-template" {};
+  dependent-sum-universe-orphans = self.callCabal2nix "dependent-sum-universe-orphans" (hackGet ./dep/dependent-sum-universe-orphans) {};
+
+  universe = self.callCabal2nixWithOptions "universe" universeRepo "--subpath universe" {};
+  universe-base = self.callCabal2nixWithOptions "universe" universeRepo "--subpath universe-base" {};
+  universe-dependent-sum = nixpkgs.haskell.lib.doJailbreak (self.callCabal2nixWithOptions "universe" universeRepo "--subpath universe-dependent-sum" {});
+  universe-instances-extended = self.callCabal2nixWithOptions "universe" universeRepo "--subpath universe-instances-extended" {};
+  universe-reverse-instances = self.callCabal2nixWithOptions "universe" universeRepo "--subpath universe-reverse-instances" {};
+  universe-instances-base = self.callCabal2nixWithOptions "universe" universeRepo "--subpath deprecated/universe-instances-base" {};
+
+
 }
diff --git a/haskell-overlays/reflex-packages/dep/constraints-extras/github.json b/haskell-overlays/reflex-packages/dep/constraints-extras/github.json
@@ -0,0 +1,6 @@
+{
+  "owner": "obsidiansystems",
+  "repo": "constraints-extras",
+  "rev": "30f10c03dd96e50c089f0613f99951805bff7397",
+  "sha256": "196b8kbcp744gqhh964m54vw4cdg15p6lc7cm2vxbh15cbqdz7ir"
+}
diff --git a/haskell-overlays/reflex-packages/dep/dependent-map/github.json b/haskell-overlays/reflex-packages/dep/dependent-map/github.json
@@ -0,0 +1,6 @@
+{
+  "owner": "obsidiansystems",
+  "repo": "dependent-map",
+  "rev": "a9a438b1fd974891e4ed57cbd43e305cf7c759a9",
+  "sha256": "1g5zyz8rna57g585xrix1ica33865dw7x1kmxwcdh21pp1mqxzn2"
+}
diff --git a/haskell-overlays/reflex-packages/dep/dependent-sum-universe-orphans/github.json b/haskell-overlays/reflex-packages/dep/dependent-sum-universe-orphans/github.json
@@ -0,0 +1,6 @@
+{
+  "owner": "obsidiansystems",
+  "repo": "dependent-sum-universe-orphans",
+  "rev": "3d492554bfbed81ebfcf3fa6db60ff46ecad3b8e",
+  "sha256": "086fdbqbgj2fix4sicp49afmq2xhi7h18cq8wn8a5s0f39888gj4"
+}
diff --git a/haskell-overlays/reflex-packages/dep/dependent-sum/github.json b/haskell-overlays/reflex-packages/dep/dependent-sum/github.json
@@ -0,0 +1,6 @@
+{
+  "owner": "obsidiansystems",
+  "repo": "dependent-sum",
+  "rev": "69127f57533e7e58c54c2f9ca19b0b45946d6cc7",
+  "sha256": "112cknyz9dl3xbzx715bkhcy0l5z0v98rf06xf70b0fzsgfw68ws"
+}
diff --git a/haskell-overlays/reflex-packages/dep/reflex-dom/github.json b/haskell-overlays/reflex-packages/dep/reflex-dom/github.json
@@ -1,6 +1,6 @@
 {
   "owner": "reflex-frp",
   "repo": "reflex-dom",
-  "rev": "c94228143318cad36e145293f7aa3e2d802785f9",
-  "sha256": "0405rv27lqr66kvxv0npk992h88mii3j76d3wr48r67lv953kx3c"
+  "rev": "28fef25fd30424ebcc0d927011298f0dd8eae52b",
+  "sha256": "1w6d42v7dsygq5rgz0ngv4z48d00k2spahjbbklaa7g2v56m76zi"
 }
diff --git a/haskell-overlays/reflex-packages/dep/reflex/github.json b/haskell-overlays/reflex-packages/dep/reflex/github.json
@@ -1,6 +1,6 @@
 {
   "owner": "reflex-frp",
   "repo": "reflex",
-  "rev": "9c3d165b9542dcf87c736bb14a655ec2422720ff",
-  "sha256": "03x375mhdv570fw4nv9fyj8hznb29l88jzw9x9k81gcfhr1lhwkb"
+  "rev": "bccbe428bfd7b888f629aed955ef1f35e39ef872",
+  "sha256": "013jqiwfr114iym47xy4afqxljd83pp8n6sld7cybi96z3l2zx27"
 }
diff --git a/haskell-overlays/reflex-packages/dep/universe/default.nix b/haskell-overlays/reflex-packages/dep/universe/default.nix
@@ -0,0 +1,7 @@
+# DO NOT HAND-EDIT THIS FILE
+import ((import <nixpkgs> {}).fetchFromGitHub (
+  let json = builtins.fromJSON (builtins.readFile ./github.json);
+  in { inherit (json) owner repo rev sha256;
+       private = json.private or false;
+     }
+))
diff --git a/haskell-overlays/reflex-packages/dep/universe/github.json b/haskell-overlays/reflex-packages/dep/universe/github.json
@@ -0,0 +1,7 @@
+{
+  "owner": "dmwit",
+  "repo": "universe",
+  "branch": "master",
+  "rev": "a0ef0ec6fd0750725a7e63734829b44f54cfcbe2",
+  "sha256": "10cdjh42k9kzbwdvvl7hv9v1mnlx06swhl8y8zsqjd0rpnabfpm2"
+}
diff --git a/nixpkgs-overlays/call-hackage-direct.nix b/nixpkgs-overlays/call-hackage-direct.nix
@@ -0,0 +1,7 @@
+{nixpkgs}:
+{pkg, ver, sha256}:
+    let pkgver = "${pkg}-${ver}";
+    in nixpkgs.haskellPackages.callCabal2nix pkg (nixpkgs.fetchzip {
+         url = "mirror://hackage/${pkgver}/${pkgver}.tar.gz";
+         inherit sha256;
+  })
diff --git a/release.nix b/release.nix
@@ -1,4 +1,4 @@
-{ self-args ? {}
+{ self-args ? { config.android_sdk.accept_license = true; }
 , local-self ? import ./. self-args
 }: