commit 4f8277ef10848491f34f1b0ee3f648a1cee0891d · pyrox.dev/nixpkgs

+8

nixos/doc/manual/from_md/release-notes/rl-2211.section.xml

···

       891
       891
        
             </listitem>

     

       892
       892
        
             <listitem>

     

       893
       893
        
               <para>

     

       894
       894
       +
                 The <literal>zrepl</literal> package has been updated from

     

       895
       895
       +
                 0.5.0 to 0.6.0. See the

     

       896
       896
       +
                 <link xlink:href="https://zrepl.github.io/changelog.html">changelog</link>

     

       897
       897
       +
                 for details.

     

       898
       898
       +
               </para>

     

       899
       899
       +
             </listitem>

     

       900
       900
       +
             <listitem>

     

       901
       901
       +
               <para>

     

       894
       902
        
                 <literal>k3s</literal> no longer supports docker as runtime

     

       895
       903
        
                 due to upstream dropping support.

     

       896
       904
        
               </para>

+2

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

···

       273
       273
        
       

     

       274
       274
        
       - The default `kops` version is now 1.25.1 and support for 1.22 and older has been dropped.

     

       275
       275
        
       

     

       276
       276
       +
       - 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.

     

       277
       277
       +
       

     

       276
       278
        
       - `k3s` no longer supports docker as runtime due to upstream dropping support.

     

       277
       279
        
       

     

       278
       280
        
       - `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.

+2 -2

nixos/tests/zrepl.nix

···

       58
       58
        
                 out = host.succeed("curl -f localhost:9811/metrics")

     

       59
       59
        
       

     

       60
       60
        
                 assert (

     

       61
       61
       -
                     "zrepl_version_daemon" in out

     

       62
       62
       -
                 ), "zrepl version metric was not found in Prometheus output"

     

       61
       61
       +
                     "zrepl_start_time" in out

     

       62
       62
       +
                 ), "zrepl start time metric was not found in Prometheus output"

     

       63
       63
        
       

     

       64
       64
        
                 assert (

     

       65
       65
        
                     "zrepl_zfs_snapshot_duration_count{filesystem=\"test\"}" in out

+3 -11

pkgs/tools/backup/zrepl/default.nix

···

       8
       8
        
       }:

     

       9
       9
        
       buildGoModule rec {

     

       10
       10
        
         pname = "zrepl";

     

       11
       11
       -
         version = "0.5.0";

     

       11
       11
       +
         version = "0.6.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "zrepl";

     

       15
       15
        
           repo = "zrepl";

     

       16
       16
        
           rev = "v${version}";

     

       17
       17
       -
           sha256 = "4q/wwlF11HPDS2lTXUizJ3RFQ9sX5qNnWZUKAgnvDiE=";

     

       17
       17
       +
           sha256 = "sha256-XazwuaAzgTuKITF1mYihsNwkIKi5fvZrCvlCDKwxj4U=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         patches = [

     

       21
       21
       -
           # fix build with go 1.18

     

       22
       22
       -
           (fetchpatch {

     

       23
       23
       -
             url = "https://github.com/zrepl/zrepl/commit/19b2deb2cfe5e63b944fa83d12f474b11946ca3f.patch";

     

       24
       24
       -
             sha256 = "sha256-/SQhU1LnN2n4nwgWF6mq7sW2u52y8mwr6yntakAvSuk=";

     

       25
       25
       -
           })

     

       26
       26
       -
         ];

     

       27
       27
       -
       

     

       28
       28
       -
         vendorSha256 = "sha256-xToq9pKAxxknh4kE8S3uUg5ySPMbJkLftkMhofNxotc=";

     

       20
       20
       +
         vendorSha256 = "sha256-75fGejR7eiECsm1j3yIU1lAWaW9GrorrVnv8JEzkAtU=";

     

       29
       21
        
       

     

       30
       22
        
         subPackages = [ "." ];

     

       31
       23

+1 -3

pkgs/top-level/all-packages.nix

···

       37846
       37846
        
       

     

       37847
       37847
        
         zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { };

     

       37848
       37848
        
       

     

       37849
       37849
       -
         zrepl = callPackage ../tools/backup/zrepl {

     

       37850
       37850
       -
           buildGoModule = buildGo118Module; # nixosTests.zrepl fails with 1.19

     

       37851
       37851
       -
         };

     

       37849
       37849
       +
         zrepl = callPackage ../tools/backup/zrepl { };

     

       37852
       37850
        
       

     

       37853
       37851
        
         uhubctl = callPackage ../tools/misc/uhubctl {};

     

       37854
       37852