Skip to content

podman-desktop: bump electron and pnpm version with adjusted updateScript #407982

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.

Sign up for GitHub

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

Merged
khaneliman merged 2 commits into from
May 19, 2025
Merged

podman-desktop: bump electron and pnpm version with adjusted updateScript #407982

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a776b0
podman-desktop: refine updateScript to bump electron and pnpm version
kachick May 17, 2025
32146f4
podman-desktop: bump electron and pnpm version
kachick May 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 37 additions & 7 deletions pkgs/by-name/po/podman-desktop/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,52 @@
fetchFromGitHub,
makeWrapper,
copyDesktopItems,
electron_34,
electron_35,
nodejs,
pnpm_9,
pnpm_10,
makeDesktopItem,
darwin,
nix-update-script,
_experimental-update-script-combinators,
writeShellApplication,
nix,
jq,
gnugrep,
}:

let
electron = electron_34;
electron = electron_35;
in
stdenv.mkDerivation (finalAttrs: {
pname = "podman-desktop";
version = "1.18.1";

passthru.updateScript = nix-update-script { };
passthru.updateScript = _experimental-update-script-combinators.sequence [
(nix-update-script { })
(lib.getExe (writeShellApplication {
name = "${finalAttrs.pname}-dependencies-updater";
runtimeInputs = [
nix
jq
gnugrep
];
runtimeEnv = {
PNAME = finalAttrs.pname;
PKG_FILE = builtins.toString ./package.nix;
};
text = ''
new_src="$(nix-build --attr "pkgs.$PNAME.src" --no-out-link)"
new_electron_major="$(jq '.devDependencies.electron' "$new_src/package.json" | grep --perl-regexp --only-matching '\d+' | head -n 1)"
new_pnpm_major="$(jq '.packageManager' "$new_src/package.json" | grep --perl-regexp --only-matching '\d+' | head -n 1)"
sed -i -E "s/electron_[0-9]+/electron_$new_electron_major/g" "$PKG_FILE"
sed -i -E "s/pnpm_[0-9]+/pnpm_$new_pnpm_major/g" "$PKG_FILE"
'';
}))
(nix-update-script {
# Changing the pnpm version requires updating `pnpmDeps.hash`.
extraArgs = [ "--version=skip" ];
})
];

src = fetchFromGitHub {
owner = "containers";
Expand All @@ -28,9 +58,9 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-GYdetO/WiEQAvVSvu81tKqkOH7YUgkB7RVW0Crd/2ww=";
};

pnpmDeps = pnpm_9.fetchDeps {
pnpmDeps = pnpm_10.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-2k0BbE9FkWEErsTuCECjy+iI3u1Biv1MF9hI7Oq3Aus=";
hash = "sha256-IjCO2mLDHhb1fB92plBAFcH1RpmOtiUGlFHEEAAHOJ8=";
};

patches = [
Expand All @@ -47,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs =
[
nodejs
pnpm_9.configHook
pnpm_10.configHook
]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
copyDesktopItems
Expand Down