appimageTools.wrapAppImage: remove version from `pname` #271071

pbsds · 2023-11-30T00:36:08Z

Description of changes

Prior to this PR:

nix-repl> mendeley.name
"mendeley-2.105.0"

nix-repl> mendeley.pname
"mendeley-2.105.0"

With this PR:

nix-repl> mendeley.name
"mendeley-2.105.0"

nix-repl> mendeley.pname
"mendeley"

The erroneous pnames has been the source of many issues, especially since the wrapped software tends to be unfree. nixpkgs.config.allowUnfreePredicate, even when using lib.getName would need to include the version number. Fixes like this will become a thing of the past.

An other common fix we don't need to apply any more is mv $out/bin/$pname $out/bin/${pname} to strip the version from the resulting binary in bin/. Here is a listing of the likely affected files which this PR will fix before dropping the WIP: prefix:

rg wrapType -l | xargs grep mv

pkgs/applications/video/molotov/default.nix:    mv $out/bin/${pname}-${version} $out/bin/${pname}
pkgs/applications/video/losslesscut-bin/build-from-appimage.nix:    mv $out/bin/{${pname}-${version},losslesscut}
pkgs/applications/graphics/upscayl/default.nix:      mv $out/bin/${pname}-${version} $out/bin/${pname}
pkgs/applications/video/electronplayer/electronplayer.nix:    mv $out/bin/${name} $out/bin/${pname}
pkgs/applications/graphics/pureref/default.nix:    mv $out/bin/${pname}-${version} $out/bin/${pname}
pkgs/applications/editors/codux/default.nix:    mv $out/bin/${pname}-${version} $out/bin/${pname}
pkgs/applications/networking/cozy-drive/default.nix:    mv $out/bin/${name} $out/bin/${pname}
pkgs/applications/networking/instant-messengers/keet/default.nix:    mv $out/bin/${pname}-${version} $out/bin/${pname}
pkgs/applications/networking/instant-messengers/session-desktop/default.nix:    mv bin/session-desktop-${version} bin/session-desktop
pkgs/applications/networking/instant-messengers/beeper/default.nix:    mv bin/${name} bin/${pname}
pkgs/applications/networking/instant-messengers/zulip/default.nix:    mv "$out/bin/${pname}-${version}" "$out/bin/${pname}"
pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix:    mv $out/bin/{${pname}-${version},caprine}
pkgs/applications/networking/mailreaders/electron-mail/default.nix:    mv $out/bin/${name} $out/bin/${pname}
pkgs/applications/networking/cluster/openlens/default.nix:    mv $out/bin/${pname}-${version} $out/bin/${pname}
pkgs/applications/networking/cluster/lens/linux.nix:      mv $out/bin/${name} $out/bin/${pname}
pkgs/applications/networking/feedreaders/fluent-reader/default.nix:    mv $out/bin/${pname}-${version} $out/bin/${pname}
pkgs/applications/networking/station/default.nix:    mv $out/bin/{${name},${pname}}
pkgs/applications/networking/Sylk/default.nix:  extraInstallCommands = "mv $out/bin/{${name},${pname}}";
pkgs/applications/networking/newsreaders/raven-reader/default.nix:    mv $out/bin/${pname}-${version} $out/bin/${pname}
pkgs/applications/networking/irc/irccloud/default.nix:    mv $out/bin/${name} $out/bin/${pname}
pkgs/applications/audio/sonixd/default.nix:    mv $out/bin/${pname}-${version} $out/bin/${pname}
pkgs/applications/audio/cider/default.nix:      mv $out/bin/${pname}-${version} $out/bin/${pname}
pkgs/applications/audio/museeks/default.nix:    mv $out/bin/${pname}-${version} $out/bin/${pname}
pkgs/applications/audio/ytmdesktop/default.nix:    mv $out/bin/{${name},${pname}}
pkgs/applications/misc/neo4j-desktop/default.nix:    mv $out/bin/${name} $out/bin/${pname}
pkgs/applications/misc/marktext/default.nix:    mv $out/bin/${pname}-${version} $out/bin/${pname}
pkgs/applications/misc/fspy/default.nix:    mv $out/bin/${pname}-${version} $out/bin/${pname}
pkgs/applications/misc/notable/default.nix:    mv $out/bin/{${name},${pname}}
pkgs/applications/misc/devdocs-desktop/default.nix:    mv $out/bin/${name} $out/bin/${pname}
pkgs/applications/misc/joplin-desktop/default.nix:      mv $out/bin/{${pname}-${version},${pname}}
pkgs/applications/misc/zettlr/generic.nix:    mv $out/bin/{${name},${pname}}
pkgs/applications/misc/chrysalis/default.nix:    mv $out/bin/{${name},${pname}}
pkgs/applications/misc/lunatask/default.nix:    mv $out/bin/${pname}-${version} $out/bin/${pname}
pkgs/applications/misc/protonup-qt/default.nix:    mv $out/bin/{${pname}-${version},${pname}}
pkgs/applications/misc/notesnook/default.nix:      mv $out/bin/{${pname}-${version},${pname}}
pkgs/applications/misc/mobilecoin-wallet/default.nix:    mv $out/bin/${name} $out/bin/${pname}
pkgs/applications/misc/firefly-desktop/default.nix:    mv $out/bin/${pname}-${version} $out/bin/firefly-desktop
pkgs/applications/misc/golden-cheetah-bin/default.nix:    mv $out/bin/${pname}-${version} $out/bin/GoldenCheetah
pkgs/applications/misc/anytype/default.nix:    mv $out/bin/${name} $out/bin/${pname}
pkgs/applications/office/timeular/default.nix:    mv $out/bin/{${pname}-${version},${pname}}
pkgs/applications/version-management/radicle-upstream/default.nix:      mv $out/bin/${name} $out/bin/${pname}
pkgs/applications/science/biology/jbrowse/default.nix:    mv $out/bin/jbrowse-${version} $out/bin/jbrowse-desktop
pkgs/applications/office/notion-app-enhanced/default.nix:    mv $out/bin/${name} $out/bin/${pname}
pkgs/applications/office/p3x-onenote/default.nix:    armv7l-linux = "-armv7l";
pkgs/applications/office/p3x-onenote/default.nix:    armv7l-linux = "1pvr8f1ccl4nyfmshn3v3jfaa5x519rsy57g4pdapffj10vpbkb8";
pkgs/applications/office/p3x-onenote/default.nix:    mv $out/bin/${name} $out/bin/p3x-onenote
pkgs/applications/office/p3x-onenote/default.nix:    platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" ];
pkgs/applications/office/mendeley/default.nix:    mv $out/bin/$pname $out/bin/${executableName}
pkgs/applications/office/tusk/default.nix:    mv $out/bin/{${pname}-${version},${pname}}
pkgs/applications/blockchains/crypto-org-wallet/default.nix:    mv $out/bin/${name} $out/bin/${pname}
pkgs/applications/blockchains/trezor-suite/default.nix:    mv $out/bin/${name} $out/bin/${pname}
pkgs/applications/blockchains/mycrypto/default.nix:    mv $out/bin/{${name},${pname}}
pkgs/applications/blockchains/mycrypto/default.nix:    mv $out/share/icons/hicolor/{0x0,256x256}
pkgs/applications/blockchains/ledger-live-desktop/default.nix:    mv $out/bin/${pname}-${version} $out/bin/${pname}
pkgs/applications/blockchains/zecwallet-lite/default.nix:      mv $out/bin/${pname}-${version} $out/bin/${pname}
pkgs/development/web/bootstrap-studio/default.nix:    mv $out/bin/${pname}-${version} $out/bin/${pname}
pkgs/development/tools/altair-graphql-client/default.nix:    mv $out/bin/${pname}-${version} $out/bin/${pname}
pkgs/tools/networking/mockoon/default.nix:    mv $out/bin/${pname}-${version} $out/bin/${pname}
pkgs/tools/networking/motrix/default.nix:    mv $out/bin/${pname}-${version} $out/bin/${pname}
pkgs/tools/networking/requestly/default.nix:    mv $out/bin/${pname}-${version} $out/bin/${pname}
pkgs/tools/misc/via/default.nix:    mv $out/bin/${name} $out/bin/${pname}
pkgs/tools/misc/wootility/default.nix:  extraInstallCommands = "mv $out/bin/{${pname}-${version},${pname}}";
pkgs/tools/misc/vial/default.nix:    mv $out/bin/${name} $out/bin/${pname}
pkgs/tools/misc/mathpix-snipping-tool/default.nix:    mv $out/bin/${name} $out/bin/${pname}
pkgs/tools/misc/betterdiscord-installer/default.nix:    sha256 = "103acb11qmvjmf6g9lgsfm5jyahfwfdqw0x9w6lmv1hzwbs26dsr";
pkgs/tools/misc/betterdiscord-installer/default.nix:    mv $out/bin/${name} $out/bin/${pname}
pkgs/tools/security/buttercup-desktop/default.nix:    mv $out/bin/${pname}-${version} $out/bin/${pname}
pkgs/by-name/hi/hifile/package.nix:    mv $out/bin/${pname}-${version} $out/bin/${pname}
pkgs/by-name/si/simplex-chat-desktop/package.nix:      mv $out/bin/${pname}-${version} $out/bin/${pname}
pkgs/by-name/be/beekeeper-studio/package.nix:    mv $out/bin/{${pname}-${version},${pname}}
pkgs/by-name/im/immersed-vr/package.nix:    mv $out/bin/{${name},${pname}}
pkgs/by-name/lu/lunar-client/package.nix:    mv $out/bin/{${pname}-${version},${pname}}
pkgs/games/osu-lazer/bin.nix:      mv -v $out/bin/${pname}-${version} $out/bin/osu\!

