git.iko.soy/typeable/nixpkgs
on master help sign in
pkgs/stdenv/make-derivation: move hostSuffix before the version

Adding the hostSuffix to the end of the derivation's name is problematic since some stuff, including user facing programs like nix-env rely on the behavior of parseDrvName instead of pname and version. builtins.parseDrvName currently thinks that the cross compilation target added via hostSuffix is part of the version. This has the practical consequence for example that nix-env would think a cross compiled derivation would be an updated version of a native derivation of the same package and version — breaking user's profiles. We can easily prevent this by moving the hostSuffix in between pname and version. In case name is passed to mkDerivation this is of course not possible and we are forced to fall back to the old behavior. This change could serve as a replacement for the migitation we introduced with the -static appendix to pname in order to avoid confusion between nix and nixStatic as outlined in the comment added with this commit.

commitb0c26d2c4038d2768b9b0191ddeed16377419f7b authorsternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> dateMon 26 Apr 2021, 19:04 (6 years ago) parent99de33b
1 file changed+11−4
pkgs/stdenv/generic/make-derivation.nix+11−4
pkgs/stdenv/generic/make-derivation.nix+11−4
@@ -200,9 +200,7 @@ in rec {
200200 // (lib.optionalAttrs (attrs ? name || (attrs ? pname && attrs ? version)) {
201201 name =
202202 let
203− staticMarker = lib.optionalString stdenv.hostPlatform.isStatic "-static";
204− name' = attrs.name or
205− "${attrs.pname}${staticMarker}-${attrs.version}";
203+ # Indicate the host platform of the derivation if cross compiling.
206204 # Fixed-output derivations like source tarballs shouldn't get a host
207205 # suffix. But we have some weird ones with run-time deps that are
208206 # just used for their side-affects. Those might as well since the
@@ -210,7 +208,16 @@ in rec {
210208 hostSuffix = lib.optionalString
211209 (stdenv.hostPlatform != stdenv.buildPlatform && !dontAddHostSuffix)
212210 "-${stdenv.hostPlatform.config}";
213− in name' + hostSuffix;
211+ # Disambiguate statically built packages. This was originally
212+ # introduce as a means to prevent nix-env to get confused between
213+ # nix and nixStatic. This should be also achieved by moving the
214+ # hostSuffix before the version, so we could contemplate removing
215+ # it again.
216+ staticMarker = lib.optionalString stdenv.hostPlatform.isStatic "-static";
217+ in
218+ if attrs ? name
219+ then attrs.name + hostSuffix
220+ else "${attrs.pname}${staticMarker}${hostSuffix}-${attrs.version}";
214221 }) // {
215222 builder = attrs.realBuilder or stdenv.shell;
216223 args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)];