46fad81 · haskell.nix · git.iko.soy

builder/hspkg-builder.nix+1

compare with iko/ghcjs-patch-master

unifiedsplit

@@ -41,6 +41,7 @@ let

41 else setup-builder {

42 setup-depends = package.setup-depends;

43 inherit package name src flags revision patches defaultSetupSrc;

44+ inherit (config) preUnpack postUnpack;

44 };

45 };

45

46

46 buildComp = componentId: component: comp-builder {

47 buildComp = componentId: component: comp-builder {

builder/setup-builder.nix+8−2

@@ -1,6 +1,8 @@

1{ stdenv, lib, buildPackages, haskellLib, ghc, nonReinstallablePkgs, hsPkgs, makeSetupConfigFiles }:

2

3−{ setup-depends, package, name, src, flags, revision, patches, defaultSetupSrc }:

3+{ setup-depends, package, name, src, flags, revision, patches, defaultSetupSrc

4+, preUnpack ? null, postUnpack ? null

5+}:

4

6

5let

7let

6 component = {

8 component = {

@@ -31,6 +33,9 @@ let

31 inherit (package) identifier;

33 inherit (package) identifier;

32 inherit fullName flags component;

34 inherit fullName flags component;

33 };

35 };

36+ hooks = haskellLib.optionalHooks {

37+ inherit preUnpack postUnpack;

38+ };

34

39

35in

40in

36 stdenv.lib.fix (drv:

41 stdenv.lib.fix (drv:

@@ -66,5 +71,6 @@ in

66 install ./Setup $out/bin/Setup

71 install ./Setup $out/bin/Setup

67 '';

72 '';

68 }

73 }

69− // lib.optionalAttrs (patches != []) { patches = map (p: if builtins.isFunction p then p { inherit (package.identifier) version; inherit revision; } else p) patches; }

74+ // (lib.optionalAttrs (patches != []) { patches = map (p: if builtins.isFunction p then p { inherit (package.identifier) version; inherit revision; } else p) patches; })

75+ // hooks

70 ))

76 ))

overlays/bootstrap.nix+1

@@ -66,6 +66,7 @@ self: super: rec {

66 ++ self.lib.optional (version == "8.6.4") ./patches/ghc/ghc-8.6.4-reinstallable-lib-ghc.patch

67 ++ self.lib.optional (version == "8.6.5") ./patches/ghc/ghc-8.6.5-reinstallable-lib-ghc.patch

68 ++ self.lib.optional (version == "8.6.4") ./patches/ghc/ghc-8.6.4-better-plusSimplCountErrors.patch

69+ ++ self.lib.optional (versionAtLeast "8.6.4" && self.stdenv.isDarwin) ./patches/ghc/ghc-macOS-loadArchive-fix.patch

69 ;

70 ;

70 in ({

71 in ({

71 ghc844 = self.callPackage ../compiler/ghc {

72 ghc844 = self.callPackage ../compiler/ghc {

overlays/patches/ghc/ghc-macOS-loadArchive-fix.patchnew file+9

@@ -0,0 +1,9 @@

1+--- a/compiler/ghci/Linker.hs

2++++ b/compiler/ghci/Linker.hs

3+@@ -1487,7 +1487,6 @@ locateLib hsc_env is_hs lib_dirs gcc_dirs lib

4+ dyn_obj_file = lib <.> "dyn_o"

5+ arch_files = [ "lib" ++ lib ++ lib_tag <.> "a"

6+ , lib <.> "a" -- native code has no lib_tag

7+- , "lib" ++ lib, lib

8+ ]

9+ lib_tag = if is_hs && loading_profiled_hs_libs then "_p" else ""