git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Ensure enable-shared is false for windows and iOS (#349)

Also includes a fix for `haskell.nix.hackage-package` function

commitf64ff16c508fea4aa919077d5ea40370ee0127cd authorMoritz Angermann <moritz.angermann@gmail.com> dateSun 8 Dec 2019, 08:17 (7 years ago) parentdeccd00
3 files changed+6−6
compare with iko/ghcjs-patch-master
unifiedsplit
builder/comp-builder.nix+2−2 compiler/old-ghc-nix/old-ghc-nix.json+3−3 overlays/haskell.nix+1−1
builder/comp-builder.nix+2−2
@@ -24,7 +24,7 @@
2424, dontStrip ? component.dontStrip
2525
2626, enableStatic ? component.enableStatic
27−, enableShared ? component.enableShared
27+, enableShared ? component.enableShared && !stdenv.hostPlatform.isWindows && !stdenv.hostPlatform.useiOSPrebuilt
2828, enableDeadCodeElimination ? component.enableDeadCodeElimination
2929
3030# Options for Haddock generation
@@ -144,7 +144,7 @@ stdenv.mkDerivation ({
144144
145145 doCheck = false;
146146 doCrossCheck = false;
147−
147+
148148 inherit dontPatchELF dontStrip;
149149
150150 passthru = {
compiler/old-ghc-nix/old-ghc-nix.json+3−3
@@ -1,7 +1,7 @@
11{
22 "url": "https://github.com/angerman/old-ghc-nix",
3− "rev": "cda937215e85ef5f8064a9f97fc5dce948d028a2",
4− "date": "2019-07-26T23:00:31+08:00",
5− "sha256": "00zgkmd7g2rafa2gfz7nx3ahv89qf2jwr8i8r4g7bvykxvh8ga8v",
3+ "rev": "c7c381f3ec5fb80e807271271f9df75ab7127f57",
4+ "date": "2019-12-06T12:34:44+08:00",
5+ "sha256": "0j1jwxfhcdz6h9qpvzz39kllhz6wb2bvgyy5irj6iav9ykp6xjin",
66 "fetchSubmodules": false
77}
overlays/haskell.nix+1−1
@@ -296,7 +296,7 @@ self: super: {
296296 # the index-state-hashes is used. This guarantees reproducability wrt
297297 # to the haskell.nix revision. If reproducability beyond haskell.nix
298298 # is required, a specific index-state should be provided!
299− hackage-package = { name, ... }@args: (hackage-project args).${name};
299+ hackage-package = { name, ... }@args: (hackage-project args).hsPkgs.${name};
300300 hackage-project =
301301 { name
302302 , version