Unverified Commit 96107a2d authored by Ryan Lahfa's avatar Ryan Lahfa Committed by GitHub
Browse files

Merge pull request #261047 from adamcstephens/zfs/2.2.0 

zfs/zfsUnstable: 2.1.13/2.2.0-rc5 -> 2.2.0
parents fa0282ed b54ec5ac

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

+2 −0
Original line number Diff line number Diff line
@@ -343,6 +343,8 @@ 


- `jq` was updated to 1.7, its [first release in 5 years](https://github.com/jqlang/jq/releases/tag/jq-1.7).



- `zfs` was updated from 2.1.x to 2.2.0, [enabling newer kernel support and adding new features](https://github.com/openzfs/zfs/releases/tag/zfs-2.2.0).



- A new option was added to the virtualisation module that enables specifying explicitly named network interfaces in QEMU VMs. The existing `virtualisation.vlans` is still supported for cases where the name of the network interface is irrelevant.



- DocBook option documentation is no longer supported, all module documentation now uses markdown.

nixos/tests/zfs.nix

+0 −4
Original line number Diff line number Diff line
@@ -113,8 +113,6 @@ let 
      };



      testScript = ''

        # TODO: Remove this when upgrading stable to zfs 2.2.0

        unstable = ${if enableUnstable then "True" else "False"};

        machine.wait_for_unit("multi-user.target")

        machine.succeed(

            "zpool status",
@@ -136,8 +134,6 @@ let 
            machine.crash()

            machine.wait_for_unit("multi-user.target")

            machine.succeed("zfs set sharesmb=on rpool/shared_smb")

            if not unstable:

                machine.succeed("zfs share rpool/shared_smb")

            machine.succeed(

                "smbclient -gNL localhost | grep rpool_shared_smb",

                "umount /tmp/mnt",

pkgs/development/python-modules/py-libzfs/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -8,13 +8,13 @@ 


buildPythonPackage rec {

  pname = "py-libzfs";

  version = "22.02.4";

  version = "22.12.4.2";



  src = fetchFromGitHub {

    owner = "truenas";

    repo = pname;

    rev = "TS-${version}";

    hash = "sha256-BJG+cw07Qu4aL99pVKNd7JAgr+w/6Uv2eI46EB615/I=";

    hash = "sha256-vBLbjP1gQEQNsTLc2W6uRzCFHQXZp+jGiwE0Pe8VTuw=";

  };



  nativeBuildInputs = [ cython ];

pkgs/os-specific/linux/zfs/generic.nix

+8 −19
Original line number Diff line number Diff line
@@ -76,8 +76,6 @@ stdenv'.mkDerivation { 
    substituteInPlace ./config/user-systemd.m4    --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d"

    substituteInPlace ./config/zfs-build.m4       --replace "\$sysconfdir/init.d"     "$out/etc/init.d" \

                                                  --replace "/etc/default"            "$out/etc/default"

    # TODO: drop when upgrading to 2.2.0

    ${if isUnstable then ''

    substituteInPlace ./contrib/initramfs/Makefile.am \

      --replace "/usr/share/initramfs-tools" "$out/usr/share/initramfs-tools"

    substituteInPlace ./udev/vdev_id \
@@ -86,15 +84,6 @@ stdenv'.mkDerivation { 
    substituteInPlace ./config/zfs-build.m4 \

      --replace "bashcompletiondir=/etc/bash_completion.d" \

        "bashcompletiondir=$out/share/bash-completion/completions"

    '' else ''

      substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)/zfs" "$out/etc/zfs"



      find ./contrib/initramfs -name Makefile.am -exec sed -i -e 's|/usr/share/initramfs-tools|'$out'/share/initramfs-tools|g' {} \;



      substituteInPlace ./cmd/vdev_id/vdev_id \

        --replace "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \

        "PATH=${makeBinPath [ coreutils gawk gnused gnugrep systemd ]}"

    ''}

  '';



  nativeBuildInputs = [ autoreconfHook269 nukeReferences ]

pkgs/os-specific/linux/zfs/stable.nix

+3 −10
Original line number Diff line number Diff line
@@ -16,20 +16,13 @@ callPackage ./generic.nix args { 
    if stdenv'.isx86_64 || removeLinuxDRM

    then kernel.kernelOlder "6.6"

    else kernel.kernelOlder "6.2";



  latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM

    then linuxKernel.packages.linux_6_5

    else linuxKernel.packages.linux_6_1;

  extraPatches = [

    # applied in version 2.2.x

    (fetchpatch {

      name = "musl.patch";

      url = "https://github.com/openzfs/zfs/commit/1f19826c9ac85835cbde61a7439d9d1fefe43a4a.patch";

      sha256 = "XEaK227ubfOwlB2s851UvZ6xp/QOtYUWYsKTkEHzmo0=";

    })

  ];



  # this package should point to the latest release.

  version = "2.1.13";

  version = "2.2.0";



  sha256 = "tqUCn/Hf/eEmyWRQthWQdmTJK2sDspnHiiEfn9rz2Kc=";

  sha256 = "sha256-s1sdXSrLu6uSOmjprbUa4cFsE2Vj7JX5i75e4vRnlvg=";

}