From dbef56312deb4815cf9c2870212e99324cc9d943 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Jul 2025 13:54:06 +0000 Subject: [PATCH 1/3] podman-desktop: 1.19.2 -> 1.20.0 --- pkgs/by-name/po/podman-desktop/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix index 81b1010a6c7e..409d40d90adf 100644 --- a/pkgs/by-name/po/podman-desktop/package.nix +++ b/pkgs/by-name/po/podman-desktop/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, makeWrapper, copyDesktopItems, - electron_36, + electron_37, nodejs, pnpm_10, makeDesktopItem, @@ -18,11 +18,11 @@ }: let - electron = electron_36; + electron = electron_37; in stdenv.mkDerivation (finalAttrs: { pname = "podman-desktop"; - version = "1.19.2"; + version = "1.20.0"; passthru.updateScript = _experimental-update-script-combinators.sequence [ (nix-update-script { }) @@ -55,12 +55,12 @@ stdenv.mkDerivation (finalAttrs: { owner = "containers"; repo = "podman-desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-Yw4HPHtMMxaI7MLamZy+MglvHHpO6h4/kHY2TBXWErg="; + hash = "sha256-/RvT92rX74WAp4v/OJMzNS84yNQVTcRT2dy5WepyBM4="; }; pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-6xXTzqEeWpDKhZN6z4dSHrU7qWK9AAlD2DXnr7ac0So="; + hash = "sha256-8lNmCLfuAkXK1Du4iYYasRTozZf0HoAttf8Dfc6Jglw="; }; patches = [ From a1fcfb6d83b30d987bd727013def82cdf9f27976 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sat, 12 Jul 2025 14:04:09 -0400 Subject: [PATCH 2/3] podman-desktop: force disable electron-builder signing on arm64 Even with CSC_IDENTITY_AUTO_DISCOVERY=false, latest builder attempts to sign if on arm64 unless identity is forcefully set to `null`. The problem that builder tries to solve with falling back to an ad-hoc signature doesn't affect us because we later sign binaries with our own hook. So it should be safe to disable builder's signature logic. --- pkgs/by-name/po/podman-desktop/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix index 409d40d90adf..7efcd298c5c7 100644 --- a/pkgs/by-name/po/podman-desktop/package.nix +++ b/pkgs/by-name/po/podman-desktop/package.nix @@ -70,10 +70,6 @@ stdenv.mkDerivation (finalAttrs: { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - # Don't attempt to sign the darwin app bundle. - # It's impure and may fail in some restricted environments. - CSC_IDENTITY_AUTO_DISCOVERY = lib.optionals stdenv.hostPlatform.isDarwin "false"; - nativeBuildInputs = [ nodejs @@ -94,9 +90,13 @@ stdenv.mkDerivation (finalAttrs: { chmod -R u+w electron-dist pnpm build + + # Explicitly set identity to null to avoid signing on arm64 macs with newer electron-builder. + # See: https://github.com/electron-userland/electron-builder/pull/9007 ./node_modules/.bin/electron-builder \ --dir \ --config .electron-builder.config.cjs \ + -c.mac.identity=null \ -c.electronDist=electron-dist \ -c.electronVersion=${electron.version} From 5a40ba6e047e3b70ec338041f971f573d3f7d136 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sat, 12 Jul 2025 14:14:35 -0400 Subject: [PATCH 3/3] podman-desktop: 1.20.0 -> 1.20.1 --- pkgs/by-name/po/podman-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix index 7efcd298c5c7..fb2909e1a474 100644 --- a/pkgs/by-name/po/podman-desktop/package.nix +++ b/pkgs/by-name/po/podman-desktop/package.nix @@ -22,7 +22,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "podman-desktop"; - version = "1.20.0"; + version = "1.20.1"; passthru.updateScript = _experimental-update-script-combinators.sequence [ (nix-update-script { }) @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "containers"; repo = "podman-desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-/RvT92rX74WAp4v/OJMzNS84yNQVTcRT2dy5WepyBM4="; + hash = "sha256-diqlooa4SsFtmzl3A25PEaV0ALnghoj7htBGRgXn6As="; }; pnpmDeps = pnpm_10.fetchDeps {