From 4a71042b62488993c149226ae50e0e2325998365 Mon Sep 17 00:00:00 2001
From: kuflierl <41301536+kuflierl@users.noreply.github.com>
Date: Thu, 27 Nov 2025 10:40:51 +0100
Subject: [PATCH] cup-docker: 3.4.3 -> 3.5.1, enable finalAttr overrides

Changelog: https://github.com/sergi0g/cup/releases
---
 pkgs/by-name/cu/cup-docker/package.nix | 32 +++++++++++---------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/cu/cup-docker/package.nix b/pkgs/by-name/cu/cup-docker/package.nix
index 02645e5b6bd2..3722fe42553c 100644
--- a/pkgs/by-name/cu/cup-docker/package.nix
+++ b/pkgs/by-name/cu/cup-docker/package.nix
@@ -8,23 +8,25 @@
   nix-update-script,
   withServer ? true,
 }:
-let
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cup-docker";
-  version = "3.4.3";
+  version = "3.5.1";
+
   src = fetchFromGitHub {
     owner = "sergi0g";
     repo = "cup";
-    tag = "v${version}";
-    hash = "sha256-RRhUSL9TR7qr93F5+fyhGW7j6VTs+yVvpni/JHmC5os=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-l7TQwCzQNwrsM+xRcRcQaxIsnd8SVzrqEMwIoZGVBR0=";
   };
-  web = stdenvNoCC.mkDerivation (finalAttrs: {
-    pname = "${pname}-web";
-    inherit version src;
+
+  web = stdenvNoCC.mkDerivation (finalAttrsWeb: {
+    pname = "${finalAttrs.pname}-web";
+    inherit (finalAttrs) version src;
     impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
       "GIT_PROXY_COMMAND"
       "SOCKS_SERVER"
     ];
-    sourceRoot = "${finalAttrs.src.name}/web";
+    sourceRoot = "${finalAttrsWeb.src.name}/web";
     nativeBuildInputs = [
       bun
       nodejs-slim_latest
@@ -47,17 +49,10 @@ let
       cp -R ./dist $out
       runHook postInstall
     '';
-    outputHash = "sha256-Ac1PJYmTQv9XrmhmF1p77vdXh8252hz0CUKxJA+VQR4=";
+    outputHash = "sha256-uLsWppRabaI7JSHYf3YsEvf0Y36kU/iuNXnDXd+6AXY=";
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
   });
-in
-rustPlatform.buildRustPackage {
-  inherit
-    src
-    version
-    pname
-    ;
 
   cargoHash = "sha256-1VSbv6lDRRLZIu7hYrAqzQmvxcuhnPU0rcWfg7Upcm4=";
 
@@ -70,11 +65,10 @@ rustPlatform.buildRustPackage {
   ];
 
   preConfigure = lib.optionalString withServer ''
-    cp -r ${web}/dist src/static
+    cp -r ${finalAttrs.web}/dist src/static
   '';
 
   passthru = {
-    inherit web;
     updateScript = nix-update-script {
       extraArgs = [
         "--subpackage"
@@ -94,4 +88,4 @@ rustPlatform.buildRustPackage {
       kuflierl
     ];
   };
-}
+})