I'll run a nixpkgs-review over night

closes #262506 (parallel effort)
closes #262350
~~fixes #267508~~

Things done

Priorities

Add a 👍 reaction to pull requests you find important.

pbsds · 2023-11-30T02:16:20Z

Result of nixpkgs-review pr 271071 run on x86_64-linux 1

1 package blacklisted:

appimage-run-tests

86 packages failed to build:

Sylk
altair
androidStudioPackages.beta
anytype
arduino-ci
arduino-cli
bazecor
beekeeper-studio
beeper
betterdiscord-installer
bloomrpc
bootstrap-studio
buttercup-desktop
caprine-bin
chrysalis
cider
ciscoPacketTracer7
codux
cozy-drive
crypto-org-wallet
davinci-resolve
devdocs-desktop
electron-mail
electronplayer
firefly-desktop
flexoptix-app
fluent-reader
framesh
fspy
hifile
houdini
immersed-vr
irccloud
jbrowse
jetbrains-toolbox
joplin-desktop
keet
lbry
ledger-live-desktop
lens
losslesscut-bin
lunar-client
lunatask
marktext
mathpix-snipping-tool
mobilecoin-wallet
mockoon
molotov
motrix
museeks
mycrypto
neo4j-desktop
notable
notesnook
notion-app-enhanced
nuclear
onlyoffice-bin_7_5
openlens
osu-lazer-bin
p3x-onenote
plexamp
polypane
protonup-qt
pureref
quartus-prime-lite
radicle-upstream
raven-reader
remnote
requestly
session-desktop
simplex-chat-desktop
sonixd
station
timeular
trezor-suite
tusk
upscayl
via
vial
vscode-fhs
vscodium-fhs
wootility
ytmdesktop
zecwallet-lite
zettlr
zulip

