From 8ec252784ed0a348c2a752bee96f23a7a81c5755 Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Mon, 7 Nov 2022 16:34:09 -0500 Subject: [PATCH] zrepl: 0.5.0 -> 0.6.0 Signed-off-by: Matt Layher --- .../from_md/release-notes/rl-2211.section.xml | 8 ++++++++ nixos/doc/manual/release-notes/rl-2211.section.md | 2 ++ nixos/tests/zrepl.nix | 4 ++-- pkgs/tools/backup/zrepl/default.nix | 14 +++----------- pkgs/top-level/all-packages.nix | 4 +--- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 90d1d190689..3e80866a2e9 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -882,6 +882,14 @@ support for 1.22 and older has been dropped. + + + The zrepl package has been updated from + 0.5.0 to 0.6.0. See the + changelog + for details. + + k3s no longer supports docker as runtime diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 7dac0c682ca..00cf253b494 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -271,6 +271,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - The default `kops` version is now 1.25.1 and support for 1.22 and older has been dropped. +- The `zrepl` package has been updated from 0.5.0 to 0.6.0. See the [changelog](https://zrepl.github.io/changelog.html) for details. + - `k3s` no longer supports docker as runtime due to upstream dropping support. - `cassandra_2_1` and `cassandra_2_2` have been removed. Please update to `cassandra_3_11` or `cassandra_3_0`. See the [changelog](https://github.com/apache/cassandra/blob/cassandra-3.11.14/NEWS.txt) for more information about the upgrade process. diff --git a/nixos/tests/zrepl.nix b/nixos/tests/zrepl.nix index 0ed73fea34b..b16c7eddc7a 100644 --- a/nixos/tests/zrepl.nix +++ b/nixos/tests/zrepl.nix @@ -58,8 +58,8 @@ import ./make-test-python.nix ( out = host.succeed("curl -f localhost:9811/metrics") assert ( - "zrepl_version_daemon" in out - ), "zrepl version metric was not found in Prometheus output" + "zrepl_start_time" in out + ), "zrepl start time metric was not found in Prometheus output" assert ( "zrepl_zfs_snapshot_duration_count{filesystem=\"test\"}" in out diff --git a/pkgs/tools/backup/zrepl/default.nix b/pkgs/tools/backup/zrepl/default.nix index 01eea9c7679..098e898c2b4 100644 --- a/pkgs/tools/backup/zrepl/default.nix +++ b/pkgs/tools/backup/zrepl/default.nix @@ -8,24 +8,16 @@ }: buildGoModule rec { pname = "zrepl"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "zrepl"; repo = "zrepl"; rev = "v${version}"; - sha256 = "4q/wwlF11HPDS2lTXUizJ3RFQ9sX5qNnWZUKAgnvDiE="; + sha256 = "sha256-XazwuaAzgTuKITF1mYihsNwkIKi5fvZrCvlCDKwxj4U="; }; - patches = [ - # fix build with go 1.18 - (fetchpatch { - url = "https://github.com/zrepl/zrepl/commit/19b2deb2cfe5e63b944fa83d12f474b11946ca3f.patch"; - sha256 = "sha256-/SQhU1LnN2n4nwgWF6mq7sW2u52y8mwr6yntakAvSuk="; - }) - ]; - - vendorSha256 = "sha256-xToq9pKAxxknh4kE8S3uUg5ySPMbJkLftkMhofNxotc="; + vendorSha256 = "sha256-75fGejR7eiECsm1j3yIU1lAWaW9GrorrVnv8JEzkAtU="; subPackages = [ "." ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d88cfee6842..7f1be4455ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37848,9 +37848,7 @@ with pkgs; zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { }; - zrepl = callPackage ../tools/backup/zrepl { - buildGoModule = buildGo118Module; # nixosTests.zrepl fails with 1.19 - }; + zrepl = callPackage ../tools/backup/zrepl { }; uhubctl = callPackage ../tools/misc/uhubctl {};