diff options
Diffstat (limited to 'pkgs/tools/filesystems')
-rw-r--r-- | pkgs/tools/filesystems/ceph/generic.nix | 30 | ||||
-rw-r--r-- | pkgs/tools/filesystems/convoy/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/default.nix | 9 | ||||
-rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/dmraid.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/parted.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/filesystems/vmfs-tools/default.nix | 4 |
7 files changed, 29 insertions, 32 deletions
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 784ca7ec4f61..20eb363b2278 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -2,7 +2,7 @@ , which, git , boost, python2Packages , libxml2, zlib -, openldap, lttngUst +, openldap, lttng-ust , babeltrace, gperf , cunit, snappy , rocksdb, makeWrapper @@ -79,11 +79,11 @@ let none = [ ]; }; - ceph-python-env = python2Packages.python.withPackages (ps: [ + ceph-python-env = python2Packages.python.withPackages (ps: [ ps.sphinx ps.flask ps.argparse - ps.cython + ps.cython ps.setuptools ps.pip # Libraries needed by the python tools @@ -100,9 +100,9 @@ stdenv.mkDerivation { inherit src; - patches = [ + patches = [ # ./ceph-patch-cmake-path.patch - ./0001-kv-RocksDBStore-API-break-additional.patch + ./0001-kv-RocksDBStore-API-break-additional.patch ] ++ optionals stdenv.isLinux [ ./0002-fix-absolute-include-path.patch ]; @@ -112,10 +112,10 @@ stdenv.mkDerivation { pkgconfig which git python2Packages.wrapPython makeWrapper (ensureNewerSourcesHook { year = "1980"; }) ]; - + buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [ - boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 - malloc zlib openldap lttngUst babeltrace gperf cunit + boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 + malloc zlib openldap lttng-ust babeltrace gperf cunit snappy rocksdb ] ++ optionals stdenv.isLinux [ linuxHeaders libuuid udev keyutils optLibaio optLibxfs optZfs @@ -125,28 +125,28 @@ stdenv.mkDerivation { optKinetic-cpp-client ]; - + preConfigure ='' # rip off submodule that interfer with system libs rm -rf src/boost rm -rf src/rocksdb - + # require LD_LIBRARY_PATH for cython to find internal dep export LD_LIBRARY_PATH="$PWD/build/lib:$LD_LIBRARY_PATH" - + # requires setuptools due to embedded in-cmake setup.py usage export PYTHONPATH="${python2Packages.setuptools}/lib/python2.7/site-packages/:$PYTHONPATH" ''; - cmakeFlags = [ + cmakeFlags = [ "-DENABLE_GIT_VERSION=OFF" "-DWITH_SYSTEM_BOOST=ON" "-DWITH_SYSTEM_ROCKSDB=ON" "-DWITH_LEVELDB=OFF" - + # enforce shared lib "-DBUILD_SHARED_LIBS=ON" - + # disable cephfs, cmake build broken for now "-DWITH_CEPHFS=OFF" "-DWITH_LIBCEPHFS=OFF" @@ -158,7 +158,7 @@ stdenv.mkDerivation { ''; enableParallelBuilding = true; - + outputs = [ "dev" "lib" "out" "doc" ]; meta = { diff --git a/pkgs/tools/filesystems/convoy/default.nix b/pkgs/tools/filesystems/convoy/default.nix index fe713556577d..8af745ed436e 100644 --- a/pkgs/tools/filesystems/convoy/default.nix +++ b/pkgs/tools/filesystems/convoy/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchFromGitHub, devicemapper }: +{ stdenv, buildGoPackage, fetchFromGitHub, lvm2 }: buildGoPackage rec { name = "convoy-${version}"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "0ihy0cfq7sa2wml904ajwr165hx2mas3jb1bqk3i0m4fg1lx1xw1"; }; - buildInputs = [devicemapper]; + buildInputs = [lvm2]; meta = with stdenv.lib; { homepage = https://github.com/rancher/convoy; diff --git a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix index 24eec2f0dc46..b0c33212edb3 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, devicemapper, libgcrypt, libuuid, pkgconfig, popt +{ stdenv, fetchurl, lvm2, libgcrypt, libuuid, pkgconfig, popt , enablePython ? true, python ? null }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional enablePython "--enable-python"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ devicemapper libgcrypt libuuid popt ] + buildInputs = [ lvm2 libgcrypt libuuid popt ] ++ stdenv.lib.optional enablePython python; meta = { diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix index 5ae32093e7f7..217056117ea7 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -18,13 +18,11 @@ let cryptsetup = import ./cryptsetup.nix { inherit stdenv fetchurl python; - inherit (pkgs) pkgconfig libgcrypt libuuid popt; - devicemapper = lvm2; + inherit (pkgs) pkgconfig libgcrypt libuuid popt lvm2; }; dmraid = import ./dmraid.nix { - inherit stdenv fetchurl; - devicemapper = lvm2; + inherit stdenv fetchurl lvm2; }; lvm2 = import ./lvm2.nix { @@ -39,8 +37,7 @@ let parted = import ./parted.nix { inherit stdenv fetchurl; - inherit (pkgs) utillinux readline libuuid gettext check; - devicemapper = lvm2; + inherit (pkgs) utillinux readline libuuid gettext check lvm2; }; pyblock = import ./pyblock.nix { diff --git a/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix b/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix index defdf6702ea7..a4dcb408e058 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, devicemapper }: +{ stdenv, fetchurl, lvm2 }: stdenv.mkDerivation rec { name = "dmraid-1.0.0.rc15"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { preConfigure = "cd */"; - buildInputs = [ devicemapper ]; + buildInputs = [ lvm2 ]; meta = { description = "Old-style RAID configuration utility"; diff --git a/pkgs/tools/filesystems/nixpart/0.4/parted.nix b/pkgs/tools/filesystems/nixpart/0.4/parted.nix index 04859020e36e..3f43fdc0c395 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/parted.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/parted.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline +{ stdenv, fetchurl, lvm2, libuuid, gettext, readline , utillinux, check, enableStatic ? false, hurd ? null }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid ] ++ stdenv.lib.optional (readline != null) readline ++ stdenv.lib.optional (gettext != null) gettext - ++ stdenv.lib.optional (devicemapper != null) devicemapper + ++ stdenv.lib.optional (lvm2 != null) lvm2 ++ stdenv.lib.optional (hurd != null) hurd ++ stdenv.lib.optional doCheck check; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { (if (readline != null) then [ "--with-readline" ] else [ "--without-readline" ]) - ++ stdenv.lib.optional (devicemapper == null) "--disable-device-mapper" + ++ stdenv.lib.optional (lvm2 == null) "--disable-device-mapper" ++ stdenv.lib.optional enableStatic "--enable-static"; doCheck = true; diff --git a/pkgs/tools/filesystems/vmfs-tools/default.nix b/pkgs/tools/filesystems/vmfs-tools/default.nix index d563f4380209..b22f7e07a464 100644 --- a/pkgs/tools/filesystems/vmfs-tools/default.nix +++ b/pkgs/tools/filesystems/vmfs-tools/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig -, asciidoc, docbook_xml_xslt, fuse, libuuid, libxslt }: +, asciidoc, docbook_xsl, fuse, libuuid, libxslt }: stdenv.mkDerivation rec { name = "vmfs-tools"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "14y412ww5hxk336ils62s3fwykfh6mx1j0iiaa5cwc615pi6qvi4"; }; - nativeBuildInputs = [ asciidoc docbook_xml_xslt fuse libuuid libxslt pkgconfig ]; + nativeBuildInputs = [ asciidoc docbook_xsl fuse libuuid libxslt pkgconfig ]; enableParallelBuilding = true; |