diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-03 00:02:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-03 00:02:23 +0000 |
| commit | 75a11d85b89dd3d74ffacc7f6900e0c189c5cb95 (patch) | |
| tree | 393babe34b5e478fe5f6ff18f5f06fe8c72283e6 /pkgs/tools/filesystems | |
| parent | b1b0b6e3e76960d83239fc293cf5902adb01a91d (diff) | |
| parent | 529fd47f28707310775d5ddcc5763740e2feed01 (diff) | |
| download | nixlib-75a11d85b89dd3d74ffacc7f6900e0c189c5cb95.tar nixlib-75a11d85b89dd3d74ffacc7f6900e0c189c5cb95.tar.gz nixlib-75a11d85b89dd3d74ffacc7f6900e0c189c5cb95.tar.bz2 nixlib-75a11d85b89dd3d74ffacc7f6900e0c189c5cb95.tar.lz nixlib-75a11d85b89dd3d74ffacc7f6900e0c189c5cb95.tar.xz nixlib-75a11d85b89dd3d74ffacc7f6900e0c189c5cb95.tar.zst nixlib-75a11d85b89dd3d74ffacc7f6900e0c189c5cb95.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/erofs-utils/default.nix | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/pkgs/tools/filesystems/erofs-utils/default.nix b/pkgs/tools/filesystems/erofs-utils/default.nix index e25df7288094..dbf8de967d73 100644 --- a/pkgs/tools/filesystems/erofs-utils/default.nix +++ b/pkgs/tools/filesystems/erofs-utils/default.nix @@ -1,26 +1,18 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, fuse, util-linux, lz4, zlib +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fuse, util-linux, lz4, zlib , fuseSupport ? stdenv.isLinux }: stdenv.mkDerivation rec { pname = "erofs-utils"; - version = "1.7"; + version = "1.7.1"; 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"; - hash = "sha256-tutSm7Qj6y3XecnanCYyhVSItLkeI1U6Mc4j8Rycziw="; + hash = "sha256-GWCD1j5eIx+1eZ586GqUS7ylZNqrzj3pIlqKyp3K/xU="; }; - patches = [ - # Fixes #261394. Can be dropped with the next erofs version. - (fetchpatch { - url = "https://github.com/erofs/erofs-utils/commit/8cbc205185a18b9510f4c1fbd54957354f696321.patch"; - hash = "sha256-CQ5hxav5+HGnBVJW66St9FaVgkuqhkv89rjC/4cmXLs="; - }) - ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ util-linux lz4 zlib ] ++ lib.optionals fuseSupport [ fuse ]; @@ -32,6 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/about/"; description = "Userspace utilities for linux-erofs file system"; + changelog = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/ChangeLog?h=v${version}"; license = with licenses; [ gpl2Plus ]; maintainers = with maintainers; [ ehmry nikstur ]; platforms = platforms.unix; |