git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Ensure enable-shared is false for windows and iOS (#349)
f64ff16Moritz Angermann
builder/comp-builder.nix+2−2
compare with iko/ghcjs-patch-master
unifiedsplit
@@ -24,7 +24,7 @@
24, dontStrip ? component.dontStrip
24, dontStrip ? component.dontStrip
25
25
26, enableStatic ? component.enableStatic
26, enableStatic ? component.enableStatic
27−, enableShared ? component.enableShared
27+, enableShared ? component.enableShared && !stdenv.hostPlatform.isWindows && !stdenv.hostPlatform.useiOSPrebuilt
28, enableDeadCodeElimination ? component.enableDeadCodeElimination
28, enableDeadCodeElimination ? component.enableDeadCodeElimination
29
29
30# Options for Haddock generation
30# Options for Haddock generation
@@ -144,7 +144,7 @@ stdenv.mkDerivation ({
144
144
145 doCheck = false;
145 doCheck = false;
146 doCrossCheck = false;
146 doCrossCheck = false;
147−
147+
148 inherit dontPatchELF dontStrip;
148 inherit dontPatchELF dontStrip;
149
149
150 passthru = {
150 passthru = {
compiler/old-ghc-nix/old-ghc-nix.json+3−3
@@ -1,7 +1,7 @@
1{
1{
2 "url": "https://github.com/angerman/old-ghc-nix",
2 "url": "https://github.com/angerman/old-ghc-nix",
3− "rev": "cda937215e85ef5f8064a9f97fc5dce948d028a2",
3+ "rev": "c7c381f3ec5fb80e807271271f9df75ab7127f57",
4− "date": "2019-07-26T23:00:31+08:00",
4+ "date": "2019-12-06T12:34:44+08:00",
5− "sha256": "00zgkmd7g2rafa2gfz7nx3ahv89qf2jwr8i8r4g7bvykxvh8ga8v",
5+ "sha256": "0j1jwxfhcdz6h9qpvzz39kllhz6wb2bvgyy5irj6iav9ykp6xjin",
6 "fetchSubmodules": false
6 "fetchSubmodules": false
7}
7}
overlays/haskell.nix+1−1
@@ -296,7 +296,7 @@ self: super: {
296 # the index-state-hashes is used. This guarantees reproducability wrt
296 # the index-state-hashes is used. This guarantees reproducability wrt
297 # to the haskell.nix revision. If reproducability beyond haskell.nix
297 # to the haskell.nix revision. If reproducability beyond haskell.nix
298 # is required, a specific index-state should be provided!
298 # 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};
300 hackage-project =
300 hackage-project =
301 { name
301 { name
302 , version
302 , version