zfs: 2.2.7 -> 2.3.0 (change default version) (#375178)

K900 ac791cd5 33986ca1

Changed files
+2 -29
pkgs
os-specific
linux
top-level
+1 -28
pkgs/os-specific/linux/zfs/generic.nix
···
optionals
optional
makeBinPath
-
versionAtLeast
;
smartmon = smartmontools.override { inherit enableMail; };
···
"user"
"all"
];
-
isAtLeast22Series = versionAtLeast version "2.2.0";
# XXX: You always want to build kernel modules with the same stdenv as the
# kernel was built with. However, since zfs can also be built for userspace we
···
--replace-fail "/etc/default" "$out/etc/default"
substituteInPlace ./contrib/initramfs/Makefile.am \
--replace-fail "/usr/share/initramfs-tools" "$out/usr/share/initramfs-tools"
-
''
-
+ optionalString isAtLeast22Series ''
+
substituteInPlace ./udev/vdev_id \
--replace-fail "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \
"PATH=${
···
"bashcompletiondir=$out/share/bash-completion/completions"
substituteInPlace ./cmd/arc_summary --replace-fail "/sbin/modinfo" "modinfo"
-
''
-
+ optionalString (!isAtLeast22Series) ''
-
substituteInPlace ./etc/zfs/Makefile.am --replace-fail "\$(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/arc_summary/arc_summary3 --replace-fail "/sbin/modinfo" "modinfo"
-
substituteInPlace ./cmd/vdev_id/vdev_id \
-
--replace-fail "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \
-
"PATH=${
-
makeBinPath [
-
coreutils
-
gawk
-
gnused
-
gnugrep
-
systemd
-
]
-
}"
'';
nativeBuildInputs =
···
# Remove tests because they add a runtime dependency on gcc
rm -rf $out/share/zfs/zfs-tests
-
-
${optionalString (lib.versionOlder version "2.2") ''
-
# Add Bash completions.
-
install -v -m444 -D -t $out/share/bash-completion/completions contrib/bash_completion.d/zfs
-
(cd $out/share/bash-completion/completions; ln -s zfs zpool)
-
''}
'';
postFixup =
+1 -1
pkgs/top-level/all-packages.nix
···
zfs_2_2
zfs_2_3
zfs_unstable;
-
zfs = zfs_2_2;
+
zfs = zfs_2_3;
### DATA