Merge branch 'develop' into joindyn-intmap
commit949052024e70d897b3024c49cdba6c71687c671c
authorElliot Cameron <3noch@users.noreply.github.com>
dateMon 4 May 2020, 23:38 (6 years ago)
parentac1c9c155909aa
reflex.cabal+1−1
@@ -244,7 +244,7 @@ test-suite hlint
244244 , directory
245245 , filepath
246246 , filemanip
247− , hlint < 2.1 || >= 2.2.2
247+ , hlint (< 2.1 || >= 2.2.2) && < 3
248248 if impl(ghcjs)
249249 buildable: False
250250
release.nix+2−2
@@ -1,12 +1,12 @@
11{ reflex-platform-fun ? import ./dep/reflex-platform
2+, supportedSystems ? ["x86_64-linux" "x86_64-darwin"]
23}:
34
45let
56 native-reflex-platform = reflex-platform-fun {};
67 inherit (native-reflex-platform.nixpkgs) lib;
7− systems = ["x86_64-linux" "x86_64-darwin"];
88
9− perPlatform = lib.genAttrs systems (system: let
9+ perPlatform = lib.genAttrs supportedSystems (system: let
1010 reflex-platform = reflex-platform-fun { inherit system; };
1111 compilers = [
1212 "ghc"