Commit f74c64ba authored by Andrew Marshall's avatar Andrew Marshall
Browse files

zfs_2_4: init at 2.4.0 

Update zfs_unstable as well.

Not changing default zfs yet. This is also to make it easier to backport
this PR while keeping the 25.11 default unchanged.
parent 1306659b

nixos/tests/zfs.nix

+5 −0
Original line number Diff line number Diff line
@@ -209,6 +209,11 @@ in 
    kernelPackages = pkgs.linuxPackages;

  };



  series_2_4 = makeZfsTest {

    zfsPackage = pkgs.zfs_2_4;

    kernelPackages = pkgs.linuxPackages;

  };



  unstable = makeZfsTest {

    zfsPackage = pkgs.zfs_unstable;

    kernelPackages = pkgs.linuxPackages;

pkgs/os-specific/linux/zfs/2_4.nix

0 → 100644
+34 −0
Original line number Diff line number Diff line 
{

  callPackage,

  lib,

  nixosTests,

  stdenv,

  fetchpatch,

  ...

}@args:



callPackage ./generic.nix args {

  # You have to ensure that in `pkgs/top-level/linux-kernels.nix`

  # this attribute is the correct one for this package.

  kernelModuleAttribute = "zfs_2_4";



  kernelMinSupportedMajorMinor = "4.18";

  kernelMaxSupportedMajorMinor = "6.18";



  # this package should point to the latest release.

  version = "2.4.0";



  tests = {

    inherit (nixosTests.zfs) series_2_4;

  }

  // lib.optionalAttrs stdenv.isx86_64 {

    inherit (nixosTests.zfs) installer;

  };



  maintainers = with lib.maintainers; [

    adamcstephens

    amarshall

  ];



  hash = "sha256-v78Tn1Im9h8Sjd4XACYesPOD+hlUR3Cmg8XjcJXOuwM=";

}

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

+2 −2
Original line number Diff line number Diff line
@@ -16,14 +16,14 @@ callPackage ./generic.nix args { 
  # IMPORTANT: Always use a tagged release candidate or commits from the

  # zfs-<version>-staging branch, because this is tested by the OpenZFS

  # maintainers.

  version = "2.4.0-rc5";

  version = "2.4.0";

  # rev = "";



  tests = {

    inherit (nixosTests.zfs) unstable;

  };



  hash = "sha256-HLxqzZjAFnaKqzy1CA3RecTdqpheR2pmFCTqMIcm+wk=";

  hash = "sha256-v78Tn1Im9h8Sjd4XACYesPOD+hlUR3Cmg8XjcJXOuwM=";



  extraLongDescription = ''

    This is "unstable" ZFS, and will usually be a pre-release version of ZFS.

pkgs/top-level/all-packages.nix

+4 −0
Original line number Diff line number Diff line
@@ -10123,11 +10123,15 @@ with pkgs; 
      zfs_2_3 = callPackage ../os-specific/linux/zfs/2_3.nix {

        configFile = "user";

      };

      zfs_2_4 = callPackage ../os-specific/linux/zfs/2_4.nix {

        configFile = "user";

      };

      zfs_unstable = callPackage ../os-specific/linux/zfs/unstable.nix {

        configFile = "user";

      };

    })

    zfs_2_3

    zfs_2_4

    zfs_unstable

    ;

  zfs = zfs_2_3;

pkgs/top-level/linux-kernels.nix

+4 −0
Original line number Diff line number Diff line
@@ -670,6 +670,10 @@ in 
          configFile = "kernel";

          inherit pkgs kernel;

        };

        zfs_2_4 = callPackage ../os-specific/linux/zfs/2_4.nix {

          configFile = "kernel";

          inherit pkgs kernel;

        };

        zfs_unstable = callPackage ../os-specific/linux/zfs/unstable.nix {

          configFile = "kernel";

          inherit pkgs kernel;