diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-04-22 21:15:06 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-04-22 21:18:23 +0000 |
commit | b935ae5f3cfb2bb4f9a3746d284f156a6dece505 (patch) | |
tree | 5efe4e2e7a7723a737d0130a333b057c5e76df40 /nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix | |
parent | dc9566e91c9453378c24e98b5737234364670df5 (diff) | |
parent | d26027792812fbfad4d0f451b5f47fdabf7fdeb9 (diff) | |
download | nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.gz nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.bz2 nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.lz nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.xz nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.zst nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.zip |
Merge commit 'd26027792812fbfad4d0f451b5f47fdabf7fdeb9'
Diffstat (limited to 'nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix')
-rw-r--r-- | nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix b/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix index 806469493900..e601a12e6e6f 100644 --- a/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,11 +1,12 @@ -{ stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo, perl }: +{ stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo }: stdenv.mkDerivation rec { - name = "e2fsprogs-1.44.5"; + pname = "e2fsprogs"; + version = "1.45.0"; src = fetchurl { - url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "1k6iwv2bz2a8mcd1gg9kb5jpry7pil5v2h2f9apxax7g4yp1y89f"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1sgcjarfksa8bkx81q5cd6rzqvhzgs28a0ljwyr4ggqpfx7d18vk"; }; outputs = [ "bin" "dev" "out" "man" "info" ]; @@ -33,13 +34,12 @@ stdenv.mkDerivation rec { "--enable-libuuid --disable-e2initrd-helper" ]; - checkInputs = [ perl ]; - doCheck = false; # fails + checkInputs = [ buildPackages.perl ]; + doCheck = true; - # hacky way to make it install *.pc postInstall = '' - make install-libs - rm "$out"/lib/*.a + # avoid cycle between outputs + mv $out/lib/${pname}/e2scrub_all_cron $bin/bin/ ''; enableParallelBuilding = true; |