72 packages built:

android-studio
androidStudioPackages.canary
androidStudioPackages.dev
appimage-run
arduino
arduino-core
beyond-identity
bitscope.chart
bitscope.console
bitscope.display
bitscope.dso
bitscope.logic
bitscope.meter
bitscope.proto
bitscope.server
bottles
conda
dropbox
dropbox-cli
dropbox-cli.nautilusExtension
esphome
esphome.dist
expressvpn
game-rs
hamsket
heroic
hover
insync
itch
kingstvis
kodiPackages.steam-launcher
ldtk
left4gore-bin
lightworks
lutris
lutris-free
mate.caja-dropbox
mendeley
minigalaxy
minigalaxy.dist
nextflow
pdfstudio2021
pdfstudio2022
pdfstudio2023
pdfstudioviewer
platformio
playonlinux
plex
protontricks
protontricks.dist
rambox
saleae-logic-2
shticker-book-unwritten
sidequest
space-station-14-launcher
sparrow
ssb-patchwork
steam
steam-rom-manager
steam-run
steam-small
steam-tui
steamPackages.steam-fhsenv-without-steam
steamPackages.steamcmd
teensyduino
todoist-electron
typora
unityhub
unvanquished
vmware-workstation
xivlauncher
xlights

Atemu

Please split this out into two PRs. One making it possible to pass pname + version into appimage tools and one changing all the bad name usages in packaged appimages to land after the first one. It's hard to review the actual change when there's 82 commits that don't really have anything to do with it. Honestly, the adjustments should probably all be one big tree-wide: commit.

I've tried adding pname support to appimage tools "properly" a little while ago but haven't found the time to finish it yet.

Atemu · 2023-12-01T12:31:06Z

pkgs/build-support/build-fhsenv-bubblewrap/default.nix

+  name = if args ? name && args.name != null then args.name else "${pname}-${version}";
+  pname = if args ? pname && args.pname != null then args.pname else lib.getName args.name;
+  version = if args ? version && args.version != null then args.version else lib.getVersion args.name;


As mentioned in #262506, I don't think we should ever "infer" pname from a name when we could instead pass pname directly.

I kinda agree, but would the alternative be to make pname required, or to fallback to name? That issue seems intent on not affecting existing packages while i figured there aren't that many to fix yet

bump. Personally i'd like to decouple the basename of the resulting $out/bin binary produced in buildFHSEnvBubblewrap from pname and name entirely.

ftr, all the packages i fix in this PR now passes in pname explicitly.

That sounds like a good idea and I'm for an additional binaryName arg that defaults to pname but it has nothing to do with the concern I voiced here.

#262506 (review)

first building a combined name and then trying to parse the individual parts out again

This is not the case in this PR. If pname or version is passed in then they are used as is with no modification. Only if pname or version is missing are they extracted from name.

a better fix for this issue would be to adjust wrapType2 to take version + pname without name and stop passing custom combined names everywhere.

EDIT: (emphasis mine)

I can move name into args as well, but cases like this still call for a combined name. I'll see what i can do

I've got my changes cleaned up. There's still some bugs left to squish but just so that we don't duplicate work here: Atemu@258615c

And duplicate we did. I went in a direction where we don't use null, which greatly simplifies the logic

pbsds · 2023-12-02T06:41:02Z

building electron a couple of times took a while.

Result of nixpkgs-review pr 271071 run on x86_64-linux 1

1 package blacklisted:

appimage-run-tests

4 packages failed to build:

ciscoPacketTracer7
flexoptix-app
houdini
pureref

154 packages built:

