firefox*: fix collisions due to identical binaryName
#294971
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jopejoe1
reviewed
Mar 12, 2024
zeorin
force-pushed
the
fix-firefox-collisions
branch
from
88d0c11
to
cf5eb85
Compare
zeorin
force-pushed
the
fix-firefox-collisions
branch
from
cf5eb85
to
ea9ff2e
Compare
ofborg
bot
added
10.rebuild-linux: 11-100
and removed
2.status: merge conflict
10.rebuild-linux: 1-10
labels
zeorin
force-pushed
the
fix-firefox-collisions
branch
from
ea9ff2e
to
12792ff
Compare
13 tasks
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.
zeorin
force-pushed
the
fix-firefox-collisions
branch
from
12792ff
to
57c6062
Compare
ofborg
bot
added
10.rebuild-darwin: 1-10
10.rebuild-darwin: 1
and removed
2.status: merge conflict
10.rebuild-darwin: 0
labels
l0b0
approved these changes
Jun 20, 2024
Comment on lines
65
to
+66
| pname = "firefox-devedition"; | ||
| binaryName = "firefox-developer-edition"; |
There was a problem hiding this comment.
Suggested change
| 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
mweinelt
reviewed
Jun 29, 2024
| @@ -94,6 +96,7 @@ | |||
|
|
|||
| firefox-esr-115 = buildMozillaMach rec { | |||
| pname = "firefox-esr-115"; | |||
| binaryName = "firefox-esr"; | |||
There was a problem hiding this comment.
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… |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
All
nixpkgsFirefox 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 thenameSuffixis 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
buildEnvallows collisions, but in the case of Home Manager, its call tobuildEnvdoes not, and so one cannot install multiple versions of these packages at the same time:The
-binvariants 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
nixpkgsbuilds of Firefox to use different binary names.Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-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.