bb464cc · reflex-dom · git.iko.soy

git.iko.soy/reflex-dom

Fix overriding mkDerivation

If we call `callPackage` ourselvess around the `callCabal2nix`, fewer and unexpected things alone can be overridden---just the packages we used in the manual overrideCabal. This new way, those package cannot be overidden, but at least the default cabal2nix-generated arguments scan. That's the better tradeoff. The real issue `callPackage` arg sniffing breaks eta expansion, which really sucks.

commitbb464cc50321a50096ddeb0da241fb18a68b4661 authorJohn Ericson <git@JohnEricson.me> dateWed 13 Nov 2019, 22:53 (7 years ago) parent8d23435

1 file changed+8−14

compare with develop

unifiedsplit

default.nix+8−14

default.nix+8−14

@@ -3,10 +3,7 @@ haskellPackages: let

33 inherit (pkgs) stdenv;

44 haskellLib = pkgs.haskell.lib;

55in {

6− reflex-dom-core = haskellPackages.callPackage

7− ({ temporary, jsaddle-warp, process, chrome-test-utils

8− , selenium-server-standalone, which, fontconfig, chromium, pkgs

9− }: let

6+ reflex-dom-core = let

107 inherit (haskellPackages) ghc;

118 noGcTest = stdenv.hostPlatform.system != "x86_64-linux"

129 || stdenv.hostPlatform != stdenv.buildPlatform

@@ -25,14 +22,14 @@ in {

2522 # Show some output while running tests, so we might notice what's wrong

2623 testTarget = "--show-details=streaming";

2724

28− testHaskellDepends = (drv.testHaskellDepends or []) ++ stdenv.lib.optionals (!noGcTest) [

25+ testHaskellDepends = with haskellPackages; (drv.testHaskellDepends or []) ++ stdenv.lib.optionals (!noGcTest) [

2926 temporary

3027 jsaddle-warp

3128 process

3229 chrome-test-utils

3330 ];

3431

35− testSystemDepends = (drv.testSystemDepends or []) ++ [

32+ testSystemDepends = with pkgs; (drv.testSystemDepends or []) ++ [

3633 selenium-server-standalone which

3734 ] ++ stdenv.lib.optionals (!noGcTest) [

3835 chromium

@@ -41,19 +38,16 @@ in {

4138 } // stdenv.lib.optionalAttrs (!noGcTest) {

4239 # The headless browser run as part of gc tests would hang/crash without this

4340 preCheck = ''

44− export FONTCONFIG_PATH=${fontconfig.out}/etc/fonts

41+ export FONTCONFIG_PATH=${pkgs.fontconfig.out}/etc/fonts

4542 '';

46− }))

47− {};

48− reflex-dom = haskellPackages.callPackage

49− ({ android-activity }: haskellLib.overrideCabal

43+ });

44+ reflex-dom = haskellLib.overrideCabal

5045 (haskellPackages.callCabal2nix "reflex-dom" ./reflex-dom { })

5146 (drv: {

5247 # Hack until https://github.com/NixOS/cabal2nix/pull/432 lands

5348 libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ stdenv.lib.optionals (with stdenv.hostPlatform; isAndroid && is32bit) [

54− android-activity

49+ haskellPackages.android-activity

5550 ];

56− }))

57− {};

51+ });

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

5953}