558232d · reflex-dom · git.iko.soy

git.iko.soy/reflex-dom

Merge pull request #330 from reflex-frp/test-more

Test more in release.nix

commit558232d7e30e03e74b69809440c84f28b7fba706 authorAli Abrar <aliabrar@gmail.com> dateTue 1 Oct 2019, 17:02 (7 years ago) parentbee4823 2e43fce

5 files changed+52−19

compare with develop

unifiedsplit

default.nix+6−2 dep/reflex-platform/default.nix+7 dep/reflex-platform/github.json+7 reflex-platform.nix−8 release.nix+32−9

default.nix+6−2

@@ -1,7 +1,11 @@

1−haskellPackages: nixpkgs: {

1+haskellPackages: let

2+ pkgs = haskellPackages.callPackage ({ pkgs }: pkgs) {};

3+ inherit (pkgs) stdenv;

4+ haskellLib = pkgs.haskell.lib;

5+in {

26 reflex-dom = haskellPackages.callPackage ./reflex-dom {};

37 reflex-dom-core = haskellPackages.callPackage ./reflex-dom-core {

4− inherit (nixpkgs) iproute chromium;

8+ inherit (pkgs) iproute chromium;

59 };

610 chrome-test-utils = haskellPackages.callCabal2nix "chrome-test-utils" ./chrome-test-utils {};

711}

dep/reflex-platform/default.nixnew file+7

@@ -0,0 +1,7 @@

1+# DO NOT HAND-EDIT THIS FILE

2+import ((import <nixpkgs> {}).fetchFromGitHub (

3+ let json = builtins.fromJSON (builtins.readFile ./github.json);

4+ in { inherit (json) owner repo rev sha256;

5+ private = json.private or false;

6+ }

7+))

dep/reflex-platform/github.jsonnew file+7

@@ -0,0 +1,7 @@

1+{

2+ "owner": "reflex-frp",

3+ "repo": "reflex-platform",

4+ "branch": "develop",

5+ "rev": "e637442042c6e6f6914314b5c2d3a19edf48d31f",

6+ "sha256": "0aajnvx83r26r22n1sr0imhzh073wfsf85hbshsxd95l47jw6i7c"

7+}

reflex-platform.nixdeleted−8

@@ -1,8 +0,0 @@

1−let

2− reflex-platform-src = (import <nixpkgs> {}).fetchFromGitHub {

3− owner = "reflex-frp";

4− repo = "reflex-platform";

5− rev = "384cd850f3adf1d404bced2424b5f6efb0f415f2";

6− sha256 = "1ws77prqx8khmp8j6br1ij4k2v4dlgv170r9fmg0p1jivfbn8y9d";

7− };

8−in import reflex-platform-src

release.nix+32−9

@@ -1,12 +1,35 @@

1−{ rp ? import ./reflex-platform.nix {}

1+{ reflex-platform-fun ? import ./dep/reflex-platform

22}:

34let

4− inherit (rp.nixpkgs) lib;

5+ native-reflex-platform = reflex-platform-fun {};

6+ inherit (native-reflex-platform.nixpkgs) lib;

57 systems = ["x86_64-linux" "x86_64-darwin"];

6− compilers = ["ghc8_4" "ghc8_0" "ghcjs8_4" "ghcjs8_0"];

7−in lib.genAttrs systems (system:

8− lib.genAttrs compilers (ghc: let

9− reflex-platform = import ./reflex-platform.nix { inherit system; };

10− hsPkgs = reflex-platform.${ghc};

11− in { inherit (import ./. hsPkgs reflex-platform.nixpkgs) reflex-dom reflex-dom-core; })

12−)

9+ perPlatform = lib.genAttrs systems (system: let

10+ reflex-platform = reflex-platform-fun { inherit system; };

11+ compilers = [

12+ "ghc"

13+ "ghcjs"

14+ ] ++ lib.optionals (reflex-platform.androidSupport) [

15+ "ghcAndroidAarch64"

16+ "ghcAndroidAarch32"

17+ ] ++ lib.optionals (reflex-platform.iosSupport) [

18+ "ghcIosAarch64"

19+ ];

20+ hsPkgs = lib.genAttrs compilers (ghc: let

21+ ghc' = reflex-platform.${ghc}.override {

22+ overrides = self: super: import ./. self;

23+ };

24+ in {

25+ inherit (ghc') reflex-dom reflex-dom-core;

26+ });

27+ in hsPkgs // {

28+ cache = reflex-platform.pinBuildInputs "reflex-dom-${system}"

29+ (lib.concatLists (map builtins.attrValues (builtins.attrValues hsPkgs)));

30+ });

31+

32+ metaCache = native-reflex-platform.pinBuildInputs "reflex-dom-everywhere"

33+ (map (a: a.cache) (builtins.attrValues perPlatform));

34+

35+in perPlatform // { inherit metaCache; }