git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Use package version as component version (#615)

Currently we do not give components a version and this is inconvenient as it means nix code that checks for a version does not work with haskell.nix components.

commit78bc7251d6c91f8bf7a674f10ff25c3075de4fa7 authorHamish Mackenzie <Hamish.Mackenzie@iohk.io> dateWed 20 May 2020, 14:06 (6 years ago) parent451b7f8
1 file changed+8−5
compare with iko/ghcjs-patch-master
unifiedsplit
builder/comp-builder.nix+8−5
builder/comp-builder.nix+8−5
@@ -4,7 +4,7 @@ lib.makeOverridable (
44{ componentId
55, component
66, package
7−, name
7+, name # This is the package name
88, setup
99, src
1010, flags
@@ -61,9 +61,11 @@ let
6161 then builtins.trace ("Cleaning component source not supported for hpack package: " + name) src
6262 else haskellLib.cleanCabalComponent package component src;
6363
64− fullName = if haskellLib.isAll componentId
65− then "${name}-all"
66− else "${name}-${componentId.ctype}-${componentId.cname}";
64+ nameOnly = if haskellLib.isAll componentId
65+ then "${package.identifier.name}-all"
66+ else "${package.identifier.name}-${componentId.ctype}-${componentId.cname}";
67+
68+ fullName = "${nameOnly}-${package.identifier.version}";
6769
6870 configFiles = makeConfigFiles {
6971 inherit (package) identifier;
@@ -167,7 +169,8 @@ let
167169in stdenv.lib.fix (drv:
168170
169171stdenv.mkDerivation ({
170− name = "${ghc.targetPrefix}${fullName}";
172+ pname = nameOnly;
173+ inherit (package.identifier) version;
171174
172175 src = cleanSrc;
173176