-
-
Notifications
You must be signed in to change notification settings - Fork 13.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
firefox*: fix collisions due to identical binaryName
#294971
base: master
Are you sure you want to change the base?
Conversation
88d0c11
to
cf5eb85
Compare
cf5eb85
to
ea9ff2e
Compare
ea9ff2e
to
12792ff
Compare
All `nixpkgs` Firefox builds are built with the same `binaryName`, and as a result these packages collide when installing the unwrapped packages, or even in the case of the wrapped packages, although the `nameSuffix` is set differently for `firefox-beta`, `firefox-devedition`, and `firefox-esr-115`, inside of the wrapper a `".${binaryName}-old"` file is created, and _these_ still collide with one another. In NixOS, this is not an issue because the call to `buildEnv` allows collisions, but in the case of Home Manager, its call to `buildEnv` does not, and so one cannot install multiple versions of these packages at the same time. The `-bin` variants already have different binary names, as Mozilla builds them with different binary names. I have adjusted the `nixpkgs` builds of Firefox to use different binary names.
12792ff
to
57c6062
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Idea & code changes LGTM; haven't compiled or tested it. Thank you!
pname = "firefox-devedition"; | ||
binaryName = "firefox-developer-edition"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pname = "firefox-devedition"; | |
binaryName = "firefox-developer-edition"; | |
pname = "firefox-developer-edition"; |
And I think we could probably fallback to pname if no binaryName is set, since now most of them are matching
@@ -94,6 +96,7 @@ | |||
|
|||
firefox-esr-115 = buildMozillaMach rec { | |||
pname = "firefox-esr-115"; | |||
binaryName = "firefox-esr"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is a short time when two ESR versions will overlap. Would be good to disambiguate them through their major version.
Was pruning branches and accidentally deleted this branch on my repo… |
All
nixpkgs
Firefox builds are built with the samebinaryName
, and as a result these packages collide when installing the unwrapped packages, or even in the case of the wrapped packages, although thenameSuffix
is set differently forfirefox-beta
,firefox-devedition
, andfirefox-esr-115
, inside of the wrapper a".${binaryName}-wrapper"
file is created, and these still collide with one another.In NixOS, this is not an issue because its call to
buildEnv
allows collisions, but in the case of Home Manager, its call tobuildEnv
does not, and so one cannot install multiple versions of these packages at the same time:The
-bin
variants already have different binary names, as Mozilla builds them with different binary names, and thus for them these collisions don't occur.Should the release notes include a note about the changed binary names?
Description of changes
I have adjusted the
nixpkgs
builds of Firefox to use different binary names.Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.