on develop help sign in
fix builds failing due to these-lens pulling in old lens
commit05bc3c31bd3f3bf093d9a0c608c485e1d2d3d444 authorE Cardenas <card@obsidian.systems> dateWed 4 Dec 2019, 17:08 (7 years ago) parent98a66d7
3 files changed+7−6
default.nix+2−1 dep/reflex-platform/github.json+3−3 release.nix+2−2
default.nix+2−1
@@ -7,7 +7,7 @@
77, transformers-compat, unbounded-delays, prim-uniq
88, data-default, filepath, directory, filemanip, ghcjs-base
99, monoidal-containers, witherable, profunctors
10−, semialign ? null, splitThese ? (semialign != null)
10+, splitThese ? (semialign != null), semialign ? null, these-lens ? null
1111, useTemplateHaskell ? true
1212}:
1313mkDerivation {
@@ -30,6 +30,7 @@ mkDerivation {
3030 haskell-src-exts haskell-src-meta
3131 ]) ++ (if splitThese then [
3232 semialign
33+ these-lens
3334 ] else []);
3435 testHaskellDepends = if ghc.isGhcjs or false then [] else [
3536 hlint filepath directory filemanip
dep/reflex-platform/github.json+3−3
@@ -1,7 +1,7 @@
11{
22 "owner": "reflex-frp",
33 "repo": "reflex-platform",
4− "branch": "develop",
5− "rev": "338fc907e37d70e6469c529456f33221fb05ca1f",
6− "sha256": "08gfhpp0pkvvi1wnlpcn6wmpzdjvy5z7dy1h66gp2w8b5cx8hx5h"
4+ "branch": "jailbreakTheselens",
5+ "rev": "4284ed527c96c373538dc7e31776d9a50ca6aa91",
6+ "sha256": "1m1nkxq7ng9wnqbd77xn8d81f2iz8g61y5m0r3gp0gi0q59jm8ay"
77}
release.nix+2−2
@@ -20,8 +20,8 @@ let
2020 hsPkgs = lib.genAttrs compilers (ghc: let
2121 ghc' = reflex-platform.${ghc}.override {
2222 overrides = self: super: {
23− reflex-useTemplateHaskell = self.callPackage ./. { useTemplateHaskell = true; splitThese = false; };
24− reflex = self.callPackage ./. { useTemplateHaskell = false; splitThese = false; };
23+ reflex-useTemplateHaskell = self.callPackage ./. { useTemplateHaskell = true; };
24+ reflex = self.callPackage ./. { useTemplateHaskell = false; };
2525 };
2626 };
2727 in {