Sylk
altair
android-studio
androidStudioPackages.beta
androidStudioPackages.canary
androidStudioPackages.dev
anytype
appimage-run
arduino
arduino-ci
arduino-cli
arduino-core
bazecor
beekeeper-studio
beeper
betterdiscord-installer
beyond-identity
bitscope.chart
bitscope.console
bitscope.display
bitscope.dso
bitscope.logic
bitscope.meter
bitscope.proto
bitscope.server
bloomrpc
bootstrap-studio
bottles
buttercup-desktop
caprine-bin
chrysalis
cider
codux
conda
cozy-drive
crypto-org-wallet
davinci-resolve
devdocs-desktop
dropbox
dropbox-cli
dropbox-cli.nautilusExtension
electron-mail
electronplayer
esphome
esphome.dist
expressvpn
firefly-desktop
fluent-reader
framesh
fspy
game-rs
hamsket
heroic
hifile
hover
immersed-vr
insync
irccloud
itch
jbrowse
jetbrains-toolbox
joplin-desktop
keet
kingstvis
kodiPackages.steam-launcher
lbry
ldtk
ledger-live-desktop
left4gore-bin
lens
lightworks
losslesscut-bin
lunar-client
lunatask
lutris
lutris-free
marktext
mate.caja-dropbox
mathpix-snipping-tool
mendeley
minigalaxy
minigalaxy.dist
mobilecoin-wallet
mockoon
molotov
motrix
museeks
mycrypto
neo4j-desktop
nextflow
notable
notesnook
notion-app-enhanced
nuclear
onlyoffice-bin_7_5
openlens
osu-lazer-bin
p3x-onenote
pdfstudio2021
pdfstudio2022
pdfstudio2023
pdfstudioviewer
platformio
playonlinux
plex
plexamp
polypane
protontricks
protontricks.dist
protonup-qt
quartus-prime-lite
radicle-upstream
rambox
raven-reader
remnote
requestly
saleae-logic-2
session-desktop
shticker-book-unwritten
sidequest
simplex-chat-desktop
sonixd
space-station-14-launcher
sparrow
ssb-patchwork
station
steam
steam-rom-manager
steam-run
steam-small
steam-tui
steamPackages.steam-fhsenv-without-steam
steamPackages.steamcmd
teensyduino
timeular
todoist-electron
trezor-suite
tusk
typora
unityhub
unvanquished
upscayl
via
vial
vmware-workstation
vscode-fhs
vscodium-fhs
wootility
xivlauncher
xlights
ytmdesktop
zecwallet-lite
zettlr
zulip

The remaining failures are due to requireFile and a 404.

pbsds · 2023-12-02T07:10:44Z

Please split this out into two PRs.

Is it preferred to merge a mass breakage?

It's hard to review the actual change when there's 82 commits that don't really have anything to do with it. Honestly

The commits view is great, and you only need to check the top two. I could squash it if you prefer.

Atemu · 2023-12-02T17:45:12Z

Is it preferred to merge a mass breakage?

No, it should stay compatible anyways.

I could squash it if you prefer.

I'd prefer one commit because it's much easier to digest and also revert. It's also easier to tell it's a tree-wide change when you're looking at the history of any file touched by this.

pbsds

The cleanup you wished for.

IMO the final commit (02266f6299781f0e86fdee2cb4de749428f51dea) is somewhat pedantic ~~and should be removed.~~

pbsds · 2023-12-10T11:30:16Z

pkgs/build-support/build-fhsenv-bubblewrap/default.nix

@@ -233,7 +232,7 @@ in runCommandLocal name {
    '';
    inherit args fhsenv;
  };
-} ''
+}) ''
  mkdir -p $out/bin
  ln -s ${bin} $out/bin/${pname}


Ultimately, this line is why we cannot get rid of pname = args.pname or (lib.getName args.name). The fix is to decouple the binary name from the package name but that is way out of scope for this PR

No. We can get rid of it right now. If you're explicitly passing a name with a version in it, you will get an executable with exactly that name; that's how it should work.

If you've got pname and version, you should simply pass those and you will get "correct" behaviour.

We should not add code for potential wrong usages that violates the principle of least surprise. It's conceivable for example that an intended package name may look like a version or that a user might want the executable to be versioned. Those use-cases should not be forbidden because someone might perhaps use it wrong.

Great. With #271071 (comment) answered the fix becomes quite simple, please view 49ea55661e278c5fa6d05e86ba2cdb9a1ef0a94f

pbsds · 2023-12-10T12:50:04Z

Result of nixpkgs-review pr 271071 run on x86_64-linux 1

1 package blacklisted:

appimage-run-tests

4 packages failed to build:

ciscoPacketTracer7
flexoptix-app
houdini
pureref

154 packages built:

