3c458f5 · haskell.nix · git.iko.soy

git.iko.soy/haskell.nix

on iko/ghcjs-patch-master help sign in

Add another check for #660 issues (#805)

3c458f5Hamish Mackenzie6 years ago

builder/comp-builder.nix+8−5

compare with iko/ghcjs-patch-master

unifiedsplit

@@ -305,23 +305,26 @@ let

305 mkdir -p $out/exactDep

306 touch $out/exactDep/configure-flags

307 touch $out/exactDep/cabal.config

308+ touch $out/envDep

308

309

309 if id=$(${target-pkg-and-db} field ${package.identifier.name} id --simple-output); then

310 if id=$(${target-pkg-and-db} field ${package.identifier.name} id --simple-output); then

310 echo "--dependency=${package.identifier.name}=$id" >> $out/exactDep/configure-flags

311 echo "--dependency=${package.identifier.name}=$id" >> $out/exactDep/configure-flags

312+ echo "package-id $id" >> $out/envDep

311 elif id=$(${target-pkg-and-db} field "z-${package.identifier.name}-z-*" id --simple-output); then

313 elif id=$(${target-pkg-and-db} field "z-${package.identifier.name}-z-*" id --simple-output); then

312 name=$(${target-pkg-and-db} field "z-${package.identifier.name}-z-*" name --simple-output)

314 name=$(${target-pkg-and-db} field "z-${package.identifier.name}-z-*" name --simple-output)

313 # so we are dealing with a sublib. As we build sublibs separately, the above

315 # so we are dealing with a sublib. As we build sublibs separately, the above

314 # query should be safe.

316 # query should be safe.

315 echo "--dependency=''${name#z-${package.identifier.name}-z-}=$id" >> $out/exactDep/configure-flags

317 echo "--dependency=''${name#z-${package.identifier.name}-z-}=$id" >> $out/exactDep/configure-flags

318+ else

319+ echo 'ERROR: ${package.identifier.name} id could not be found with ${target-pkg-and-db}'

320+ exit 0

316 fi

321 fi

317 if ver=$(${target-pkg-and-db} field ${package.identifier.name} version --simple-output); then

322 if ver=$(${target-pkg-and-db} field ${package.identifier.name} version --simple-output); then

318 echo "constraint: ${package.identifier.name} == $ver" >> $out/exactDep/cabal.config

323 echo "constraint: ${package.identifier.name} == $ver" >> $out/exactDep/cabal.config

319 echo "constraint: ${package.identifier.name} installed" >> $out/exactDep/cabal.config

324 echo "constraint: ${package.identifier.name} installed" >> $out/exactDep/cabal.config

320− fi

325+ else

321−

326+ echo 'ERROR: ${package.identifier.name} version could not be found with ${target-pkg-and-db}'

322− touch $out/envDep

327+ exit 0

323− if id=$(${target-pkg-and-db} field ${package.identifier.name} id --simple-output); then

324− echo "package-id $id" >> $out/envDep

325 fi

328 fi

326 ''}

329 ''}

327 ${(lib.optionalString (haskellLib.isTest componentId || haskellLib.isBenchmark componentId) ''

330 ${(lib.optionalString (haskellLib.isTest componentId || haskellLib.isBenchmark componentId) ''