jetbrains-toolbox: 2.5.4.38621 -> 2.6.1.40902 (#399253)

pkgs/by-name/je/jetbrains-toolbox/package.nix

@@ -11,9 +11,9 @@
 
 let
   pname = "jetbrains-toolbox";
-  version = "2.5.4.38621";
+  version = "2.6.1.40902";
 
-  passthru.updateScript = ./update.sh;
+  updateScript = ./update.sh;
 
   meta = {
     description = "Jetbrains Toolbox";
@@ -34,30 +34,26 @@ let
     attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
 
   linux = appimageTools.wrapAppImage rec {
-    inherit
-      pname
-      version
-      passthru
-      meta
-      ;
+    inherit pname version meta;
+
+    source =
+      let
+        arch = selectSystem {
+          x86_64-linux = "";
+          aarch64-linux = "-arm64";
+        };
+      in
+      fetchzip {
+        url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}${arch}.tar.gz";
+        hash = selectSystem {
+          x86_64-linux = "sha256-P4kv6ca6mGtl334HKNkdo9Iib/Cgu3ROrbQKlQqxUj4=";
+          aarch64-linux = "sha256-mG8GAVPi2I0A13rKhXoXxiRIHK1QOWPv4gZxfm0+DKs=";
+        };
+      };
 
     src = appimageTools.extractType2 {
       inherit pname version;
-      src =
-        let
-          arch = selectSystem {
-            x86_64-linux = "";
-            aarch64-linux = "-arm64";
-          };
-        in
-        fetchzip {
-          url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}${arch}.tar.gz";
-          hash = selectSystem {
-            x86_64-linux = "sha256-rq0Hn9g+/u9C8vbEVH2mv62c1dvxr+t9tBhf26swQgI=";
-            aarch64-linux = "sha256-52wFejaKBSg/eeJu3NDGl1AdZLsJdi/838YeROD4Loc=";
-          };
-        }
-        + "/jetbrains-toolbox";
+      src = source + "/jetbrains-toolbox";
       postExtract = ''
         patchelf --add-rpath ${lib.makeLibraryPath [ icu ]} $out/jetbrains-toolbox
       '';
@@ -71,15 +67,15 @@ let
       wrapProgram $out/bin/jetbrains-toolbox \
         --append-flags "--update-failed"
     '';
+
+    passthru = {
+      src = source;
+      inherit updateScript;
+    };
   };
 
   darwin = stdenv.mkDerivation (finalAttrs: {
-    inherit
-      pname
-      version
-      passthru
-      meta
-      ;
+    inherit pname version meta;
 
     src =
       let
@@ -91,8 +87,8 @@ let
       fetchurl {
         url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${finalAttrs.version}${arch}.dmg";
         hash = selectSystem {
-          x86_64-darwin = "sha256-y0zXQEqY5lj/e440dRtyBfaw8CwqqgzO3Ujreb37Z/I=";
-          aarch64-darwin = "sha256-9Bj5puG9NUHO53oXBRlB5DvX9jGTmrkDgjV2QPH9qg0=";
+          x86_64-darwin = "sha256-Dw1CqthgvKIlHrcQIoOpYbAG5c6uvq/UgzaO4n25YJY=";
+          aarch64-darwin = "sha256-b/z8Pq8h6n34junSMyxRS3Y/TQ3tu05Bh77xlvMvEtI=";
         };
       };
 
@@ -109,6 +105,10 @@ let
 
       runHook postInstall
     '';
+
+    passthru = {
+      inherit updateScript;
+    };
   });
 in
 if stdenv.hostPlatform.isDarwin then darwin else linux