Sylk
altair
android-studio
androidStudioPackages.beta
androidStudioPackages.canary
androidStudioPackages.dev
anytype
appimage-run
arduino
arduino-ci
arduino-cli
arduino-core
bazecor
beekeeper-studio
beeper
betterdiscord-installer
beyond-identity
bitscope.chart
bitscope.console
bitscope.display
bitscope.dso
bitscope.logic
bitscope.meter
bitscope.proto
bitscope.server
bloomrpc
bootstrap-studio
bottles
buttercup-desktop
caprine-bin
chrysalis
cider
codux
conda
cozy-drive
crypto-org-wallet
davinci-resolve
devdocs-desktop
dropbox
dropbox-cli
dropbox-cli.nautilusExtension
electron-mail
electronplayer
esphome
esphome.dist
expressvpn
firefly-desktop
fluent-reader
framesh
fspy
game-rs
hamsket
heroic
hifile
hover
immersed-vr
insync
irccloud
itch
jbrowse
jetbrains-toolbox
joplin-desktop
keet
kingstvis
kodiPackages.steam-launcher
lbry
ldtk
ledger-live-desktop
left4gore-bin
lens
lightworks
losslesscut-bin
lunar-client
lunatask
lutris
lutris-free
marktext
mate.caja-dropbox
mathpix-snipping-tool
mendeley
minigalaxy
minigalaxy.dist
mobilecoin-wallet
mockoon
molotov
motrix
museeks
mycrypto
neo4j-desktop
nextflow
notable
notesnook
notion-app-enhanced
nuclear
onlyoffice-bin_7_5
openlens
osu-lazer-bin
p3x-onenote
pdfstudio2021
pdfstudio2022
pdfstudio2023
pdfstudioviewer
platformio
playonlinux
plex
plexamp
polypane
protontricks
protontricks.dist
protonup-qt
quartus-prime-lite
radicle-upstream
rambox
raven-reader
remnote
requestly
saleae-logic-2
session-desktop
shticker-book-unwritten
sidequest
simplex-chat-desktop
sonixd
space-station-14-launcher
sparrow
ssb-patchwork
station
steam
steam-rom-manager
steam-run
steam-small
steam-tui
steamPackages.steam-fhsenv-without-steam
steamPackages.steamcmd
teensyduino
timeular
todoist-electron
trezor-suite
tusk
typora
unityhub
unvanquished
upscayl
via
vial
vmware-workstation
vscode-fhs
vscodium-fhs
wootility
xivlauncher
xlights
ytmdesktop
zecwallet-lite
zettlr
zulip

Atemu · 2023-12-11T08:43:54Z

Could you spin out the ~80 commits that touch packages into another PR? Ideally into one tree-wide: commit.

For now they're extremely hard to review and block the merge due to conflicts.

pbsds · 2023-12-12T08:05:23Z

Result of nixpkgs-review pr 271071 run on x86_64-linux 1

1 package blacklisted:

appimage-run-tests

57 packages failed to build:

altair
bazecor
beekeeper-studio
beeper
bloomrpc
bootstrap-studio
buttercup-desktop
caprine-bin
chrysalis
cider
ciscoPacketTracer7
codux
firefly-desktop
flexoptix-app
fluent-reader
framesh
fspy
hifile
houdini
immersed-vr
jbrowse
jetbrains-toolbox
joplin-desktop
keet
ledger-live-desktop
losslesscut-bin
lunar-client
lunatask
marktext
mendeley
mockoon
molotov
motrix
museeks
notable
notesnook
nuclear
openlens
osu-lazer-bin
plexamp
polypane
protonup-qt
pureref
radicle-upstream
raven-reader
remnote
requestly
session-desktop
simplex-chat-desktop
sonixd
timeular
todoist-electron
tusk
upscayl
wootility
zecwallet-lite
zulip

101 packages built:

Sylk
android-studio
androidStudioPackages.beta
androidStudioPackages.canary
androidStudioPackages.dev
anytype
appimage-run
arduino
arduino-ci
arduino-cli
arduino-core
betterdiscord-installer
beyond-identity
bitscope.chart
bitscope.console
bitscope.display
bitscope.dso
bitscope.logic
bitscope.meter
bitscope.proto
bitscope.server
bottles
conda
cozy-drive
crypto-org-wallet
davinci-resolve
devdocs-desktop
dropbox
dropbox-cli
dropbox-cli.nautilusExtension
electron-mail
electronplayer
esphome
esphome.dist
expressvpn
game-rs
hamsket
heroic
hover
insync
irccloud
itch
kingstvis
kodiPackages.steam-launcher
lbry
ldtk
left4gore-bin
lens
lightworks
lutris
lutris-free
mate.caja-dropbox
mathpix-snipping-tool
minigalaxy
minigalaxy.dist
mobilecoin-wallet
mycrypto
neo4j-desktop
nextflow
notion-app-enhanced
onlyoffice-bin_7_5
p3x-onenote
pdfstudio2021
pdfstudio2022
pdfstudio2023
pdfstudioviewer
platformio
playonlinux
plex
protontricks
protontricks.dist
quartus-prime-lite
rambox
saleae-logic-2
shticker-book-unwritten
sidequest
space-station-14-launcher
sparrow
ssb-patchwork
station
steam
steam-rom-manager
steam-run
steam-small
steam-tui
steamPackages.steam-fhsenv-without-steam
steamPackages.steamcmd
teensyduino
trezor-suite
typora
unityhub
unvanquished
via
vial
vmware-workstation
vscode-fhs
vscodium-fhs
xivlauncher
xlights
ytmdesktop
zettlr

pbsds · 2023-12-18T21:29:16Z

Is there any interest in merging this?

If so please either run a nixpkgs-review right before doing so or let me know, because more affected packages keep being added and i'd like to have a list of what to fix in #273719

DanielSidhion · 2023-12-22T11:21:46Z

This looks like a great improvement and would like to see it merged. From my quick look at the changes they look good, but I explicitly didn't think about potential breakages because I'm assuming they'll be fixed in #273719

I found this PR because I'm documenting some stuff related to appimageTools in #276029, and this PR would change some text there, so I'll keep an eye on it to update the docs accordingly.

Atemu

A couple smaller things.

I'd also like to see another nixpkgs-review for basic QA. Currently not near my x86_64-linux machine, so I can't easily do this myself.

