From ad51f81af56b644e4dffa83d0814332a8bb22c74 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 19 Oct 2025 14:23:44 -0300 Subject: [PATCH] etcd_3_6: 3.6.4 -> 3.6.5 https://github.com/etcd-io/etcd/releases/tag/v3.6.5 --- pkgs/by-name/et/etcd_3_6/package.nix | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/et/etcd_3_6/package.nix b/pkgs/by-name/et/etcd_3_6/package.nix index f4bfc90780bc..49a2ad7f92c1 100644 --- a/pkgs/by-name/et/etcd_3_6/package.nix +++ b/pkgs/by-name/et/etcd_3_6/package.nix @@ -1,8 +1,7 @@ { applyPatches, - buildGoModule, + buildGo124Module, fetchFromGitHub, - fetchpatch, installShellFiles, k3s, lib, @@ -12,11 +11,11 @@ }: let - version = "3.6.4"; - etcdSrcHash = "sha256-otz+06cOD2MVnMZWKId1GN+MeZfnDbdudiYfVCKdzuo="; - etcdCtlVendorHash = "sha256-kTH+s/SY+xwo6kt6iPJ7XDhin0jPk0FBr0eOe/717bE="; - etcdUtlVendorHash = "sha256-P0yx9YMMD9vT7N6LOlo26EAOi+Dj33p3ZjAYEoaL19A="; - etcdServerVendorHash = "sha256-kgbCT1JxI98W89veCItB7ZfW4d9D3/Ip3tOuFKEX9v4="; + version = "3.6.5"; + etcdSrcHash = "sha256-d0Ujg9ynnnSW0PYYYrNEmPtLnYW2HcCl+zcVo8ACiS0="; + etcdCtlVendorHash = "sha256-5r3Q+AfWp23tzbYQoD1hXEzRttJrUUKQSpcEV3GIlOE="; + etcdUtlVendorHash = "sha256-funO7EEJs28w4sk4sHVA/KR1TiHumVKNs0Gn/xFl4ig="; + etcdServerVendorHash = "sha256-OtWpX5A+kyQej2bueTqmNf62oKmXGQzjexzXlK/XJms="; src = applyPatches { src = fetchFromGitHub { @@ -25,12 +24,6 @@ let tag = "v${version}"; hash = etcdSrcHash; }; - patches = [ - (fetchpatch { - url = "https://github.com/etcd-io/etcd/commit/31650ab0c8df43af05fc4c13b48ffee59271eec7.patch"; - hash = "sha256-Q94HOLFx2fnb61wMQsAUT4sIBXfxXqW9YEayukQXX18="; - }) - ]; }; env = { @@ -46,7 +39,7 @@ let platforms = lib.platforms.darwin ++ lib.platforms.linux; }; - etcdserver = buildGoModule { + etcdserver = buildGo124Module { pname = "etcdserver"; inherit @@ -73,7 +66,7 @@ let ldflags = [ "-X go.etcd.io/etcd/api/v3/version.GitSHA=GitNotFound" ]; }; - etcdutl = buildGoModule { + etcdutl = buildGo124Module { pname = "etcdutl"; inherit @@ -99,7 +92,7 @@ let ''; }; - etcdctl = buildGoModule { + etcdctl = buildGo124Module { pname = "etcdctl"; inherit