xfsprogs: 4.5.0 -> 4.11.0

+33 -30
+31 -28
pkgs/tools/filesystems/xfsprogs/default.nix
··· 1 - { stdenv, fetchurl, gettext, libuuid, readline }: 1 + { stdenv, fetchpatch, fetchgit, autoconf, automake, gettext, libtool, readline, utillinux }: 2 + 3 + let 4 + gentooPatch = name: sha256: fetchpatch { 5 + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/xfsprogs/files/${name}?id=8293574ab30c85e2965fb2b7dd890b44841b8404"; 6 + inherit sha256; 7 + }; 8 + in 2 9 3 10 stdenv.mkDerivation rec { 4 - name = "xfsprogs-4.5.0"; 11 + name = "xfsprogs-${version}"; 12 + version = "4.11.0"; 5 13 6 - src = fetchurl { 7 - urls = map (dir: "ftp://oss.sgi.com/projects/xfs/${dir}/${name}.tar.gz") 8 - [ "cmd_tars" "previous" ]; 9 - sha256 = "1y49rwvbbvqdq2a1x7p5i05bcfyv6xhmrfwafl6vvvw494qyp6z4"; 14 + src = fetchgit { 15 + url = "git://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git"; 16 + rev = "refs/tags/v${version}"; 17 + sha256 = "0icliinacg6c3ziaqzyyxfz9jykn80njj9fdv3milhsf81yhnrpn"; 10 18 }; 11 19 12 - prePatch = '' 13 - sed -i "s,/bin/bash,$(type -P bash),g" install-sh 14 - sed -i "s,ldconfig,$(type -P ldconfig),g" configure m4/libtool.m4 20 + outputs = [ "bin" "dev" "out" "doc" ]; 21 + 22 + nativeBuildInputs = [ autoconf automake libtool gettext ]; 23 + propagatedBuildInputs = [ utillinux ]; # Dev headers include <uuid/uuid.h> 24 + buildInputs = [ readline ]; 15 25 16 - # Fixes from gentoo 3.2.1 ebuild 17 - sed -i "/^PKG_DOC_DIR/s:@pkg_name@:${name}:" include/builddefs.in 18 - sed -i "/LLDFLAGS.*libtool-libs/d" $(find -name Makefile) 19 - sed -i '/LIB_SUBDIRS/s:libdisk::' Makefile 20 - ''; 26 + enableParallelBuilding = true; 21 27 28 + # Why is all this garbage needed? Why? Why? 22 29 patches = [ 23 - # This patch fixes shared libs installation, still not fixed in 4.2.0 24 - ./4.3.0-sharedlibs.patch 30 + (gentooPatch "xfsprogs-4.7.0-sharedlibs.patch" "1s83ihaccmjrw4zm0nbdwqk3jx4wc1rijpsqrg7ir71ln7qknwzz") 31 + (gentooPatch "xfsprogs-4.7.0-libxcmd-link.patch" "1lvy1ajzml39a631a7jqficnzsd40bzkca7hkxv1ybiqyp8sf55s") 32 + (gentooPatch "xfsprogs-4.9.0-underlinking.patch" "1r7l8jphspy14i43zbfnjrnyrdm4cpgyfchblascxylmans0gci7") 25 33 ]; 26 - 27 - propagatedBuildInputs = [ libuuid ]; 28 - buildInputs = [ gettext readline ]; 29 - 30 - outputs = [ "bin" "dev" "out" ]; # TODO: review xfs 31 34 32 35 preConfigure = '' 33 - NIX_LDFLAGS="$(echo $NIX_LDFLAGS | sed "s,$out,$lib,g")" 36 + sed -i Makefile -e '/cp include.install-sh/d' 37 + make configure 34 38 ''; 35 39 36 40 configureFlags = [ 37 - "MAKE=make" 38 - "MSGFMT=msgfmt" 39 - "MSGMERGE=msgmerge" 40 - "XGETTEXT=xgettext" 41 41 "--disable-lib64" 42 42 "--enable-readline" 43 43 ]; 44 44 45 45 installFlags = [ "install-dev" ]; 46 46 47 - enableParallelBuilding = true; 47 + # FIXME: forbidden rpath 48 + postInstall = '' 49 + find . -type d -name .libs | xargs rm -rf 50 + ''; 48 51 49 52 meta = with stdenv.lib; { 50 53 homepage = http://xfs.org/; 51 54 description = "SGI XFS utilities"; 52 55 license = licenses.lgpl21; 53 56 platforms = platforms.linux; 54 - maintainers = with maintainers; [ wkennington ]; 57 + maintainers = with maintainers; [ dezgeg ]; 55 58 }; 56 59 }
+2 -2
pkgs/top-level/all-packages.nix
··· 4945 4945 gnome_python = gnome2.gnome_python; 4946 4946 }; 4947 4947 4948 - xfsprogs = callPackage ../tools/filesystems/xfsprogs { }; 4949 - libxfs = xfsprogs.dev; # outputs TODO 4948 + xfsprogs = callPackage ../tools/filesystems/xfsprogs { utillinux = utillinuxMinimal; }; 4949 + libxfs = xfsprogs.dev; 4950 4950 4951 4951 xml2 = callPackage ../tools/text/xml/xml2 { }; 4952 4952