If that comes back positive, this is ready I think :)

pkgs/build-support/build-fhsenv-bubblewrap/default.nix

pkgs/build-support/appimage/default.nix

pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix

pbsds · 2024-01-05T02:45:42Z

I seem to have forgot to add --post-results to the run i started right before leaving. Sorry for being unresponsive during the holidays.

Result of nixpkgs-review pr 271071 run on x86_64-linux 1

3 packages marked as broken and skipped:

electron-fiddle
golden-cheetah-bin
runescape

1 package blacklisted:

appimage-run-tests

63 packages failed to build:

altair
arduino-ide
badlion-client
bazecor
beekeeper-studio
beeper
bloomrpc
bootstrap-studio
buttercup-desktop
caprine-bin
chrysalis
cider
ciscoPacketTracer7
codux
esphome
esphome.dist
firefly-desktop
flexoptix-app
fluent-reader
framesh
fspy
hifile
houdini
immersed-vr
jbrowse
jetbrains-toolbox
joplin-desktop
keet
ledger-live-desktop
losslesscut-bin
lunar-client
lunatask
marktext
mendeley
mockoon
molotov
motrix
museeks
notable
notesnook
nuclear
openlens
osu-lazer-bin
pdfstudioviewer
plexamp
polypane
protonup-qt
pureref
radicle-upstream
raven-reader
remnote
requestly
session-desktop
simplex-chat-desktop
sonixd
spacedrive
timeular
todoist-electron
tusk
upscayl
wootility
zecwallet-lite
zulip

99 packages built:

Sylk
android-studio (androidStudioPackages.stable)
androidStudioPackages.beta
androidStudioPackages.canary
androidStudioPackages.dev
anytype
appimage-run
arduino
arduino-ci
arduino-cli
arduino-core
betterdiscord-installer
beyond-identity
bitscope.chart
bitscope.console
bitscope.display
bitscope.dso
bitscope.logic
bitscope.meter
bitscope.proto
bitscope.server
bottles
conda
cozy-drive
crypto-org-wallet
devdocs-desktop
dropbox
dropbox-cli
dropbox-cli.nautilusExtension
electron-mail
electronplayer
expressvpn
fahclient
game-rs
hamsket
heroic
hover
insync
irccloud
itch
kingstvis
kodiPackages.steam-launcher
lbry
ldtk
left4gore-bin
lens
lightworks
lutris
lutris-free
mate.caja-dropbox
mathpix-snipping-tool
minigalaxy
minigalaxy.dist
mobilecoin-wallet
mycrypto
neo4j-desktop
nextflow
notion-app-enhanced
onlyoffice-bin_7_5 (onlyoffice-bin_latest)
p3x-onenote
pdfstudio2021
pdfstudio2022
pdfstudio2023
platformio
playonlinux
plex
protontricks
protontricks.dist
quartus-prime-lite
rambox
saleae-logic-2
shticker-book-unwritten
sidequest
space-station-14-launcher
sparrow
ssb-patchwork
station
steam (steamPackages.steam-fhsenv)
steam-rom-manager
steam-run
steam-small (steamPackages.steam-fhsenv-small)
steam-tui
steamPackages.steam-fhsenv-without-steam
steamcmd (steamPackages.steamcmd)
teensyduino
trezor-suite
typora
unigine-superposition
unityhub
unvanquished
via
vial
vmware-workstation
vscode-fhs
vscodium-fhs
xivlauncher
xlights
ytmdesktop
zettlr

EDIT: i'm a silly goose. Creating a full rebuild is easy, just touch some white space. Merge this whenever

Atemu

All commits that touch the same attrpath have already been squashed.

You didn't have to go quite that far; my concern was only that a significant portion of code was added and then removed again.

There's likely one or two packages that were missed but that's okay when we're touching hundreds of packages.

One thing I just remembered is that this is a breaking change. You should probably add a release note for that.

The doc/build-helpers/special/fhs-environments.section.md should also be updated to reflect the new arguments that should be used.

I'd then also like to see a final nixpkgs-review. You still have the sources local, right?

Diff LGTM.

`appimageTools.wrapType2` no longer creates a binary `$out/bin/${name}` if `pname` and `version` is provided. Derivations that have worked around this behavior with a `mv $out/bin/{${name},${pname}}` broke as a result. This should fix most instances. contex: NixOS#271071

pbsds · 2024-04-24T13:29:29Z

nixpkgs-review in progress

pbsds · 2024-04-24T15:48:53Z

Result of nixpkgs-review pr 271071 run on x86_64-linux 1

2 packages marked as broken and skipped:

itch
radicle-upstream

2 packages blacklisted:

appimage-run-tests
nixos-install-tools

5 packages failed to build:

badlion-client
ciscoPacketTracer7
houdini
pdfstudio2023
pdfstudioviewer

168 packages built:

