cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

e2fsprogs: 1.44.5 -> 1.45.0

Browse source 
Changes:
* https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/tree/doc/RelNotes/v1.44.6.txt?h=v1.44.6
* https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/tree/doc/RelNotes/v1.45.0.txt?h=v1.45.0

Also:
* remove 'hack' for installing pc files
* fixup location of `e2scrub_all_cron` to avoid reference cycle in
  outputs, promote to $bin/bin for now.
This commit is contained in:
Will Dietz 2019-03-10 03:53:25 -05:00
parent a2eb06a4d2
commit b531c19806
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/tools/filesystems/e2fsprogs/default.nix
View file

@ -1,11 +1,12 @@
{ stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo, perl }: { stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo, perl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "e2fsprogs-1.44.5"; pname = "e2fsprogs";
version = "1.45.0";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "1k6iwv2bz2a8mcd1gg9kb5jpry7pil5v2h2f9apxax7g4yp1y89f"; sha256 = "1sgcjarfksa8bkx81q5cd6rzqvhzgs28a0ljwyr4ggqpfx7d18vk";
}; };
outputs = [ "bin" "dev" "out" "man" "info" ]; outputs = [ "bin" "dev" "out" "man" "info" ];
@ -36,10 +37,9 @@ stdenv.mkDerivation rec {
checkInputs = [ perl ]; checkInputs = [ perl ];
doCheck = false; # fails doCheck = false; # fails
# hacky way to make it install *.pc
postInstall = '' postInstall = ''
make install-libs # avoid cycle between outputs
rm "$out"/lib/*.a mv $out/lib/${pname}/e2scrub_all_cron $bin/bin/
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;