Unverified Commit e5722459 authored by Ulrik Strid's avatar Ulrik Strid Committed by GitHub
Browse files

etcd: bump versions (#460930)

parents 928dcb33 52415113

nixos/doc/manual/release-notes/rl-2511.section.md

+2 −0
Original line number Diff line number Diff line
@@ -213,6 +213,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.

pkgs/by-name/et/etcd/package.nix

+2 −2
Original line number Diff line number Diff line 
{ etcd_3_5 }:

{ etcd_3_6 }:



etcd_3_5
 
etcd_3_6

pkgs/by-name/et/etcd_3_4/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -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;

pkgs/by-name/et/etcd_3_5/package.nix

+5 −5
Original line number Diff line number Diff line
@@ -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";

pkgs/by-name/et/etcd_3_6/package.nix

+5 −5
Original line number Diff line number Diff line
@@ -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 {