From e9e9a6266e3c6687df22642e87efa735f934b534 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 1 Oct 2025 09:43:51 +0200
Subject: [PATCH 1/3] popsicle: use `finalAttrs` pattern

---
 pkgs/by-name/po/popsicle/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/po/popsicle/package.nix b/pkgs/by-name/po/popsicle/package.nix
index 1738985d7769..4770f1b318f2 100644
--- a/pkgs/by-name/po/popsicle/package.nix
+++ b/pkgs/by-name/po/popsicle/package.nix
@@ -12,19 +12,19 @@
   gtk3,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "popsicle";
   version = "1.3.3";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "popsicle";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-sWQNav7odvX+peDglLHd7Jrmvhm5ddFBLBla0WK7wcE=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit pname version src;
+    inherit (finalAttrs) pname version src;
     hash = "sha256-KWVX5eOewARccI+ukNfEn8Wc3He1lWXjm9E/Dl0LuM4=";
   };
 
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Multiple USB File Flasher";
     homepage = "https://github.com/pop-os/popsicle";
-    changelog = "https://github.com/pop-os/popsicle/releases/tag/${version}";
+    changelog = "https://github.com/pop-os/popsicle/releases/tag/${finalAttrs.version}";
     maintainers = with lib.maintainers; [
       _13r0ck
       figsoda
@@ -58,4 +58,4 @@ stdenv.mkDerivation rec {
     license = lib.licenses.mit;
     platforms = lib.platforms.linux;
   };
-}
+})

From 81337e47e0f9014131a8bcea8566b0e56fd855d9 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 1 Oct 2025 10:05:11 +0200
Subject: [PATCH 2/3] popsicle: replace `rev` with `tag`

---
 pkgs/by-name/po/popsicle/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/po/popsicle/package.nix b/pkgs/by-name/po/popsicle/package.nix
index 4770f1b318f2..8a60443de2af 100644
--- a/pkgs/by-name/po/popsicle/package.nix
+++ b/pkgs/by-name/po/popsicle/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "popsicle";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-sWQNav7odvX+peDglLHd7Jrmvhm5ddFBLBla0WK7wcE=";
   };
 

From abcd6e77d24c79b3153fcb23a0268c502bc9aff8 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 1 Oct 2025 10:06:20 +0200
Subject: [PATCH 3/3] popsicle: enable `versionCheckHook`

---
 pkgs/by-name/po/popsicle/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/po/popsicle/package.nix b/pkgs/by-name/po/popsicle/package.nix
index 8a60443de2af..5792c9348792 100644
--- a/pkgs/by-name/po/popsicle/package.nix
+++ b/pkgs/by-name/po/popsicle/package.nix
@@ -10,6 +10,7 @@
   wrapGAppsHook3,
   gdk-pixbuf,
   gtk3,
+  versionCheckHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -47,6 +48,10 @@ stdenv.mkDerivation (finalAttrs: {
     "prefix=$(out)"
   ];
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
   meta = {
     description = "Multiple USB File Flasher";
     homepage = "https://github.com/pop-os/popsicle";