72d602f · patch · git.iko.soy

git.iko.soy/patch

on develop help sign in

Bump version to 0.6.2.2; Add flag to choose whether to use new split these package

72d602fAli Abrar7 years ago

default.nix+8−5

compare with develop

unifiedsplit

@@ -7,11 +7,12 @@

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

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

9, monoidal-containers, witherable

10+, semialign ? null, splitThese ? true

10, useTemplateHaskell ? true

11, useTemplateHaskell ? true

11}:

12}:

12mkDerivation {

13mkDerivation {

13 pname = "reflex";

14 pname = "reflex";

14− version = "0.6.2.1";

15+ version = "0.6.2.2";

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

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

16 libraryHaskellDepends = [

17 libraryHaskellDepends = [

17 base bifunctors containers dependent-map dependent-sum

18 base bifunctors containers dependent-map dependent-sum

@@ -26,13 +27,15 @@ mkDerivation {

26 ghcjs-base

27 ghcjs-base

27 ] else []) ++ (if !useTemplateHaskell then [] else [

28 ] else []) ++ (if !useTemplateHaskell then [] else [

28 haskell-src-exts haskell-src-meta

29 haskell-src-exts haskell-src-meta

29− ]);

30+ ]) ++ (if splitThese then [

31+ semialign

32+ ] else []);

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

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

31 hlint filepath directory filemanip

34 hlint filepath directory filemanip

32 ];

35 ];

33− configureFlags = if useTemplateHaskell then [] else [

36+ configureFlags =

34− "-f-use-template-haskell"

37+ stdenv.lib.optional (!useTemplateHaskell) [ "-f-use-template-haskell" ] ++

35− ];

38+ stdenv.lib.optional (!splitThese) [ "-f-split-these" ];

36 homepage = "https://github.com/reflex-frp/reflex";

39 homepage = "https://github.com/reflex-frp/reflex";

37 description = "Higher-order Functional Reactive Programming";

40 description = "Higher-order Functional Reactive Programming";

38 license = stdenv.lib.licenses.bsd3;

41 license = stdenv.lib.licenses.bsd3;

reflex.cabal+2−3

@@ -1,5 +1,5 @@

1Name: reflex

2−Version: 0.6.2.1

2+Version: 0.6.2.2

3Synopsis: Higher-order Functional Reactive Programming

4Description: Reflex is a high-performance, deterministic, higher-order Functional Reactive Programming system

5License: BSD3

@@ -218,8 +218,7 @@ test-suite hlint

218 , directory

219 , filepath

220 , filemanip

221− -- newer versions need ghc-lib-parser, and have failing hints

222− , hlint <2.1

221+ , hlint >= 2.2.2 && < 2.3

223 if impl(ghcjs)

222 if impl(ghcjs)

224 buildable: False

223 buildable: False

225

224

release.nix+4−4

@@ -3,7 +3,7 @@

3let

4 inherit (rp.nixpkgs) lib;

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

6−in lib.genAttrs compilers (ghc: {

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

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

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

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

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

9−})

9+}))