git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Ignore extra ghc-options in dummy ghc. Fixes #656 (#658)
edd1d21Hamish Mackenzie
lib/call-cabal-project-to-nix.nix+10−8
compare with iko/ghcjs-patch-master
unifiedsplit
@@ -286,26 +286,26 @@ let
286 text = ''
286 text = ''
287 #!${pkgs.evalPackages.runtimeShell}
287 #!${pkgs.evalPackages.runtimeShell}
288 case "$*" in
288 case "$*" in
289− --version)
289+ --version*)
290 cat ${dummy-ghc-data}/ghc/version
290 cat ${dummy-ghc-data}/ghc/version
291 ;;
291 ;;
292− --numeric-version)
292+ --numeric-version*)
293 cat ${dummy-ghc-data}/ghc/numeric-version
293 cat ${dummy-ghc-data}/ghc/numeric-version
294 ;;
294 ;;
295− --supported-languages)
295+ --supported-languages*)
296 cat ${dummy-ghc-data}/ghc/supported-languages
296 cat ${dummy-ghc-data}/ghc/supported-languages
297 ;;
297 ;;
298− --print-global-package-db)
298+ --print-global-package-db*)
299 echo "$out/dumby-db"
299 echo "$out/dumby-db"
300 ;;
300 ;;
301− --info)
301+ --info*)
302 cat ${dummy-ghc-data}/ghc/info
302 cat ${dummy-ghc-data}/ghc/info
303 ;;
303 ;;
304− --print-libdir)
304+ --print-libdir*)
305 echo ${dummy-ghc-data}/ghc/libdir
305 echo ${dummy-ghc-data}/ghc/libdir
306 ;;
306 ;;
307 *)
307 *)
308− echo "Unknown argment '$*'" >&2
308+ echo "Unknown argument '$*'" >&2
309 exit 1
309 exit 1
310 ;;
310 ;;
311 esac
311 esac
@@ -328,7 +328,9 @@ let
328 cat ${dummy-ghc-data}/ghc-pkg/dump-global
328 cat ${dummy-ghc-data}/ghc-pkg/dump-global
329 ;;
329 ;;
330 *)
330 *)
331− echo "Unknown argment '$*'" >&2
331+ echo "Unknown argument '$*'. " >&2
332+ echo "Additional ghc-pkg-options are not currently supported." >&2
333+ echo "See https://github.com/input-output-hk/haskell.nix/pull/658" >&2
332 exit 1
334 exit 1
333 ;;
335 ;;
334 esac
336 esac