Unverified Commit 71d33c61 authored by Ryan Lahfa's avatar Ryan Lahfa Committed by GitHub
Browse files

Merge pull request #246163 from Mic92/zfs-unstable

parents 4a26d79a 32883aec

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

+23 −35
Original line number Diff line number Diff line
@@ -54,13 +54,7 @@ stdenv'.mkDerivation { 
    inherit rev sha256;

  };



  patches = [

    (fetchpatch {

      name = "musl.patch";

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

      sha256 = "XEaK227ubfOwlB2s851UvZ6xp/QOtYUWYsKTkEHzmo0=";

    })

  ] ++ extraPatches;

  patches = extraPatches;



  postPatch = optionalString buildKernel ''

    patchShebangs scripts
@@ -82,31 +76,22 @@ 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"

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



    substituteInPlace ./contrib/initramfs/hooks/Makefile.am \

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

    # 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 ./contrib/initramfs/scripts/Makefile.am \

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

    substituteInPlace ./contrib/initramfs/scripts/local-top/Makefile.am \

      --replace "/usr/share/initramfs-tools/scripts/local-top" "$out/usr/share/initramfs-tools/scripts/local-top"

    substituteInPlace ./contrib/initramfs/scripts/Makefile.am \

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

    substituteInPlace ./contrib/initramfs/scripts/local-top/Makefile.am \

      --replace "/usr/share/initramfs-tools/scripts/local-top" "$out/usr/share/initramfs-tools/scripts/local-top"

    substituteInPlace ./etc/systemd/system/Makefile.am \

      --replace '$(DESTDIR)$(systemdunitdir)' "$out"'$(DESTDIR)$(systemdunitdir)'



    substituteInPlace ./contrib/initramfs/conf.d/Makefile.am \

      --replace "/usr/share/initramfs-tools/conf.d" "$out/usr/share/initramfs-tools/conf.d"

    substituteInPlace ./contrib/initramfs/conf-hooks.d/Makefile.am \

      --replace "/usr/share/initramfs-tools/conf-hooks.d" "$out/usr/share/initramfs-tools/conf-hooks.d"

      substituteInPlace ./udev/vdev_id \

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

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

    '' 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 ]
@@ -168,9 +153,11 @@ stdenv'.mkDerivation { 
    # Remove provided services as they are buggy

    rm $out/etc/systemd/system/zfs-import-*.service



    sed -i '/zfs-import-scan.service/d' $out/etc/systemd/system/*



    for i in $out/etc/systemd/system/*; do

       if [ -L $i ]; then

         continue

       fi

       sed -i '/zfs-import-scan.service/d' $i

       substituteInPlace $i --replace "zfs-import-cache.service" "zfs-import.target"

    done
@@ -232,3 +219,4 @@ stdenv'.mkDerivation { 
    broken = buildKernel && (kernelCompatible != null) && !kernelCompatible;

  };

}

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

+8 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
, stdenv

, linuxKernel

, removeLinuxDRM ? false

, fetchpatch

, ...

} @ args:
@@ -16,6 +17,13 @@ callPackage ./generic.nix args { 
    then kernel.kernelOlder "6.4"

    else kernel.kernelOlder "6.2";

  latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_1;

  extraPatches = [

    (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.12";

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

+4 −5
Original line number Diff line number Diff line
@@ -23,10 +23,9 @@ 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.1.13-unstable-2023-08-02";

  rev = "245850b66c1e93ec19744ca55aae143d007d2c32";

  version = "2.2.0-rc4";



  sha256 = "TtgKV02W8OfU6hssULF/IoFXAPHBTvTKXn5hJ/RGAc0=";

  sha256 = "sha256-zTG6iujlWB2H8j6i+t59zdyztoDFk373AjgHzC8x5mQ=";



  isUnstable = true;

}