Sylk
altair
alvr
am2rlauncher
android-studio
androidStudioPackages.beta
androidStudioPackages.canary
androidStudioPackages.dev
anytype
appimage-run
arduino
arduino-ci
arduino-cli
arduino-core
arduino-ide
bazecor
beekeeper-studio
beeper
betterdiscord-installer
beyond-identity
bitscope.chart
bitscope.console
bitscope.display
bitscope.dso
bitscope.logic
bitscope.meter
bitscope.proto
bitscope.server
bloomrpc
bootstrap-studio
bottles
buttercup-desktop
caido
caprine-bin
chrysalis
cider
codux
conda
cozy-drive
crypto-org-wallet
deskreen
devdocs-desktop
dropbox
dropbox-cli
dropbox-cli.nautilusExtension
electron-mail
electronplayer
esphome
esphome.dist
expressvpn
fahclient
firefly-desktop
flexoptix-app
fluent-reader
framesh
game-rs
hamsket
heroic
hifile
hoppscotch
hover
immersed-vr
irccloud
jan
jbrowse
jetbrains-toolbox
joplin-desktop
kchat
keet
kingstvis
kmeet
kodiPackages.steam-launcher
lbry
ldtk
ledger-live-desktop
left4gore-bin
lens
lightworks
listen1
lmstudio
losslesscut-bin
lunar-client
lunatask
lutris
lutris-free
marktext
mate.caja-dropbox
mathpix-snipping-tool
mendeley
minigalaxy
minigalaxy.dist
miru
mobilecoin-wallet
mockoon
molotov
motrix
mqttx
museeks
mycrypto
neo4j-desktop
nextflow
nosql-workbench
notable
notesnook
notion-app-enhanced
nuclear
onlyoffice-bin_latest
openlens
osu-lazer-bin
p3x-onenote
parsify
pdfstudio2021
pdfstudio2022
platformio
playonlinux
plex
plexamp
polypane
protontricks
protontricks.dist
protonup-qt
pureref
quartus-prime-lite
rambox
raven-reader
remnote
requestly
saleae-logic-2
session-desktop
shticker-book-unwritten
sidequest
simplex-chat-desktop
sonixd
space-station-14-launcher
spacedrive
sparrow
ssb-patchwork
station
steam
steam-rom-manager
steam-run
steam-small
steam-tui
steamPackages.steam-fhsenv-without-steam
steamPackages.steamcmd
svp
teensyduino
timeular
todoist-electron
trezor-suite
tusk
tutanota-desktop
typora
unigine-superposition
unityhub
unvanquished
upscayl
via
vial
vmware-workstation
vscode-fhs
vscodium-fhs
wootility
xivlauncher
xlights
zecwallet-lite
zettlr
zulip

failures are due to requireFile, except for badlion-client which has a hash error

nixos-discourse · 2024-04-24T20:09:05Z

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/breaking-changes-announcement-for-unstable/17574/48

Pass attributes `pname` and `version` directly into appimage.wrapType2, instead of attribute set update ('//'), to ensure that they survive across overriding. This is possible as the pname-version passing of buildFHSEnvBubblewrap, buildFHSEnv, and appimageTools.wrapAppImage is fixed.[1] [1]: NixOS#271071

NixOS/nixpkgs#271071 Didn't realize this was a thing which would explain the previous breakages.

this works since NixOS#271071

pbsds mentioned this pull request Nov 30, 2023

todoist-electron: 8.9.3 -> 8.10.1 #267602

Merged

13 tasks

pbsds marked this pull request as ready for review November 30, 2023 01:54

ofborg bot added 10.rebuild-darwin: 1-10 10.rebuild-linux: 101-500 labels Nov 30, 2023

pbsds requested review from mmahut and RaghavSood as code owners November 30, 2023 16:45

pbsds changed the title ~~WIP: appimageTools.wrapAppImage: remove version from pname~~ appimageTools.wrapAppImage: remove version from pname Nov 30, 2023

pbsds mentioned this pull request Nov 30, 2023

Set pname, version and name correctly in buildFHSEnvBubblewrap #262506

Closed

13 tasks

pbsds force-pushed the wrapAppImage-pname-redux branch from c243b91 to 8ebb958 Compare November 30, 2023 16:53

pbsds requested a review from bjornfor November 30, 2023 20:05

Atemu requested changes Dec 1, 2023

View reviewed changes

pbsds commented Dec 10, 2023

View reviewed changes

ofborg bot added the 2.status: merge conflict label Dec 10, 2023

pbsds force-pushed the wrapAppImage-pname-redux branch from 49ea556 to 7e3db64 Compare December 12, 2023 06:59

pbsds mentioned this pull request Dec 12, 2023

treewide: Fix appimageTools breakages, use pname instead of name #273719

Closed

13 tasks

Atemu self-assigned this Dec 12, 2023

ofborg bot removed the 2.status: merge conflict label Dec 12, 2023

pbsds force-pushed the wrapAppImage-pname-redux branch from ca7c8d3 to f283b63 Compare December 17, 2023 20:04

Atemu reviewed Dec 22, 2023

View reviewed changes

pkgs/build-support/build-fhsenv-bubblewrap/default.nix Outdated Show resolved Hide resolved

pkgs/build-support/appimage/default.nix Outdated Show resolved Hide resolved

pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix Outdated Show resolved Hide resolved

pbsds force-pushed the wrapAppImage-pname-redux branch from f283b63 to ce7e47d Compare January 5, 2024 02:45

Atemu approved these changes Apr 24, 2024

View reviewed changes

pbsds and others added 8 commits April 24, 2024 15:26

buildFHSEnvBubblewrap: do not infer pname from name

