summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gerbet <thomas@gerbet.me>2023-09-23 13:23:54 +0200
committerThomas Gerbet <thomas@gerbet.me>2023-10-01 11:11:14 +0200
commit3d602fcb489cca2b953b11e199943f9422254664 (patch)
tree23fc306c60978883579c5b995c916843d75a0e70
parenterofs-utils: enable running on darwin (diff)
downloadnixpkgs-3d602fcb489cca2b953b11e199943f9422254664.tar.gz
erofs-utils: 1.6 -> 1.7
Fixes CVE-2023-33552 and CVE-2023-33551. Changelog: https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/ChangeLog?h=v1.7 (cherry picked from commit 943da8b1a78bc1701666d9c6b34e555af4ac04b1)
-rw-r--r--pkgs/tools/filesystems/erofs-utils/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/filesystems/erofs-utils/default.nix b/pkgs/tools/filesystems/erofs-utils/default.nix
index a10addbfa51e..163439c903ed 100644
--- a/pkgs/tools/filesystems/erofs-utils/default.nix
+++ b/pkgs/tools/filesystems/erofs-utils/default.nix
@@ -1,20 +1,20 @@
-{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fuse, util-linux, lz4
+{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fuse, util-linux, lz4, zlib
, fuseSupport ? stdenv.isLinux
}:
stdenv.mkDerivation rec {
pname = "erofs-utils";
- version = "1.6";
+ version = "1.7";
outputs = [ "out" "man" ];
src = fetchurl {
url =
"https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${version}.tar.gz";
- sha256 = "sha256-2/Gtrv8buFMrKacsip4ZGTjJOJlGdw3HY9PFnm8yBXE=";
+ hash = "sha256-tutSm7Qj6y3XecnanCYyhVSItLkeI1U6Mc4j8Rycziw=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
- buildInputs = [ util-linux lz4 ]
+ buildInputs = [ util-linux lz4 zlib ]
++ lib.optionals fuseSupport [ fuse ];
configureFlags = lib.optionals fuseSupport [ "--enable-fuse" ];