2b7d93b · haskell.nix · git.iko.soy

git.iko.soy/haskell.nix

on iko/ghcjs-patch-master help sign in

Allow package-name:sublib-name in build-depends (#963)

2b7d93bHamish Mackenzie6 years ago

builder/comp-builder.nix+35−21

compare with iko/ghcjs-patch-master

unifiedsplit

@@ -325,31 +325,43 @@ let

325 ${lib.optionalString (haskellLib.isLibrary componentId) ''

326 $SETUP_HS register --gen-pkg-config=${name}.conf

327 ${ghc.targetPrefix}ghc-pkg -v0 init $out/package.conf.d

328− if [ -d "${name}.conf" ]; then

329− for pkg in ${name}.conf/*; do

330− ${ghc.targetPrefix}ghc-pkg -v0 --package-db ${configFiles}/${configFiles.packageCfgDir} -f $out/package.conf.d register "$pkg"

331− done

332− elif [ -e "${name}.conf" ]; then

333− ${ghc.targetPrefix}ghc-pkg -v0 --package-db ${configFiles}/${configFiles.packageCfgDir} -f $out/package.conf.d register ${name}.conf

328+ ${ghc.targetPrefix}ghc-pkg -v0 --package-db ${configFiles}/${configFiles.packageCfgDir} -f $out/package.conf.d register ${name}.conf

334− fi

335

329

336 mkdir -p $out/exactDep

330 mkdir -p $out/exactDep

337 touch $out/exactDep/configure-flags

331 touch $out/exactDep/configure-flags

338 touch $out/exactDep/cabal.config

332 touch $out/exactDep/cabal.config

339 touch $out/envDep

333 touch $out/envDep

340

334

335+ ${ # The main library in a package has the same name as the package

336+ if package.identifier.name == componentId.cname

337+ then ''

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

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

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

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

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

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

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

341+ else

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

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

343+ exit 0

344+ fi

345+ ''

346+ else

347+ # If the component name is not the package name this must be a sublib.

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

348+ # As we build sublibs separately, the following query should be safe.

347− # query should be safe.

349+ (''

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

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

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

353+ ''

354+ # Allow `package-name:sublib-name` to work in `build-depends`

355+ # by adding the same `--dependency` again, but with the package

356+ # name added.

357+ + ''

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

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

349− else

359+ else

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

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

351− exit 0

361+ exit 0

352− fi

362+ fi

363+ '')

364+ }

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

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

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

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

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

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

@@ -372,21 +384,23 @@ let

372 '')

384 '')

373 # In case `setup copy` did not create this

385 # In case `setup copy` did not create this

374 + (lib.optionalString enableSeparateDataOutput "mkdir -p $data")

386 + (lib.optionalString enableSeparateDataOutput "mkdir -p $data")

375− + (lib.optionalString (stdenv.hostPlatform.isWindows && (haskellLib.mayHaveExecutable componentId)) ''

387+ + (lib.optionalString (stdenv.hostPlatform.isWindows && (haskellLib.mayHaveExecutable componentId)) (''

376 echo "Symlink libffi and gmp .dlls ..."

388 echo "Symlink libffi and gmp .dlls ..."

377 for p in ${lib.concatStringsSep " " [ libffi gmp ]}; do

389 for p in ${lib.concatStringsSep " " [ libffi gmp ]}; do

378 find "$p" -iname '*.dll' -exec ln -s {} $out/bin \;

390 find "$p" -iname '*.dll' -exec ln -s {} $out/bin \;

379 done

391 done

392+ ''

380 # symlink all .dlls into the local directory.

393 # symlink all .dlls into the local directory.

381 # we ask ghc-pkg for *all* dynamic-library-dirs and then iterate over the unique set

394 # we ask ghc-pkg for *all* dynamic-library-dirs and then iterate over the unique set

382 # to symlink over dlls as needed.

395 # to symlink over dlls as needed.

396+ + ''

383 echo "Symlink library dependencies..."

397 echo "Symlink library dependencies..."

384 for libdir in $(x86_64-pc-mingw32-ghc-pkg --package-db=$packageConfDir field "*" dynamic-library-dirs --simple-output|xargs|sed 's/ /\n/g'|sort -u); do

398 for libdir in $(x86_64-pc-mingw32-ghc-pkg --package-db=$packageConfDir field "*" dynamic-library-dirs --simple-output|xargs|sed 's/ /\n/g'|sort -u); do

385 if [ -d "$libdir" ]; then

399 if [ -d "$libdir" ]; then

386 find "$libdir" -iname '*.dll' -exec ln -s {} $out/bin \;

400 find "$libdir" -iname '*.dll' -exec ln -s {} $out/bin \;

387 fi

401 fi

388 done

402 done

389− '')

403+ ''))

390 + (lib.optionalString doCoverage ''

404 + (lib.optionalString doCoverage ''

391 mkdir -p $out/share

405 mkdir -p $out/share

392 cp -r dist/hpc $out/share

406 cp -r dist/hpc $out/share

builder/default.nix+2−2

@@ -1,4 +1,4 @@

1−{ pkgs, buildPackages, stdenv, lib, haskellLib, ghc, fetchurl, pkgconfig, nonReinstallablePkgs, hsPkgs, compiler }:

1+{ pkgs, buildPackages, stdenv, lib, haskellLib, ghc, compiler-nix-name, fetchurl, pkgconfig, nonReinstallablePkgs, hsPkgs, compiler }:

3let

4 # Builds a single component of a package.

@@ -75,7 +75,7 @@ in {

75 # Build a Haskell package from its config.

76 # TODO: this pkgs is the adjusted pkgs, but pkgs.pkgs is unadjusted

77 build-package = haskellLib.weakCallPackage pkgs ./hspkg-builder.nix {

78− inherit haskellLib ghc comp-builder setup-builder;

78+ inherit haskellLib ghc compiler-nix-name comp-builder setup-builder;

79 };

81 inherit shellFor makeConfigFiles;

builder/hspkg-builder.nix+19−2

@@ -1,4 +1,4 @@

1−{ pkgs, buildPackages, stdenv, lib, haskellLib, ghc, fetchurl, runCommand, comp-builder, setup-builder }:

1+{ pkgs, buildPackages, stdenv, lib, haskellLib, ghc, compiler-nix-name, fetchurl, runCommand, comp-builder, setup-builder }:

3config:

4{ flags

@@ -34,10 +34,27 @@ let

34 import Distribution.Simple

35 main = defaultMain

36 '';

37+

38+ # Get the Cabal lib used to build `cabal-install`.

39+ # To avoid infinite recursion we have to leave this out for packages

40+ # needed to build `cabal-install`.

41+ # We always do this for ghcjs as the patched version of Cabal is needed.

42+ cabalLibDepends = lib.optional (

43+ stdenv.hostPlatform.isGhcjs || (

44+ builtins.elem compiler-nix-name["ghc865" "ghc884"]

45+ &&

46+ !builtins.elem package.identifier.name

47+ ["nix-tools" "alex" "happy" "hscolour" "Cabal" "bytestring" "aeson" "time"

48+ "filepath" "base-compat-batteries" "base-compat" "unix" "directory" "transformers"

49+ "containers" "binary" "mtl" "text" "process" "parsec"]

50+ )

51+ )

52+ buildPackages.haskell-nix.cabal-install-unchecked.${compiler-nix-name}.project.hsPkgs.Cabal.components.library;

53+

37 defaultSetup = setup-builder {

54 defaultSetup = setup-builder {

38 name = "${ghc.targetPrefix}default-Setup";

55 name = "${ghc.targetPrefix}default-Setup";

39 component = {

56 component = {

40− depends = config.setup-depends;

57+ depends = config.setup-depends ++ cabalLibDepends;

41 libs = [];

58 libs = [];

42 frameworks = [];

59 frameworks = [];

43 doExactConfig = false;

60 doExactConfig = false;

builder/shell-for.nix+3−1

@@ -15,6 +15,7 @@

15, withHoogle ? true

16, exactDeps ? false

17, tools ? {}

18+, packageSetupDeps ? true

18, ... } @ args:

19, ... } @ args:

20let

21let

@@ -26,7 +27,8 @@ let

26 selectedComponents = components hsPkgs;

27 selectedComponents = components hsPkgs;

28 # The configs of all the selected components

29 # The configs of all the selected components

29− selectedConfigs = map (c: c.config) selectedComponents ++ map (p: p.setup.config) selectedPackages;

30+ selectedConfigs = map (c: c.config) selectedComponents

31+ ++ lib.optionals packageSetupDeps (map (p: p.setup.config) selectedPackages);

31 name = if lib.length selectedPackages == 1

33 name = if lib.length selectedPackages == 1

32 then "ghc-shell-for-${(lib.head selectedPackages).identifier.name}"

34 then "ghc-shell-for-${(lib.head selectedPackages).identifier.name}"

modules/component-driver.nix+1

@@ -3,6 +3,7 @@ let

3 builder = haskellLib.weakCallPackage pkgs ../builder {

4 inherit haskellLib;

5 ghc = config.ghc.package;

6+ compiler-nix-name = config.compiler.nix-name;

6 inherit (config) nonReinstallablePkgs hsPkgs compiler;

7 inherit (config) nonReinstallablePkgs hsPkgs compiler;

7 };

8 };

overlays/ghcjs.nix+27−52

@@ -2,59 +2,34 @@ final: prev:

3 haskell-nix = prev.haskell-nix // ({

4 defaultModules = prev.haskell-nix.defaultModules ++ final.lib.optional final.stdenv.hostPlatform.isGhcjs (

5− ({ pkgs, buildModules, config, lib, ... }:

5+ ({ pkgs, buildModules, config, lib, ... }: {

6− let

7− # Cabal project to build cabal for use in default setups

8− cabal-project = final.buildPackages.haskell-nix.hackage-project {

9− name = "cabal-install";

10− version = "3.2.0.0";

11− compiler-nix-name = config.compiler.nix-name;

12− modules = [{

13− packages.Cabal.patches = [

14− ./patches/Cabal/Cabal-3.0.0.0-drop-pkg-db-check.diff

15− ./patches/Cabal/Cabal-3.0.0.0-no-final-checks.diff

16− ];

17− nonReinstallablePkgs = [ "array" "base" "binary" "bytestring" "containers" "deepseq"

18− "directory" "filepath" "ghc" "ghc-boot" "ghc-boot-th" "ghc-compact"

19− "ghc-heap" "ghc-prim" "ghci" "haskeline" "hpc" "integer-gmp"

20− "libiserv" "mtl" "parsec" "pretty" "process" "rts" "stm"

21− "template-haskell" "terminfo" "text" "time" "transformers" "unix"

22− "xhtml"

23− ];

24− }

25− ];

26− };

27− in {

28− # Override Cabal used for default setup

29− setup-depends = [ cabal-project.hsPkgs.Cabal ];

30− # Allow Cabal to be reinstalled so that custom setups will use a Cabal

6+ # Allow Cabal to be reinstalled so that custom setups will use a Cabal

31− # built with packages.Cabal.patches

7+ # built with packages.Cabal.patches

32− nonReinstallablePkgs =

8+ nonReinstallablePkgs =

33− [ "rts" "ghc-heap" "ghc-prim" "integer-gmp" "integer-simple" "base"

9+ [ "rts" "ghc-heap" "ghc-prim" "integer-gmp" "integer-simple" "base"

34− "deepseq" "array" "ghc-boot-th" "pretty" "template-haskell"

10+ "deepseq" "array" "ghc-boot-th" "pretty" "template-haskell"

35− "ghcjs-prim" "ghcjs-th"

11+ "ghcjs-prim" "ghcjs-th"

36− ]

12+ ]

37− ++ lib.optionals (!config.reinstallableLibGhc) [

13+ ++ lib.optionals (!config.reinstallableLibGhc) [

38− "ghc-boot"

14+ "ghc-boot"

39− "ghc" "Win32" "array" "binary" "bytestring" "containers"

15+ "ghc" "Win32" "array" "binary" "bytestring" "containers"

40− "directory" "filepath" "ghc-boot" "ghc-compact" "ghc-prim"

16+ "directory" "filepath" "ghc-boot" "ghc-compact" "ghc-prim"

41− "hpc"

17+ "hpc"

42− "mtl" "parsec" "process" "text" "time" "transformers"

18+ "mtl" "parsec" "process" "text" "time" "transformers"

43− "unix" "xhtml" "terminfo"

19+ "unix" "xhtml" "terminfo"

44− ];

45− # Include patches for custom setups

46− packages.Cabal.patches = [

47− ./patches/Cabal/Cabal-3.0.0.0-drop-pkg-db-check.diff

48− ./patches/Cabal/Cabal-3.0.0.0-no-final-checks.diff

49 ];

20 ];

21+ # Include patches for custom setups

22+ packages.Cabal.patches = [

23+ ./patches/Cabal/Cabal-3.0.0.0-drop-pkg-db-check.diff

24+ ./patches/Cabal/Cabal-3.0.0.0-no-final-checks.diff

25+ ];

50− testWrapper = [((final.writeScriptBin "node-wrapper" ''

26+ testWrapper = [((final.writeScriptBin "node-wrapper" ''

51− set -euo pipefail

27+ set -euo pipefail

52− exe=$1

28+ exe=$1

53− shift

29+ shift

54− ${final.buildPackages.nodejs}/bin/node $exe $@

30+ ${final.buildPackages.nodejs}/bin/node $exe $@

55− '') + "/bin/node-wrapper")];

31+ '') + "/bin/node-wrapper")];

56− }

57− )

32+ })

58 );

33 );

59 });

34 });

60}

35}

overlays/hackage-quirks.nix+5

@@ -22,6 +22,11 @@ in { haskell-nix = prev.haskell-nix // {

22 # Version of of cabal-install in hackage is broken for GHC 8.10.1

23 (lib.optionalAttrs (version == "3.2.0.0") {

24 packages.cabal-install.src = final.haskell-nix.sources.cabal-32 + "/cabal-install";

25+ # Include patches needed for ghcjs

26+ packages.Cabal.patches = [

27+ ./patches/Cabal/Cabal-3.0.0.0-drop-pkg-db-check.diff

28+ ./patches/Cabal/Cabal-3.0.0.0-no-final-checks.diff

29+ ];

25 })

30 })

26 ];

31 ];

27 };

32 };

test/cabal-sublib/cabal-sublib.cabal+2−1

@@ -1,4 +1,4 @@

1−cabal-version: 2.2

1+cabal-version: 3.0

2-- Initial package description 'cabal-simple.cabal' generated by 'cabal

3-- init'. For further documentation, see

4-- http://haskell.org/cabal/users-guide/

@@ -35,6 +35,7 @@ executable cabal-sublib

35 -- other-extensions:

36 build-depends: base

37 , cabal-sublib

38+ , cabal-sublib:slib

38 , extra

39 , extra

39 , optparse-applicative

40 , optparse-applicative

40 -- hs-source-dirs:

41 -- hs-source-dirs:

test/cabal-sublib/default.nix+8−1

@@ -10,6 +10,13 @@ let

10 # haddock: No input file(s)

11 packages.cabal-sublib.doHaddock = false;

12 }

13+ # TODO fix plan-to-nix so this is not needed.

14+ # This is a manual work around for `plan-to-nix` not

15+ # handling `build-depends: cabal-sublib:slib` correctly

16+ ({config, ...}: {

17+ packages.cabal-sublib.components.exes.cabal-sublib.depends = [

18+ config.hsPkgs.cabal-sublib.components.sublibs.slib ];

19+ })

13 ];

20 ];

15 # The ./pkgs.nix works for linux & darwin, but not for windows

22 # The ./pkgs.nix works for linux & darwin, but not for windows

@@ -55,7 +62,7 @@ in recurseIntoAttrs {

56 passthru = {

63 passthru = {

57 # Used for debugging with nix repl

64 # Used for debugging with nix repl

58− inherit packages;

65+ inherit packages project;

59 };

66 };

60 };

67 };

61}

68}

test/shell-for/default.nix+6

@@ -24,6 +24,8 @@ let

24 # they use a nix-shell --pure. Normally you would BYO cabal-install.

25 tools = { cabal = "3.2.0.0"; };

26 exactDeps = true;

27+ # Avoid duplicate package issues when runghc looks for packages

28+ packageSetupDeps = false;

27 };

29 };

29 envPkga = pkgSet.config.hsPkgs.shellFor {

31 envPkga = pkgSet.config.hsPkgs.shellFor {

@@ -33,6 +35,8 @@ let

33 # they use a nix-shell --pure. Normally you would BYO cabal-install.

35 # they use a nix-shell --pure. Normally you would BYO cabal-install.

34 tools = { cabal = "3.2.0.0"; };

36 tools = { cabal = "3.2.0.0"; };

35 exactDeps = true;

37 exactDeps = true;

38+ # Avoid duplicate package issues when runghc looks for packages

39+ packageSetupDeps = false;

36 };

40 };

38 envDefault = pkgSet.config.hsPkgs.shellFor {

42 envDefault = pkgSet.config.hsPkgs.shellFor {

@@ -42,6 +46,8 @@ let

42 # This adds cabal-install to the shell, which helps tests because

46 # This adds cabal-install to the shell, which helps tests because

43 # they use a nix-shell --pure. Normally you would BYO cabal-install.

47 # they use a nix-shell --pure. Normally you would BYO cabal-install.

44 tools = { cabal = "3.2.0.0"; };

48 tools = { cabal = "3.2.0.0"; };

49+ # Avoid duplicate package issues when runghc looks for packages

50+ packageSetupDeps = false;

45 };

51 };

47in recurseIntoAttrs {

53in recurseIntoAttrs {