Commit e949f530 authored by Carl Andersson's avatar Carl Andersson Committed by Yureka
Browse files

etcd: 3.5.22 -> 3.5.24 

Builds with 1.24.9 according to https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.5.md#v3524-2025-10-22
Removes patching

Fixes #454788
parent e4a2e2fa

pkgs/servers/etcd/3_5/default.nix

+16 −26
Original line number Diff line number Diff line 
{

  applyPatches,

  buildGoModule,

  buildGo124Module,

  fetchFromGitHub,

  fetchpatch,

  k3s,

  lib,

  nixosTests,
@@ -10,13 +8,12 @@ 
}:



let

  version = "3.5.22";

  etcdSrcHash = "sha256-tS1IFMxfb8Vk9HJTAK+BGPZiVE3ls4Q2DQSerALOQCc=";

  etcdServerVendorHash = "sha256-ul3R0c6RoCqLvlD2dfso1KwfHjsHfzQiUVJZJmz28ks=";

  etcdUtlVendorHash = "sha256-S2pje2fTDaZwf6jnyE2YXWcs/fgqF51nxCVfEwg0Gsw=";

  etcdCtlVendorHash = "sha256-lZ6o0oWUsc3WiCa87ynm7UAG6VxTf81a301QMSPOvW0=";

  version = "3.5.24";

  etcdSrcHash = "sha256-8qzgMiA/ATSFR5XTzWQhK1SmykHkT/FqBNG0RO93H9w=";

  etcdServerVendorHash = "sha256-yCazbIcCOuabYDu7Tl0UTx47UiF/Rhg5O6r2kb+w4SY=";

  etcdUtlVendorHash = "sha256-v8JQmyvHhvz7l8i8kwXVX9sAylElVSUnxKD5oUwQDUw=";

  etcdCtlVendorHash = "sha256-UNdomi/3Q92CEsUYkt49vFF1Dp1QIFGK7wF/08U3dio=";



  src = applyPatches {

  src = fetchFromGitHub {

    owner = "etcd-io";

    repo = "etcd";
@@ -24,13 +21,6 @@ let 
    hash = etcdSrcHash;

  };



    patches = [

      (fetchpatch {

        url = "https://github.com/etcd-io/etcd/commit/31650ab0c8df43af05fc4c13b48ffee59271eec7.patch";

        hash = "sha256-Q94HOLFx2fnb61wMQsAUT4sIBXfxXqW9YEayukQXX18=";

      })

    ];

  };

  env = {

    CGO_ENABLED = 0;

  };
@@ -45,7 +35,7 @@ let 
    platforms = platforms.darwin ++ platforms.linux;

  };



  etcdserver = buildGoModule {

  etcdserver = buildGo124Module {

    pname = "etcdserver";



    inherit
@@ -72,7 +62,7 @@ let 
    ldflags = [ "-X go.etcd.io/etcd/api/v3/version.GitSHA=GitNotFound" ];

  };



  etcdutl = buildGoModule {

  etcdutl = buildGo124Module {

    pname = "etcdutl";



    inherit
@@ -87,7 +77,7 @@ let 
    modRoot = "./etcdutl";

  };



  etcdctl = buildGoModule {

  etcdctl = buildGo124Module {

    pname = "etcdctl";



    inherit