From c5fbf84eb0f8089af4659a305e343dfce104003c Mon Sep 17 00:00:00 2001 From: midchildan Date: Tue, 23 Mar 2021 03:35:48 +0900 Subject: [PATCH] e2fsprogs: 1.45.6 -> 1.46.2 --- pkgs/tools/filesystems/e2fsprogs/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 154b0006663..327ddbf8d6d 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "e2fsprogs"; - version = "1.45.6"; + version = "1.46.2"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-X2SsUKK2C45nxbOCuxN97Dk0QBcQPK/8OmFVRCTy1pM="; + sha256 = "sha256-958mtPZb3AWfyhLh7GowQMPOGlA/tw65Fb7nGQOBXNU="; }; outputs = [ "bin" "dev" "out" "man" "info" ]; @@ -68,10 +68,13 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://e2fsprogs.sourceforge.net/"; description = "Tools for creating and checking ext2/ext3/ext4 filesystems"; - license = licenses.gpl2; + license = with licenses; [ + gpl2Plus + lgpl2Plus # lib/ext2fs, lib/e2p + bsd3 # lib/uuid + mit # lib/et, lib/ss + ]; platforms = platforms.unix; maintainers = [ maintainers.eelco ]; - # imager.c:70:2: error: unknown type name 'loff_t'; did you mean 'off_t'? - broken = stdenv.isDarwin; }; }