Merge branch 'modernize-reflease.nix' into ignore-traverse_

Author: Ericson2314

default.nix

@@ -7,13 +7,18 @@
 , transformers-compat, unbounded-delays, prim-uniq
 , data-default, filepath, directory, filemanip, ghcjs-base
 , monoidal-containers, witherable, profunctors
-, semialign ? null, splitThese ? (semialign != null)
+, splitThese ? (semialign != null), semialign ? null, these-lens ? null
 , useTemplateHaskell ? true
 }:
 mkDerivation {
   pname = "reflex";
   version = "0.6.2.4";
-  src = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [ ".git" "dist" ])) ./.;
+  src = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [
+    "default.nix"
+    "release.nix"
+    ".git"
+    "dist"
+  ])) ./.;
   libraryHaskellDepends = [
     base bifunctors containers dependent-map dependent-sum
     exception-transformers lens
@@ -30,6 +35,7 @@ mkDerivation {
     haskell-src-exts haskell-src-meta
   ]) ++ (if splitThese then [
     semialign
+    these-lens
   ] else []);
   testHaskellDepends = if ghc.isGhcjs or false then [] else [
     hlint filepath directory filemanip

dep/reflex-platform/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;
+     }
+))

dep/reflex-platform/github.json

@@ -0,0 +1,7 @@
+{
+  "owner": "reflex-frp",
+  "repo": "reflex-platform",
+  "branch": "jailbreakTheselens",
+  "rev": "4284ed527c96c373538dc7e31776d9a50ca6aa91",
+  "sha256": "1m1nkxq7ng9wnqbd77xn8d81f2iz8g61y5m0r3gp0gi0q59jm8ay"
+}

hydra.json

@@ -1,9 +1,38 @@
-{ rp ? import ./reflex-platform.nix {}
+{ reflex-platform-fun ? import ./dep/reflex-platform
 }:
+
 let
-  inherit (rp.nixpkgs) lib;
-  compilers = ["ghc8_4" "ghc8_0" "ghcjs8_4" "ghcjs8_0"];
-in lib.attrValues (lib.genAttrs compilers (ghc: {
-  reflex-useTemplateHaskell = rp.${ghc}.callPackage ./. { useTemplateHaskell = true; splitThese = false; };
-  reflex = rp.${ghc}.callPackage ./. { useTemplateHaskell = false; splitThese = false; };
-}))
+  native-reflex-platform = reflex-platform-fun {};
+  inherit (native-reflex-platform.nixpkgs) lib;
+  systems = ["x86_64-linux" "x86_64-darwin"];
+
+  perPlatform = lib.genAttrs systems (system: let
+    reflex-platform = reflex-platform-fun { inherit system; };
+    compilers = [
+      "ghc"
+      "ghcjs"
+    ] ++ lib.optionals (reflex-platform.androidSupport) [
+      "ghcAndroidAarch64"
+      "ghcAndroidAarch32"
+    ] ++ lib.optionals (reflex-platform.iosSupport) [
+      "ghcIosAarch64"
+    ];
+    hsPkgs = lib.genAttrs compilers (ghc: let
+      ghc' = reflex-platform.${ghc}.override {
+        overrides = self: super: {
+          reflex-dontUseTemplateHaskell = self.callPackage ./. { useTemplateHaskell = false; };
+          reflex = self.callPackage ./. { useTemplateHaskell = true; };
+        };
+      };
+    in {
+      inherit (ghc') reflex reflex-dontUseTemplateHaskell;
+    });
+  in hsPkgs // {
+    cache = reflex-platform.pinBuildInputs "reflex-${system}"
+      (lib.concatLists (map builtins.attrValues (builtins.attrValues hsPkgs)));
+  });
+
+  metaCache = native-reflex-platform.pinBuildInputs "reflex-everywhere"
+    (map (a: a.cache) (builtins.attrValues perPlatform));
+
+in perPlatform // { inherit metaCache; }