From 62e4a35fa7737dd5072fd837875cff916d2a9d39 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 15 Oct 2019 12:35:14 -0500 Subject: [PATCH] mtdutils: 1.5.2 -> 2.1.1 (#62805) * mtdutils: 1.5.2 -> 2.1.0 http://lists.infradead.org/pipermail/linux-mtd/2019-March/088267.html And the previous releases, hardcoded version in URL I think caused this to be missed by auto-updaters for a while now. 1.5.2, FWIW in 2015: http://lists.infradead.org/pipermail/linux-mtd/2015-August/060723.html * mtd-utils: 2.1.0 -> 2.1.1 + cleanup + enable tests and parallel building + add zstd support --- pkgs/tools/filesystems/mtdutils/default.nix | 24 +++++++++++---------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix index 049a61658743..0461c732e1a6 100644 --- a/pkgs/tools/filesystems/mtdutils/default.nix +++ b/pkgs/tools/filesystems/mtdutils/default.nix @@ -1,25 +1,27 @@ -{ stdenv, fetchurl, libuuid, lzo, zlib, acl }: +{ stdenv, fetchurl, autoreconfHook, pkgconfig, cmocka, acl, libuuid, lzo, zlib, zstd }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "mtd-utils"; - version = "1.5.2"; + version = "2.1.1"; src = fetchurl { - url = ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-1.5.2.tar.bz2; - sha256 = "007lhsd8yb34l899r4m37whhzdw815cz4fnjbpnblfha524p7dax"; + url = "ftp://ftp.infradead.org/pub/${pname}/${pname}-${version}.tar.bz2"; + sha256 = "1lijl89l7hljx8xx70vrz9srd3h41v5gh4b0lvqnlv831yvyh5cd"; }; - patchPhase = '' - sed -i -e s,/usr/local,, -e s,/usr,$out, common.mk - ''; + nativeBuildInputs = [ autoreconfHook cmocka pkgconfig ]; + buildInputs = [ acl libuuid lzo zlib zstd ]; - buildInputs = [ libuuid lzo zlib acl ]; + configureFlags = [ "--enable-unit-tests" "--enable-tests" ]; + enableParallelBuilding = true; + + doCheck = true; meta = { description = "Tools for MTD filesystems"; license = stdenv.lib.licenses.gpl2Plus; - homepage = http://www.linux-mtd.infradead.org/; - maintainers = with stdenv.lib.maintainers; [viric]; + homepage = "http://www.linux-mtd.infradead.org/"; + maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; }; }