diff options
| author | Will Dietz <github@wdtz.org> | 2019-03-13 11:30:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-13 11:30:13 -0500 |
| commit | 1cb7a3b519334b5d11946409edcb82da99d9b1d7 (patch) | |
| tree | 9efcb9f3f0e2040920ea81bb1f0a1e3fd637ffe3 /pkgs/tools/filesystems | |
| parent | 573a6930a0380b1061ad927705c83e8ccf92a096 (diff) | |
| parent | 8add9b7c2126c7be6736daf86bcc436821851112 (diff) | |
| download | nixlib-1cb7a3b519334b5d11946409edcb82da99d9b1d7.tar nixlib-1cb7a3b519334b5d11946409edcb82da99d9b1d7.tar.gz nixlib-1cb7a3b519334b5d11946409edcb82da99d9b1d7.tar.bz2 nixlib-1cb7a3b519334b5d11946409edcb82da99d9b1d7.tar.lz nixlib-1cb7a3b519334b5d11946409edcb82da99d9b1d7.tar.xz nixlib-1cb7a3b519334b5d11946409edcb82da99d9b1d7.tar.zst nixlib-1cb7a3b519334b5d11946409edcb82da99d9b1d7.zip | |
Merge pull request #57229 from dtzWill/update/e2fsprogs-1.45.0
e2fsprogs: 1.44.5 -> 1.45.0
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/e2fsprogs/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 806469493900..15346dcc30e1 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,11 +1,12 @@ { stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo, perl }: 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" ]; @@ -34,12 +35,11 @@ stdenv.mkDerivation rec { ]; checkInputs = [ perl ]; - doCheck = false; # fails + 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; |