on iko/ghcjs-patch-master help sign in
Fix conflicting flag definitions #254 (#258)
commitdf51ce67b25908799a84e6562433d618101196b0 authorHamish Mackenzie <Hamish.Mackenzie@iohk.io> dateMon 14 Oct 2019, 00:42 (7 years ago) parent147cf21
3 files changed+9−17
docs/user-guide/projects.md+5−8 nix-tools/nix-tools-src.json+3−3 test/buildable/default.nix+1−6
docs/user-guide/projects.md+5−8
@@ -30,8 +30,8 @@ let
3030 # packages.cbors.package.ghcOptions = "-Werror";
3131 # packages.cbors.patches = [ ./one.patch ];
3232 # packages.cbors.flags.optimize-gmp = false;
33− # It may be better to set flags in stack.yaml instead (overrides will
34− # be included for them automatically by `stack-to-nix`).
33+ # It may be better to set flags in stack.yaml instead
34+ # (`stack-to-nix` will include them as defaults).
3535 ];
3636 };
3737
@@ -44,12 +44,9 @@ let
4444 # example:
4545 # packages.cbors.package.ghcOptions = "-Werror";
4646 # packages.cbors.patches = [ ./one.patch ];
47− # To override a flag you will need to use mkOverride to make
48− # it clear that you wish to replace the value found in the
49− # `plan.json` file (all the flags values are included there
50− # by `cabal`).
51− # packages.cbors.flags.optimize-gmp = stdenv.lib.mkOverride 10 false;
52− # It may be better to set flags in `cabal.project` instead.
47+ # packages.cbors.flags.optimize-gmp = false;
48+ # It may be better to set flags in `cabal.project` instead
49+ # (`plan-to-nix` will include them as defaults).
5350 ];
5451 };
5552
nix-tools/nix-tools-src.json+3−3
@@ -1,7 +1,7 @@
11{
22 "url": "https://github.com/input-output-hk/nix-tools",
3− "rev": "87d97c50a53e421ed016d4c9a1dc41f9e6edda53",
4− "date": "2019-10-12T14:56:33+08:00",
5− "sha256": "1zvk13haiiyb6mcmypjn20i6vcx98y8zp5ipj0vpbflpg7f6rldm",
3+ "rev": "1b3d624d6f23ae932508d54954a42a5e489e06a5",
4+ "date": "2019-10-13T14:17:51+08:00",
5+ "sha256": "13lv0sdrwcc56yl46nfkh9vi10y3cd1jns9ghac56h0y9pdn0jbc",
66 "fetchSubmodules": false
77}
test/buildable/default.nix+1−6
@@ -9,12 +9,7 @@ let
99 });
1010 pkgSet = mkCabalProjectPkgSet {
1111 plan-pkgs = plan.pkgs;
12− # We need mkOverride to override the value from `plan.json`.
13− # Normally we could set the flag in `cabal.project`,
14− # but for this test that does not work because then cabal would
15− # see the exe is not buildable and exclude it before haskell.nix
16− # can.
17− modules = [ { packages.buildable-test.flags.exclude-broken = mkOverride 10 true; } ];
12+ modules = [ { packages.buildable-test.flags.exclude-broken = true; } ];
1813 };
1914 packages = pkgSet.config.hsPkgs;
2015in