From ca66526f730f1e42e67b3f097535f4bbd5873dcc Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 21 Jun 2023 15:44:12 +0200 Subject: [PATCH] reiserfsprogs: 3.6.24 -> 3.6.27 --- pkgs/tools/filesystems/reiserfsprogs/default.nix | 9 ++++----- .../reiserfsprogs/reiserfsprogs-ar-fix.patch | 10 ---------- 2 files changed, 4 insertions(+), 15 deletions(-) delete mode 100644 pkgs/tools/filesystems/reiserfsprogs/reiserfsprogs-ar-fix.patch diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/tools/filesystems/reiserfsprogs/default.nix index 8c3986d817d7..a3dd60635350 100644 --- a/pkgs/tools/filesystems/reiserfsprogs/default.nix +++ b/pkgs/tools/filesystems/reiserfsprogs/default.nix @@ -1,17 +1,16 @@ -{ lib, stdenv, fetchurl, libuuid, autoreconfHook }: +{ lib, stdenv, fetchurl, libuuid, autoreconfHook, e2fsprogs, acl }: stdenv.mkDerivation rec { pname = "reiserfsprogs"; - version = "3.6.24"; + version = "3.6.27"; src = fetchurl { url = "https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v${version}/${pname}-${version}.tar.xz"; - sha256 = "0q07df9wxxih8714a3mdp61h5n347l7j2a0l351acs3xapzgwi3y"; + hash = "sha256-DpW2f6d0ajwtWRRem5wv60pr5ShT6DtJexgurlCOYuM="; }; - patches = [ ./reiserfsprogs-ar-fix.patch ]; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libuuid ]; + buildInputs = [ libuuid e2fsprogs acl ]; env.NIX_CFLAGS_COMPILE = toString [ "-std=gnu90" "-D_GNU_SOURCE" ]; diff --git a/pkgs/tools/filesystems/reiserfsprogs/reiserfsprogs-ar-fix.patch b/pkgs/tools/filesystems/reiserfsprogs/reiserfsprogs-ar-fix.patch deleted file mode 100644 index 356782a3d984..000000000000 --- a/pkgs/tools/filesystems/reiserfsprogs/reiserfsprogs-ar-fix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- reiserfsprogs-3.6.24/configure.ac.orig 2018-11-29 17:16:52.313624894 +0300 -+++ reiserfsprogs-3.6.24/configure.ac 2018-11-29 17:16:54.480669132 +0300 -@@ -21,6 +21,7 @@ - AC_PROG_LN_S - AC_PROG_MAKE_SET - AC_PROG_RANLIB -+AM_PROG_AR - - dnl Checks for libraries. -