git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Use package version as component version (#615)
78bc725Hamish Mackenzie
builder/comp-builder.nix+8−5
compare with iko/ghcjs-patch-master
unifiedsplit
@@ -4,7 +4,7 @@ lib.makeOverridable (
4{ componentId
4{ componentId
5, component
5, component
6, package
6, package
7−, name
7+, name # This is the package name
8, setup
8, setup
9, src
9, src
10, flags
10, flags
@@ -61,9 +61,11 @@ let
61 then builtins.trace ("Cleaning component source not supported for hpack package: " + name) src
61 then builtins.trace ("Cleaning component source not supported for hpack package: " + name) src
62 else haskellLib.cleanCabalComponent package component src;
62 else haskellLib.cleanCabalComponent package component src;
63
63
64− fullName = if haskellLib.isAll componentId
64+ nameOnly = if haskellLib.isAll componentId
65− then "${name}-all"
65+ then "${package.identifier.name}-all"
66− else "${name}-${componentId.ctype}-${componentId.cname}";
66+ else "${package.identifier.name}-${componentId.ctype}-${componentId.cname}";
67+
68+ fullName = "${nameOnly}-${package.identifier.version}";
67
69
68 configFiles = makeConfigFiles {
70 configFiles = makeConfigFiles {
69 inherit (package) identifier;
71 inherit (package) identifier;
@@ -167,7 +169,8 @@ let
167in stdenv.lib.fix (drv:
169in stdenv.lib.fix (drv:
168
170
169stdenv.mkDerivation ({
171stdenv.mkDerivation ({
170− name = "${ghc.targetPrefix}${fullName}";
172+ pname = nameOnly;
173+ inherit (package.identifier) version;
171
174
172 src = cleanSrc;
175 src = cleanSrc;
173
176