git.iko.soy/reflex
on develop help sign in
Merge pull request #374 from reflex-frp/je-rp-ci
d79405cJohn Ericson
dep/reflex-platform/github.json+3−3
compare with develop
unifiedsplit
@@ -1,7 +1,7 @@
1{
1{
2 "owner": "reflex-frp",
2 "owner": "reflex-frp",
3 "repo": "reflex-platform",
3 "repo": "reflex-platform",
4− "branch": "jailbreakTheselens",
4+ "branch": "develop",
5− "rev": "4284ed527c96c373538dc7e31776d9a50ca6aa91",
5+ "rev": "e7b76dd552a10916c7d8702c11292dac4f4299ea",
6− "sha256": "1m1nkxq7ng9wnqbd77xn8d81f2iz8g61y5m0r3gp0gi0q59jm8ay"
6+ "sha256": "0s1183arrwldcs50qhzgnv94v24n9bgq6dfq64wp0a3q2nzyvgwh"
7}
7}
release.nix+27−17
@@ -17,26 +17,36 @@ let
17 ] ++ lib.optionals (reflex-platform.iosSupport) [
17 ] ++ lib.optionals (reflex-platform.iosSupport) [
18 "ghcIosAarch64"
18 "ghcIosAarch64"
19 ];
19 ];
20+ variations = map (v: "reflex" + v) [
21+ "-dontUseTemplateHaskell"
22+ ""
23+ ];
20− hsPkgs = lib.genAttrs compilers (ghc: let
24+ compilerPkgs = lib.genAttrs compilers (ghc: let
21− ghc' = reflex-platform.${ghc}.override {
25+ variationPkgs = lib.genAttrs variations (variation: let
22− overrides = self: super: let
26+ reflex-platform = reflex-platform-fun {
27+ inherit system;
28+ __useTemplateHaskell = variation == "reflex"; # TODO hack
29+ haskellOverlays = [
30+ # Use this package's source for reflex
31+ (self: super: {
32+ _dep = super._dep // {
23− reflexSrc = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [
33+ reflex = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [
24− "default.nix"
25− "release.nix"
34+ "release.nix"
26− ".git"
35+ ".git"
27− "dist"
36+ "dist"
28− ])) ./.;
37+ ])) ./.;
29− in {
38+ };
30− reflex-dontUseTemplateHaskell = self.callCabal2nixWithOptions "reflex" reflexSrc "-f -use-template-haskell" {};
39+ })
31− reflex = self.callCabal2nixWithOptions "reflex" reflexSrc "-f +use-template-haskell" {};
40+ ];
32 };
41 };
33− };
42+ in reflex-platform.${ghc}.reflex);
34− in {
43+ in variationPkgs // {
35− inherit (ghc') reflex reflex-dontUseTemplateHaskell;
44+ cache = reflex-platform.pinBuildInputs "reflex-${system}-${ghc}"
45+ (builtins.attrValues variationPkgs);
36 });
46 });
37− in hsPkgs // {
47+ in compilerPkgs // {
38 cache = reflex-platform.pinBuildInputs "reflex-${system}"
48 cache = reflex-platform.pinBuildInputs "reflex-${system}"
39− (lib.concatLists (map builtins.attrValues (builtins.attrValues hsPkgs)));
49+ (map (a: a.cache) (builtins.attrValues compilerPkgs));
40 });
50 });
41
51
42 metaCache = native-reflex-platform.pinBuildInputs "reflex-everywhere"
52 metaCache = native-reflex-platform.pinBuildInputs "reflex-everywhere"