From 3f4f90b58ba4d09352111c98a3e99019673ff64f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 23 May 2015 16:00:02 -0700 Subject: e2fsprogs: 1.14.12 -> 1.14.13 --- pkgs/tools/filesystems/e2fsprogs/default.nix | 66 +++++++++++++++++++++------- 1 file changed, 49 insertions(+), 17 deletions(-) (limited to 'pkgs/tools/filesystems/e2fsprogs') diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 7617e82f1a8..c4b44b824f0 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,34 +1,66 @@ -{ stdenv, fetchurl, pkgconfig, libuuid }: +{ stdenv, fetchurl, pkgconfig +# Optional Dependencies +, libuuid +}: + +with stdenv; +let + optLibuuid = shouldUsePkg libuuid; +in +with stdenv.lib; stdenv.mkDerivation rec { - name = "e2fsprogs-1.42.12"; + name = "e2fsprogs-1.42.13"; src = fetchurl { url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "0v0qcfyls0dlrjy8gx9m3s2wbkp5z3lbsr5hb7x8kp8f3bclcy71"; + sha256 = "1m72lk90b5i3h9qnmss6aygrzyn8x2avy3hyaq2fb0jglkrkz6ar"; }; - buildInputs = [ pkgconfig libuuid ]; - - crossAttrs = { - preConfigure = '' - export CC=$crossConfig-gcc - ''; - }; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ optLibuuid ]; - # libuuid, libblkid, uuidd and fsck are in util-linux-ng (the "libuuid" dependency). - configureFlags = "--enable-elf-shlibs --disable-libuuid --disable-libblkid --disable-uuidd --disable-fsck --enable-symlink-install"; + configureFlags = [ + (mkEnable true "symlink-install" null) + (mkEnable true "relative-symlinks" null) + (mkEnable true "symlink-relative-symlinks" null) + (mkEnable false "compression" null) + (mkEnable true "htree" null) + (mkEnable true "elf-shlibs" null) + (mkEnable false "profile" null) + (mkEnable false "gcov" null) + (mkEnable false "jbd-debug" null) + (mkEnable false "blkid-debug" null) + (mkEnable false "testio-debug" null) + (mkEnable (optLibuuid == null) "libuuid" null) + (mkEnable (optLibuuid == null) "libblkid" null) + (mkEnable true "quota" null) + (mkEnable false "backtrace" null) + (mkEnable false "debugfs" null) + (mkEnable true "imager" null) + (mkEnable true "resizer" null) + (mkEnable true "defrag" null) + (mkEnable true "fsck" null) + (mkEnable false "e2initrd-helper" null) + (mkEnable true "tls" null) + (mkEnable false "uuidd" null) # Build is broken in 1.42.13 + ]; enableParallelBuilding = true; - preInstall = "installFlagsArray=('LN=ln -s')"; + installFlags = [ + "LN=ln -s" + ]; - postInstall = "make install-libs"; + postInstall = '' + make install-libs + ''; - meta = { + meta = with stdenv.lib; { homepage = http://e2fsprogs.sourceforge.net/; description = "Tools for creating and checking ext2/ext3/ext4 filesystems"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ eelco wkennington ]; }; } -- cgit 1.4.1 From 80ebb879cd32e5a0ca8f5321a494bbea9612be1a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 20:57:15 +0200 Subject: Revert "e2fsprogs: 1.14.12 -> 1.14.13" This reverts commit 3f4f90b58ba4d09352111c98a3e99019673ff64f. --- pkgs/tools/filesystems/e2fsprogs/default.nix | 66 +++++++--------------------- 1 file changed, 17 insertions(+), 49 deletions(-) (limited to 'pkgs/tools/filesystems/e2fsprogs') diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index c4b44b824f0..7617e82f1a8 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,66 +1,34 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchurl, pkgconfig, libuuid }: -# Optional Dependencies -, libuuid -}: - -with stdenv; -let - optLibuuid = shouldUsePkg libuuid; -in -with stdenv.lib; stdenv.mkDerivation rec { - name = "e2fsprogs-1.42.13"; + name = "e2fsprogs-1.42.12"; src = fetchurl { url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "1m72lk90b5i3h9qnmss6aygrzyn8x2avy3hyaq2fb0jglkrkz6ar"; + sha256 = "0v0qcfyls0dlrjy8gx9m3s2wbkp5z3lbsr5hb7x8kp8f3bclcy71"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ optLibuuid ]; + buildInputs = [ pkgconfig libuuid ]; + + crossAttrs = { + preConfigure = '' + export CC=$crossConfig-gcc + ''; + }; - configureFlags = [ - (mkEnable true "symlink-install" null) - (mkEnable true "relative-symlinks" null) - (mkEnable true "symlink-relative-symlinks" null) - (mkEnable false "compression" null) - (mkEnable true "htree" null) - (mkEnable true "elf-shlibs" null) - (mkEnable false "profile" null) - (mkEnable false "gcov" null) - (mkEnable false "jbd-debug" null) - (mkEnable false "blkid-debug" null) - (mkEnable false "testio-debug" null) - (mkEnable (optLibuuid == null) "libuuid" null) - (mkEnable (optLibuuid == null) "libblkid" null) - (mkEnable true "quota" null) - (mkEnable false "backtrace" null) - (mkEnable false "debugfs" null) - (mkEnable true "imager" null) - (mkEnable true "resizer" null) - (mkEnable true "defrag" null) - (mkEnable true "fsck" null) - (mkEnable false "e2initrd-helper" null) - (mkEnable true "tls" null) - (mkEnable false "uuidd" null) # Build is broken in 1.42.13 - ]; + # libuuid, libblkid, uuidd and fsck are in util-linux-ng (the "libuuid" dependency). + configureFlags = "--enable-elf-shlibs --disable-libuuid --disable-libblkid --disable-uuidd --disable-fsck --enable-symlink-install"; enableParallelBuilding = true; - installFlags = [ - "LN=ln -s" - ]; + preInstall = "installFlagsArray=('LN=ln -s')"; - postInstall = '' - make install-libs - ''; + postInstall = "make install-libs"; - meta = with stdenv.lib; { + meta = { homepage = http://e2fsprogs.sourceforge.net/; description = "Tools for creating and checking ext2/ext3/ext4 filesystems"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ eelco wkennington ]; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } -- cgit 1.4.1 From 7fae300ebc0d3ee36d8386c010eb9a1e4c497908 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 2 Jun 2015 11:49:55 +0200 Subject: e2fsprogs: Update to 1.42.13 --- pkgs/tools/filesystems/e2fsprogs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/filesystems/e2fsprogs') diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 7617e82f1a8..a53e93960ae 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libuuid }: stdenv.mkDerivation rec { - name = "e2fsprogs-1.42.12"; + name = "e2fsprogs-1.42.13"; src = fetchurl { url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "0v0qcfyls0dlrjy8gx9m3s2wbkp5z3lbsr5hb7x8kp8f3bclcy71"; + sha256 = "1m72lk90b5i3h9qnmss6aygrzyn8x2avy3hyaq2fb0jglkrkz6ar"; }; buildInputs = [ pkgconfig libuuid ]; -- cgit 1.4.1