summary refs log tree commit diff
diff options
context:
space:
mode:
authorSpencer Janssen <spencerjanssen@gmail.com>2022-01-10 11:06:11 -0600
committerKerstin <kerstin@erictapen.name>2022-01-17 15:35:45 +0100
commited5883c1b62cab398c8b5fff78f6b11414f278a9 (patch)
tree59a87cb1db51515059028afdad585ec3b3508a4a
parent467dd2df056b6598a6f44a86e939997ea4a18d69 (diff)
downloadnixpkgs-ed5883c1b62cab398c8b5fff78f6b11414f278a9.tar
nixpkgs-ed5883c1b62cab398c8b5fff78f6b11414f278a9.tar.gz
nixpkgs-ed5883c1b62cab398c8b5fff78f6b11414f278a9.tar.bz2
nixpkgs-ed5883c1b62cab398c8b5fff78f6b11414f278a9.tar.lz
nixpkgs-ed5883c1b62cab398c8b5fff78f6b11414f278a9.tar.xz
nixpkgs-ed5883c1b62cab398c8b5fff78f6b11414f278a9.tar.zst
nixpkgs-ed5883c1b62cab398c8b5fff78f6b11414f278a9.zip
zrepl: 0.4.0 -> 0.5.0
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2205.section.xml25
-rw-r--r--nixos/doc/manual/release-notes/rl-2205.section.md4
-rw-r--r--pkgs/tools/backup/zrepl/default.nix6
3 files changed, 32 insertions, 3 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index f8fbe6ccd2f..71b5301d13e 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -529,6 +529,31 @@
           <literal>programs.starship.settings</literal>.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          The <literal>zrepl</literal> package has been updated from
+          0.4.0 to 0.5:
+        </para>
+        <itemizedlist spacing="compact">
+          <listitem>
+            <para>
+              The RPC protocol version was bumped; all zrepl daemons in
+              a setup must be updated and restarted before replication
+              can resume.
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              A bug involving encrypt-on-receive has been fixed. Read
+              the
+              <link xlink:href="https://zrepl.github.io/configuration/sendrecvoptions.html#job-recv-options-placeholder">zrepl
+              documentation</link> and check the output of
+              <literal>zfs get -r encryption,zrepl:placeholder PATH_TO_ROOTFS</literal>
+              on the receiver.
+            </para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
     </itemizedlist>
   </section>
 </section>
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index ef0069ab7f3..1e89ac9e950 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -183,3 +183,7 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - A new module was added for the [Starship](https://starship.rs/) shell prompt,
   providing the options `programs.starship.enable` and `programs.starship.settings`.
+
+- The `zrepl` package has been updated from 0.4.0 to 0.5:
+    * The RPC protocol version was bumped; all zrepl daemons in a setup must be updated and restarted before replication can resume.
+    * A bug involving encrypt-on-receive has been fixed.  Read the [zrepl documentation](https://zrepl.github.io/configuration/sendrecvoptions.html#job-recv-options-placeholder) and check the output of `zfs get -r encryption,zrepl:placeholder PATH_TO_ROOTFS` on the receiver.
diff --git a/pkgs/tools/backup/zrepl/default.nix b/pkgs/tools/backup/zrepl/default.nix
index 59dbfc0be72..999dd6ccb6e 100644
--- a/pkgs/tools/backup/zrepl/default.nix
+++ b/pkgs/tools/backup/zrepl/default.nix
@@ -6,16 +6,16 @@
 }:
 buildGoModule rec {
   pname = "zrepl";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "zrepl";
     repo = "zrepl";
     rev = "v${version}";
-    sha256 = "5Bp8XGCjibDJgeAjW98rcABuddI+CV4Fh3hFJaKKwbo=";
+    sha256 = "4q/wwlF11HPDS2lTXUizJ3RFQ9sX5qNnWZUKAgnvDiE=";
   };
 
-  vendorSha256 = "MwmYiK2z7ZK5kKBZV7K6kCZRSd7v5Sgjoih1eeOh6go=";
+  vendorSha256 = "xToq9pKAxxknh4kE8S3uUg5ySPMbJkLftkMhofNxotc=";
 
   subPackages = [ "." ];