From 70f1d94f7143eca6ca84d36b43f3e37e7e52cbac Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 2 Aug 2025 12:22:52 -0300 Subject: [PATCH] etcd_3_5: move buildGoModule pinning to top-level to comply with override interface --- pkgs/servers/etcd/3_5/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/etcd/3_5/default.nix b/pkgs/servers/etcd/3_5/default.nix index a27c33e2622a..57e7d10dc9e2 100644 --- a/pkgs/servers/etcd/3_5/default.nix +++ b/pkgs/servers/etcd/3_5/default.nix @@ -1,6 +1,6 @@ { lib, - buildGo123Module, + buildGoModule, fetchFromGitHub, symlinkJoin, nixosTests, @@ -33,7 +33,7 @@ let platforms = platforms.darwin ++ platforms.linux; }; - etcdserver = buildGo123Module { + etcdserver = buildGoModule { pname = "etcdserver"; inherit @@ -60,7 +60,7 @@ let ldflags = [ "-X go.etcd.io/etcd/api/v3/version.GitSHA=GitNotFound" ]; }; - etcdutl = buildGo123Module { + etcdutl = buildGoModule { pname = "etcdutl"; inherit @@ -75,7 +75,7 @@ let modRoot = "./etcdutl"; }; - etcdctl = buildGo123Module { + etcdctl = buildGoModule { pname = "etcdctl"; inherit diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b017c8e5e7d..e924f3907c76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10137,7 +10137,9 @@ with pkgs; etcd = etcd_3_5; etcd_3_4 = callPackage ../servers/etcd/3.4.nix { }; - etcd_3_5 = callPackage ../servers/etcd/3_5 { }; + etcd_3_5 = callPackage ../servers/etcd/3_5 { + buildGoModule = buildGo123Module; + }; prosody = callPackage ../servers/xmpp/prosody { withExtraLibs = [ ];