c94a6b9 · patch · git.iko.soy

default.nix+8−2

compare with develop

unifiedsplit

@@ -7,13 +7,18 @@

7, transformers-compat, unbounded-delays, prim-uniq

8, data-default, filepath, directory, filemanip, ghcjs-base

9, monoidal-containers, witherable, profunctors

10−, semialign ? null, splitThese ? (semialign != null)

10+, splitThese ? (semialign != null), semialign ? null, these-lens ? null

11, useTemplateHaskell ? true

12}:

13mkDerivation {

14 pname = "reflex";

15 version = "0.6.2.4";

16− src = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [ ".git" "dist" ])) ./.;

16+ src = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [

17+ "default.nix"

18+ "release.nix"

19+ ".git"

20+ "dist"

21+ ])) ./.;

17 libraryHaskellDepends = [

22 libraryHaskellDepends = [

18 base bifunctors containers dependent-map dependent-sum

23 base bifunctors containers dependent-map dependent-sum

19 exception-transformers lens

24 exception-transformers lens

@@ -30,6 +35,7 @@ mkDerivation {

30 haskell-src-exts haskell-src-meta

35 haskell-src-exts haskell-src-meta

31 ]) ++ (if splitThese then [

36 ]) ++ (if splitThese then [

32 semialign

37 semialign

38+ these-lens

33 ] else []);

39 ] else []);

34 testHaskellDepends = if ghc.isGhcjs or false then [] else [

40 testHaskellDepends = if ghc.isGhcjs or false then [] else [

35 hlint filepath directory filemanip

41 hlint filepath directory filemanip

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": "jailbreakTheselens",

5+ "rev": "4284ed527c96c373538dc7e31776d9a50ca6aa91",

6+ "sha256": "1m1nkxq7ng9wnqbd77xn8d81f2iz8g61y5m0r3gp0gi0q59jm8ay"

7+}

hydra.jsondeleted−29

@@ -1,29 +0,0 @@

1−{

2− "enabled": 1,

3− "hidden": true,

4− "description": "Jobsets",

5− "nixexprinput": "src",

6− "nixexprpath": "jobsets.nix",

7− "checkinterval": 300,

8− "schedulingshares": 100,

9− "enableemail": false,

10− "emailoverride": "",

11− "keepnr": 10,

12− "inputs": {

13− "src": {

14− "type": "git",

15− "value": "https://github.com/reflex-frp/reflex.git develop",

16− "emailresponsible": false

17− },

18− "nixpkgs": {

19− "type": "git",

20− "value": "https://github.com/NixOS/nixpkgs-channels nixos-unstable",

21− "emailresponsible": false

22− },

23− "prs": {

24− "type": "githubpulls",

25− "value": "reflex-frp reflex",

26− "emailresponsible": false

27− }

28− }

29−}

jobsets.nixdeleted−70

@@ -1,70 +0,0 @@

1−{ prs }:

2−

3−let

4− pkgs = (import ./reflex-platform.nix {}).nixpkgs;

5− mkFetchGithub = value: {

6− inherit value;

7− type = "git";

8− emailresponsible = false;

9− };

10−in

11−with pkgs.lib;

12−let

13− defaults = jobs: {

14− inherit (jobs) description;

15− enabled = 1;

16− hidden = false;

17− keepnr = 10;

18− schedulingshares = 100;

19− checkinterval = 120;

20− enableemail = false;

21− emailoverride = "";

22− nixexprinput = "reflex";

23− nixexprpath = "release.nix";

24− inputs = jobs.inputs // {

25− nixpkgs = {

26− type = "git";

27− value = "https://github.com/NixOS/nixpkgs-channels nixos-unstable";

28− emailresponsible = false;

29− };

30− config = {

31− type = "nix";

32− value = "{ android_sdk.accept_license = true; }";

33− emailresponsible = false;

34− };

35− };

36− };

37− branchJobset = branch: defaults {

38− description = "reflex-${branch}";

39− inputs = {

40− reflex = {

41− value = "https://github.com/reflex-frp/reflex ${branch}";

42− type = "git";

43− emailresponsible = false;

44− };

45− };

46− };

47− makePr = num: info: {

48− name = "reflex-pr-${num}";

49− value = defaults {

50− description = "#${num}: ${info.title}";

51− inputs = {

52− reflex = {

53− #NOTE: This should really use "pull/${num}/merge"; however, GitHub's

54− #status checks only operate on PR heads. This creates a race

55− #condition, which can currently only be solved by requiring PRs to be

56− #up to date before they're merged. See

57− #https://github.com/isaacs/github/issues/1002

58− value = "https://github.com/reflex-frp/reflex pull/${num}/head";

59− type = "git";

60− emailresponsible = false;

61− };

62− };

63− };

64− };

65− processedPrs = mapAttrs' makePr (builtins.fromJSON (builtins.readFile prs));

66− jobsetsAttrs = processedPrs //

67− genAttrs ["develop"] branchJobset;

68−in {

69− jobsets = pkgs.writeText "spec.json" (builtins.toJSON jobsetsAttrs);

70−}

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+36−7

@@ -1,9 +1,38 @@

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

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

2}:

3+

3let

4let

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

4− inherit (rp.nixpkgs) lib;

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

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

7+ systems = ["x86_64-linux" "x86_64-darwin"];

8+

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+ ];

6−in lib.attrValues (lib.genAttrs compilers (ghc: {

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

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

22+ overrides = self: super: {

23+ reflex-dontUseTemplateHaskell = self.callPackage ./. { useTemplateHaskell = false; };

7− reflex-useTemplateHaskell = rp.${ghc}.callPackage ./. { useTemplateHaskell = true; splitThese = false; };

24+ reflex = self.callPackage ./. { useTemplateHaskell = true; };

8− reflex = rp.${ghc}.callPackage ./. { useTemplateHaskell = false; splitThese = false; };

25+ };

9−}))

26+ };

27+ in {

28+ inherit (ghc') reflex reflex-dontUseTemplateHaskell;

29+ });

30+ in hsPkgs // {

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

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

33+ });

34+

35+ metaCache = native-reflex-platform.pinBuildInputs "reflex-everywhere"

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

37+

38+in perPlatform // { inherit metaCache; }