From 8cbe1c1f0a778cd6f02b15778967ff6c3e4b7c48 Mon Sep 17 00:00:00 2001
From: azahi <azat@bahawi.net>
Date: Wed, 2 Apr 2025 22:52:42 +0300
Subject: [PATCH 1/2] werf: 2.31.1 -> 2.34.1

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

diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix
index 31fb7254e5b9..8dd10d357c0d 100644
--- a/pkgs/by-name/we/werf/package.nix
+++ b/pkgs/by-name/we/werf/package.nix
@@ -11,18 +11,17 @@
 
 buildGoModule rec {
   pname = "werf";
-  version = "2.31.1";
+  version = "2.34.1";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "werf";
     tag = "v${version}";
-    hash = "sha256-eEdhAY3vN6hsgggakYpGFiVjR2BBGrg1UF18gFXc8g8=";
+    hash = "sha256-hWkU3tyh0kQ9GNl5gQIs4wTRBQV0B3/0oOAhKLo1hOo=";
   };
 
-  vendorHash = "sha256-g+QZI0mfXSIU+iBnKzMeTGuF5UB1cwOixvRhcrBGrpE=";
-
   proxyVendor = true;
+  vendorHash = "sha256-x9ehxBfyk5sMg71yJcyjcrBAi5bzEnENAaqLXFoGQck=";
 
   subPackages = [ "cmd/werf" ];
 
@@ -72,10 +71,11 @@ buildGoModule rec {
       # Test all packages.
       unset subPackages
 
-      # Remove tests that require external services, usually a Docker daemon.
+      # Remove tests that fail or require external services.
       rm -rf \
         integration/suites \
         pkg/true_git/*_test.go \
+        pkg/werf/exec/*_test.go \
         test/e2e
     ''
     + lib.optionalString (env.CGO_ENABLED == 0) ''

From 1a20063f9f945122614926c3000b404745ee6bdb Mon Sep 17 00:00:00 2001
From: azahi <azat@bahawi.net>
Date: Wed, 2 Apr 2025 22:57:14 +0300
Subject: [PATCH 2/2] werf: refactor

---
 pkgs/by-name/we/werf/package.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix
index 8dd10d357c0d..98b7f159bd24 100644
--- a/pkgs/by-name/we/werf/package.nix
+++ b/pkgs/by-name/we/werf/package.nix
@@ -8,15 +8,14 @@
   installShellFiles,
   versionCheckHook,
 }:
-
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "werf";
   version = "2.34.1";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "werf";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-hWkU3tyh0kQ9GNl5gQIs4wTRBQV0B3/0oOAhKLo1hOo=";
   };
 
@@ -40,9 +39,9 @@ buildGoModule rec {
     [
       "-s"
       "-w"
-      "-X github.com/werf/werf/v2/pkg/werf.Version=v${version}"
+      "-X github.com/werf/werf/v2/pkg/werf.Version=${finalAttrs.src.rev}"
     ]
-    ++ lib.optionals (env.CGO_ENABLED == 1) [
+    ++ lib.optionals (finalAttrs.env.CGO_ENABLED == 1) [
       "-extldflags=-static"
       "-linkmode external"
     ];
@@ -55,7 +54,7 @@ buildGoModule rec {
       "dfrunsecurity"
       "dfssh"
     ]
-    ++ lib.optionals (env.CGO_ENABLED == 1) [
+    ++ lib.optionals (finalAttrs.env.CGO_ENABLED == 1) [
       "cni"
       "exclude_graphdriver_devicemapper"
       "netgo"
@@ -78,7 +77,7 @@ buildGoModule rec {
         pkg/werf/exec/*_test.go \
         test/e2e
     ''
-    + lib.optionalString (env.CGO_ENABLED == 0) ''
+    + lib.optionalString (finalAttrs.env.CGO_ENABLED == 0) ''
       # A workaround for osusergo.
       export USER=nixbld
     '';
@@ -104,9 +103,9 @@ buildGoModule rec {
       Buildah.
     '';
     homepage = "https://werf.io";
-    changelog = "https://github.com/werf/werf/releases/tag/${src.rev}";
+    changelog = "https://github.com/werf/werf/releases/tag/${finalAttrs.src.rev}";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.azahi ];
     mainProgram = "werf";
   };
-}
+})