From 43e2724cfdd5353e090394bbc5b631f55c631bae Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 1 Aug 2025 14:20:53 -0300 Subject: [PATCH 1/7] etcd_3_5: scope passthru dependencies - Remove unused rec keyword to suppress editor warnings --- pkgs/servers/etcd/3.5/default.nix | 9 ++++++--- pkgs/servers/etcd/3.5/update.sh | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/etcd/3.5/default.nix b/pkgs/servers/etcd/3.5/default.nix index a27fd3c750de..f45f15028b4c 100644 --- a/pkgs/servers/etcd/3.5/default.nix +++ b/pkgs/servers/etcd/3.5/default.nix @@ -58,7 +58,7 @@ let ldflags = [ "-X go.etcd.io/etcd/api/v3/version.GitSHA=GitNotFound" ]; }; - etcdutl = buildGo123Module rec { + etcdutl = buildGo123Module { pname = "etcdutl"; inherit @@ -73,7 +73,7 @@ let modRoot = "./etcdutl"; }; - etcdctl = buildGo123Module rec { + etcdctl = buildGo123Module { pname = "etcdctl"; inherit @@ -94,7 +94,10 @@ symlinkJoin { inherit meta version; passthru = { - inherit etcdserver etcdutl etcdctl; + deps = { + inherit etcdserver etcdutl etcdctl; + }; + tests = { inherit (nixosTests) etcd etcd-cluster; k3s = k3s.passthru.tests.etcd; diff --git a/pkgs/servers/etcd/3.5/update.sh b/pkgs/servers/etcd/3.5/update.sh index 2a3d9b108707..dc428420cbc9 100755 --- a/pkgs/servers/etcd/3.5/update.sh +++ b/pkgs/servers/etcd/3.5/update.sh @@ -45,7 +45,7 @@ if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then setKV $PKG_KEY $EMPTY_HASH set +e - VENDOR_HASH=$(nurl -e "(import ${NIXPKGS_PATH}/. {}).$ETCD_PKG_NAME.passthru.$INNER_PKG.goModules") + VENDOR_HASH=$(nurl -e "(import ${NIXPKGS_PATH}/. {}).$ETCD_PKG_NAME.passthru.deps.$INNER_PKG.goModules") set -e if [ -n "${VENDOR_HASH:-}" ]; then From 3032e37534595526136ffbba69527fdfb6773488 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 1 Aug 2025 14:11:50 -0300 Subject: [PATCH 2/7] etcd_3_5: 3.5.21 -> 3.5.22 Release: https://github.com/etcd-io/etcd/releases/tag/v3.5.22 Changelog: https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.5.md --- pkgs/servers/etcd/3.5/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/etcd/3.5/default.nix b/pkgs/servers/etcd/3.5/default.nix index f45f15028b4c..09b285a29e15 100644 --- a/pkgs/servers/etcd/3.5/default.nix +++ b/pkgs/servers/etcd/3.5/default.nix @@ -8,11 +8,11 @@ }: let - version = "3.5.21"; - etcdSrcHash = "sha256-0L/lA9/9SNKMz74R6UPF1I7gj03/e91EpNr4LxKoisw="; - etcdServerVendorHash = "sha256-JMxkcDibRcXhU+T7BQMAz95O7xDKefu1YPZK0GU7osk="; - etcdUtlVendorHash = "sha256-901QcnEQ8PWnkliqwL4CrbCD+0ja8vJlDke0P4ya8cA="; - etcdCtlVendorHash = "sha256-BJ924wRPQTqbqtNtXL3l/OSdQv1UmU1y6Zqu//EWTHI="; + version = "3.5.22"; + etcdSrcHash = "sha256-tS1IFMxfb8Vk9HJTAK+BGPZiVE3ls4Q2DQSerALOQCc="; + etcdServerVendorHash = "sha256-ul3R0c6RoCqLvlD2dfso1KwfHjsHfzQiUVJZJmz28ks="; + etcdUtlVendorHash = "sha256-S2pje2fTDaZwf6jnyE2YXWcs/fgqF51nxCVfEwg0Gsw="; + etcdCtlVendorHash = "sha256-lZ6o0oWUsc3WiCa87ynm7UAG6VxTf81a301QMSPOvW0="; src = fetchFromGitHub { owner = "etcd-io"; From 6966a708226a748caf01eb5801ad70591dcca587 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 1 Aug 2025 14:27:06 -0300 Subject: [PATCH 3/7] etcd_3_5: use underscore for version directory name --- pkgs/servers/etcd/{3.5 => 3_5}/default.nix | 0 pkgs/servers/etcd/{3.5 => 3_5}/update.sh | 0 pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/servers/etcd/{3.5 => 3_5}/default.nix (100%) rename pkgs/servers/etcd/{3.5 => 3_5}/update.sh (100%) diff --git a/pkgs/servers/etcd/3.5/default.nix b/pkgs/servers/etcd/3_5/default.nix similarity index 100% rename from pkgs/servers/etcd/3.5/default.nix rename to pkgs/servers/etcd/3_5/default.nix diff --git a/pkgs/servers/etcd/3.5/update.sh b/pkgs/servers/etcd/3_5/update.sh similarity index 100% rename from pkgs/servers/etcd/3.5/update.sh rename to pkgs/servers/etcd/3_5/update.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15b7b79653f4..1b017c8e5e7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10137,7 +10137,7 @@ 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 { }; prosody = callPackage ../servers/xmpp/prosody { withExtraLibs = [ ]; From 65cbe525f06efa1d5d92189b19f0b9bb83d775a2 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 2 Aug 2025 12:10:44 -0300 Subject: [PATCH 4/7] etcd_3_5: darwin network workaround --- pkgs/servers/etcd/3_5/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/etcd/3_5/default.nix b/pkgs/servers/etcd/3_5/default.nix index 09b285a29e15..a27c33e2622a 100644 --- a/pkgs/servers/etcd/3_5/default.nix +++ b/pkgs/servers/etcd/3_5/default.nix @@ -43,6 +43,8 @@ let version ; + __darwinAllowLocalNetworking = true; + vendorHash = etcdServerVendorHash; modRoot = "./server"; 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 5/7] 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 = [ ]; From ec83fe41940459e4ac6848ad7f2c6f7f22bfef08 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 2 Aug 2025 14:19:32 -0300 Subject: [PATCH 6/7] etcd_3_5: add dtomvan as maintainer --- pkgs/servers/etcd/3_5/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/etcd/3_5/default.nix b/pkgs/servers/etcd/3_5/default.nix index 57e7d10dc9e2..f67f7fee8ee9 100644 --- a/pkgs/servers/etcd/3_5/default.nix +++ b/pkgs/servers/etcd/3_5/default.nix @@ -29,7 +29,10 @@ let description = "Distributed reliable key-value store for the most critical data of a distributed system"; license = licenses.asl20; homepage = "https://etcd.io/"; - maintainers = with maintainers; [ offline ]; + maintainers = with maintainers; [ + dtomvan + offline + ]; platforms = platforms.darwin ++ platforms.linux; }; From 6c2897852656e66543df52aca8913661f5896a0e Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 2 Aug 2025 17:54:18 -0300 Subject: [PATCH 7/7] etcd_3_5: remove offline from maintainers for inactivity --- pkgs/servers/etcd/3_5/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/etcd/3_5/default.nix b/pkgs/servers/etcd/3_5/default.nix index f67f7fee8ee9..6d0234c6cbd1 100644 --- a/pkgs/servers/etcd/3_5/default.nix +++ b/pkgs/servers/etcd/3_5/default.nix @@ -31,7 +31,6 @@ let homepage = "https://etcd.io/"; maintainers = with maintainers; [ dtomvan - offline ]; platforms = platforms.darwin ++ platforms.linux; };