From 947fa468624bb1c79202b6a8697bca8984b83e06 Mon Sep 17 00:00:00 2001 From: superherointj Date: Wed, 12 Nov 2025 10:41:14 -0300 Subject: [PATCH 1/5] etcd_3_4: 3.4.38 -> 3.4.39 https://github.com/etcd-io/etcd/releases/tag/v3.4.39 --- pkgs/by-name/et/etcd_3_4/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/et/etcd_3_4/package.nix b/pkgs/by-name/et/etcd_3_4/package.nix index ac404468b339..059bafd39d78 100644 --- a/pkgs/by-name/et/etcd_3_4/package.nix +++ b/pkgs/by-name/et/etcd_3_4/package.nix @@ -7,13 +7,13 @@ buildGo124Module rec { pname = "etcd"; - version = "3.4.38"; + version = "3.4.39"; src = fetchFromGitHub { owner = "etcd-io"; repo = "etcd"; rev = "v${version}"; - hash = "sha256-+fRmz52ZqQTL8JJmSsufoVJP/FGHez9LliEwGsoCE7s="; + hash = "sha256-S1aNEd7pPgSu8vFhXIYFjEvfBG3OtmuKCvD5Zgj0m30="; }; proxyVendor = true; From 574a93f8b3a4ce516b30efb48439075e8ae928b3 Mon Sep 17 00:00:00 2001 From: superherointj Date: Wed, 12 Nov 2025 10:43:54 -0300 Subject: [PATCH 2/5] etcd_3_5: 3.5.24 -> 3.5.25 Release: https://github.com/etcd-io/etcd/releases/tag/v3.5.25 --- pkgs/by-name/et/etcd_3_5/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/et/etcd_3_5/package.nix b/pkgs/by-name/et/etcd_3_5/package.nix index b5b67dc32c4b..54c6468dbf94 100644 --- a/pkgs/by-name/et/etcd_3_5/package.nix +++ b/pkgs/by-name/et/etcd_3_5/package.nix @@ -8,11 +8,11 @@ }: let - version = "3.5.24"; - etcdSrcHash = "sha256-8qzgMiA/ATSFR5XTzWQhK1SmykHkT/FqBNG0RO93H9w="; - etcdServerVendorHash = "sha256-yCazbIcCOuabYDu7Tl0UTx47UiF/Rhg5O6r2kb+w4SY="; - etcdUtlVendorHash = "sha256-v8JQmyvHhvz7l8i8kwXVX9sAylElVSUnxKD5oUwQDUw="; - etcdCtlVendorHash = "sha256-UNdomi/3Q92CEsUYkt49vFF1Dp1QIFGK7wF/08U3dio="; + version = "3.5.25"; + etcdSrcHash = "sha256-7fCvlp/EG1SofsLC8il/twjg0rEaB/lhz6dnUxgLXik="; + etcdServerVendorHash = "sha256-R78j1BTuY3ORQiMnm2kWJGnK4jJi7am4x0udW4jjcCE="; + etcdUtlVendorHash = "sha256-J+/QgRAU1uk9LXdW8b6AhitFlxx/QU7IkJ+5Jez9MkM="; + etcdCtlVendorHash = "sha256-IiggECH1iFkb51MTeFSFnVbVVDUR1KgsQcbxz9IR4c4="; src = fetchFromGitHub { owner = "etcd-io"; From f26ef09799e48550612e04a49ef58681595483b6 Mon Sep 17 00:00:00 2001 From: superherointj Date: Wed, 12 Nov 2025 10:47:47 -0300 Subject: [PATCH 3/5] etcd_3_6: 3.6.5 -> 3.6.6 Release: https://github.com/etcd-io/etcd/releases/tag/v3.6.6 --- pkgs/by-name/et/etcd_3_6/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/et/etcd_3_6/package.nix b/pkgs/by-name/et/etcd_3_6/package.nix index 49a2ad7f92c1..6da260ea77eb 100644 --- a/pkgs/by-name/et/etcd_3_6/package.nix +++ b/pkgs/by-name/et/etcd_3_6/package.nix @@ -11,11 +11,11 @@ }: let - version = "3.6.5"; - etcdSrcHash = "sha256-d0Ujg9ynnnSW0PYYYrNEmPtLnYW2HcCl+zcVo8ACiS0="; - etcdCtlVendorHash = "sha256-5r3Q+AfWp23tzbYQoD1hXEzRttJrUUKQSpcEV3GIlOE="; - etcdUtlVendorHash = "sha256-funO7EEJs28w4sk4sHVA/KR1TiHumVKNs0Gn/xFl4ig="; - etcdServerVendorHash = "sha256-OtWpX5A+kyQej2bueTqmNf62oKmXGQzjexzXlK/XJms="; + version = "3.6.6"; + etcdSrcHash = "sha256-MFkO2Rv38TQeREJ3zHgRdj3thnMK0ci3laEjn4CaXHs="; + etcdCtlVendorHash = "sha256-VxR/pPS/HR4EBPJJmQin7XqS5MvWreJe2dlOpQn3pqY="; + etcdUtlVendorHash = "sha256-xxq9t47985fA9fDvaanq2sPgUDZJDT2w46zp3pggryo="; + etcdServerVendorHash = "sha256-0uPIw2T9ZrR92MBB1xBBfbqXQUVg6sNDu8F5m1C+lEQ="; src = applyPatches { src = fetchFromGitHub { From 106915d18fcddf2d21ee86221b0b61f0e498d201 Mon Sep 17 00:00:00 2001 From: superherointj Date: Wed, 12 Nov 2025 19:20:55 -0300 Subject: [PATCH 4/5] etcd: etcd_3_5 -> etcd_3_6 Migration notes: https://etcd.io/docs/v3.6/upgrades/upgrade_3_6/ --- pkgs/by-name/et/etcd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/et/etcd/package.nix b/pkgs/by-name/et/etcd/package.nix index 1d70cbf0fd3b..895d961b7642 100644 --- a/pkgs/by-name/et/etcd/package.nix +++ b/pkgs/by-name/et/etcd/package.nix @@ -1,3 +1,3 @@ -{ etcd_3_5 }: +{ etcd_3_6 }: -etcd_3_5 +etcd_3_6 From 5241511392339749c5a5a4def7e262496f4068cd Mon Sep 17 00:00:00 2001 From: superherointj Date: Wed, 12 Nov 2025 19:33:03 -0300 Subject: [PATCH 5/5] nixos/rl-2511: add etcd upgrade note --- nixos/doc/manual/release-notes/rl-2511.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index cfd0395ae33d..bf6d46d732f5 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -207,6 +207,8 @@ - `boot.enableContainers` is only turned on when a declarative NixOS container is defined in `containers`. If you use the `nixos-container` tool for imperative container management, set `boot.enableContainers = true;` explicitly. +- `etcd` package was upgraded to 3.6, see [migration notes](https://etcd.io/docs/v3.6/upgrades/upgrade_3_6/) for incompatibilities and upgrade procedure. + - `services.parsoid` and the `nodePackages.parsoid` package have been removed, as the JavaScript-based version this module uses is not compatible with modern MediaWiki versions. - `virtualisation.lxd` has been removed due to lack of Nixpkgs maintenance. Users can migrate to `virtualisation.incus`, a fork of LXD, as a replacement. See [Incus migration documentation](https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/) for migration information.