bbb1f25

buildFHSEnvBubblewrap/buildFHSEnv: permit pname+version instead of name

eb02e00

appimageTools.wrapAppImage: passthru pname and version

90622c1

appimage: avoid setting name

340d601

anki: don't set name to null

7d5a185

davinci-resolve: don't set name to null

9a1ba35

badlion-client: fix build

17151c6

pbsds force-pushed the wrapAppImage-pname-redux branch from bddb859 to 17151c6 Compare April 24, 2024 13:29

github-actions bot added 6.topic: nixos 8.has: documentation 8.has: changelog labels Apr 24, 2024

Atemu merged commit 2432c6b into NixOS:master Apr 24, 2024
25 of 26 checks passed

sersorrel mentioned this pull request Apr 24, 2024

fflogs: init at 8.3.42 #248403

Merged

12 tasks

This was referenced Apr 29, 2024

rambox: fix for binary dropping version suffix #307681

Merged

hamsket: remove unneeded symlink #307705

Merged

hacker1024 mentioned this pull request Apr 30, 2024

stm32cubemx: Pass version to buildFHSEnv #307969

Closed

13 tasks

pbsds mentioned this pull request May 3, 2024

clockify: unbreak #308765

Merged

13 tasks

gcleroux mentioned this pull request May 14, 2024

bazecor: add wayland support #295447

Merged

13 tasks

PassiveLemon added a commit to PassiveLemon/lemonake that referenced this pull request May 31, 2024

Fix: Appimage packages

5428680

NixOS/nixpkgs#271071 Didn't realize this was a thing which would explain the previous breakages.

pbsds added a commit to pbsds/nixpkgs that referenced this pull request May 31, 2024

treewide: remove buildFHSEnv name = pname workarounds

985c38a

this works since NixOS#271071

pbsds mentioned this pull request May 31, 2024

treewide: remove buildFHSEnv name = pname workarounds #316271

Merged

13 tasks

This was referenced Jun 29, 2024

treewide: fix name for appimages #323305

Merged

sozi: init at 23.7.25-1690311612 #321465

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

appimageTools.wrapAppImage: remove version from `pname` #271071

appimageTools.wrapAppImage: remove version from `pname` #271071

pbsds commented Nov 30, 2023 •

edited

Loading

pbsds commented Nov 30, 2023

Atemu left a comment •

edited

Loading

Atemu Dec 1, 2023

pbsds Dec 2, 2023 •

edited

Loading

pbsds Dec 8, 2023

pbsds Dec 8, 2023

Atemu Dec 8, 2023

Atemu Dec 10, 2023

pbsds Dec 10, 2023

pbsds Dec 10, 2023 •

edited

Loading

Atemu Dec 10, 2023

pbsds Dec 10, 2023

pbsds commented Dec 2, 2023

pbsds commented Dec 2, 2023 •

edited

Loading

Atemu commented Dec 2, 2023

pbsds left a comment •

edited

Loading

pbsds Dec 10, 2023

Atemu Dec 10, 2023

pbsds Dec 10, 2023 •

edited

Loading

pbsds commented Dec 10, 2023

Atemu commented Dec 11, 2023

pbsds commented Dec 12, 2023 •

edited

Loading

pbsds commented Dec 18, 2023

DanielSidhion commented Dec 22, 2023

Atemu left a comment

pbsds commented Jan 5, 2024 •

edited

Loading

Atemu left a comment

pbsds commented Apr 24, 2024

pbsds commented Apr 24, 2024

nixos-discourse commented Apr 24, 2024

appimageTools.wrapAppImage: remove version from pname #271071

appimageTools.wrapAppImage: remove version from pname #271071

Conversation

pbsds commented Nov 30, 2023 • edited Loading

Description of changes

Things done

Priorities

pbsds commented Nov 30, 2023

Atemu left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pbsds Dec 2, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pbsds Dec 10, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pbsds commented Dec 2, 2023

pbsds commented Dec 2, 2023 • edited Loading

Atemu commented Dec 2, 2023

pbsds left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pbsds Dec 10, 2023 • edited Loading

Choose a reason for hiding this comment

pbsds commented Dec 10, 2023

Atemu commented Dec 11, 2023

pbsds commented Dec 12, 2023 • edited Loading

pbsds commented Dec 18, 2023

DanielSidhion commented Dec 22, 2023

Atemu left a comment

Choose a reason for hiding this comment

pbsds commented Jan 5, 2024 • edited Loading

Atemu left a comment

Choose a reason for hiding this comment

pbsds commented Apr 24, 2024

pbsds commented Apr 24, 2024

nixos-discourse commented Apr 24, 2024

appimageTools.wrapAppImage: remove version from `pname` #271071

appimageTools.wrapAppImage: remove version from `pname` #271071

pbsds commented Nov 30, 2023 •

edited

Loading

Atemu left a comment •

edited

Loading

pbsds Dec 2, 2023 •

edited

Loading

pbsds Dec 10, 2023 •

edited

Loading

pbsds commented Dec 2, 2023 •

edited

Loading

pbsds left a comment •

edited

Loading

pbsds Dec 10, 2023 •

edited

Loading

pbsds commented Dec 12, 2023 •

edited

Loading

pbsds commented Jan 5, 2024 •

edited

Loading