Merge pull request #200094 from mdlayher/mdl-zrepl
This commit is contained in:
commit
4f8277ef10
|
@ -889,6 +889,14 @@
|
||||||
support for 1.22 and older has been dropped.
|
support for 1.22 and older has been dropped.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
The <literal>zrepl</literal> package has been updated from
|
||||||
|
0.5.0 to 0.6.0. See the
|
||||||
|
<link xlink:href="https://zrepl.github.io/changelog.html">changelog</link>
|
||||||
|
for details.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
<literal>k3s</literal> no longer supports docker as runtime
|
<literal>k3s</literal> no longer supports docker as runtime
|
||||||
|
|
|
@ -273,6 +273,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 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.
|
- `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.
|
- `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.
|
||||||
|
|
|
@ -58,8 +58,8 @@ import ./make-test-python.nix (
|
||||||
out = host.succeed("curl -f localhost:9811/metrics")
|
out = host.succeed("curl -f localhost:9811/metrics")
|
||||||
|
|
||||||
assert (
|
assert (
|
||||||
"zrepl_version_daemon" in out
|
"zrepl_start_time" in out
|
||||||
), "zrepl version metric was not found in Prometheus output"
|
), "zrepl start time metric was not found in Prometheus output"
|
||||||
|
|
||||||
assert (
|
assert (
|
||||||
"zrepl_zfs_snapshot_duration_count{filesystem=\"test\"}" in out
|
"zrepl_zfs_snapshot_duration_count{filesystem=\"test\"}" in out
|
||||||
|
|
|
@ -8,24 +8,16 @@
|
||||||
}:
|
}:
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "zrepl";
|
pname = "zrepl";
|
||||||
version = "0.5.0";
|
version = "0.6.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "zrepl";
|
owner = "zrepl";
|
||||||
repo = "zrepl";
|
repo = "zrepl";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "4q/wwlF11HPDS2lTXUizJ3RFQ9sX5qNnWZUKAgnvDiE=";
|
sha256 = "sha256-XazwuaAzgTuKITF1mYihsNwkIKi5fvZrCvlCDKwxj4U=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
vendorSha256 = "sha256-75fGejR7eiECsm1j3yIU1lAWaW9GrorrVnv8JEzkAtU=";
|
||||||
# fix build with go 1.18
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/zrepl/zrepl/commit/19b2deb2cfe5e63b944fa83d12f474b11946ca3f.patch";
|
|
||||||
sha256 = "sha256-/SQhU1LnN2n4nwgWF6mq7sW2u52y8mwr6yntakAvSuk=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
vendorSha256 = "sha256-xToq9pKAxxknh4kE8S3uUg5ySPMbJkLftkMhofNxotc=";
|
|
||||||
|
|
||||||
subPackages = [ "." ];
|
subPackages = [ "." ];
|
||||||
|
|
||||||
|
|
|
@ -37846,9 +37846,7 @@ with pkgs;
|
||||||
|
|
||||||
zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { };
|
zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { };
|
||||||
|
|
||||||
zrepl = callPackage ../tools/backup/zrepl {
|
zrepl = callPackage ../tools/backup/zrepl { };
|
||||||
buildGoModule = buildGo118Module; # nixosTests.zrepl fails with 1.19
|
|
||||||
};
|
|
||||||
|
|
||||||
uhubctl = callPackage ../tools/misc/uhubctl {};
|
uhubctl = callPackage ../tools/misc/uhubctl {};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue