From db8b545233f2de82140844391ec885319e2fca3d Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 30 Mar 2021 19:43:59 +0200 Subject: [PATCH] xfsprogs: 5.10.0 -> 5.11.0 also try to correct meta.license --- nixos/doc/manual/release-notes/rl-2105.xml | 2 +- pkgs/tools/filesystems/xfsprogs/default.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index b7947293c01..2d4fd47b06c 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -235,7 +235,7 @@ - xfsprogs was update from 4.19 to 5.10. It now enables reflink support by default on filesystem creation. + xfsprogs was update from 4.19 to 5.11. It now enables reflink support by default on filesystem creation. Support for reflinks was added with an experimental status to kernel 4.9 and deemed stable in kernel 4.16. If you want to be able to mount XFS filesystems created with this release of xfsprogs on kernel releases older than those, you need to format them with mkfs.xfs -m reflink=0. diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index 009c5e05d5d..85efb13b82e 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "xfsprogs"; - version = "5.10.0"; + version = "5.11.0"; src = fetchurl { url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz"; - sha256 = "1schqzjx836jd54l10pqds7hyli2m77df3snk95xbr23dpj1fh70"; + sha256 = "0lxks616nmdk8zkdbwpq5sf9zz19smgy5rpmp3hpk2mvrl7kk70f"; }; outputs = [ "bin" "dev" "out" "doc" ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://xfs.org/"; description = "SGI XFS utilities"; - license = licenses.lgpl21; + license = with licenses; [ gpl2Only lgpl21 gpl3Plus ]; # see https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/tree/debian/copyright platforms = platforms.linux; maintainers = with maintainers; [ dezgeg ajs124 ]; };