diff options
Diffstat (limited to 'pkgs/tools/filesystems')
-rw-r--r-- | pkgs/tools/filesystems/cryfs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/filesystems/glusterfs/default.nix | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index 0f61d47aca9..6d93717dd9c 100644 --- a/pkgs/tools/filesystems/cryfs/default.nix +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , cmake, pkg-config, python3 -, boost17x, curl, fuse, openssl, range-v3, spdlog +, boost175, curl, fuse, openssl, range-v3, spdlog # cryptopp and gtest on standby - using the vendored ones for now # see https://github.com/cryfs/cryfs/issues/369 , llvmPackages @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { strictDeps = true; - buildInputs = [ boost17x curl fuse openssl range-v3 spdlog ] + buildInputs = [ boost175 curl fuse openssl range-v3 spdlog ] ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; #checkInputs = [ gtest ]; diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index b0524e9bc68..dab69649fdc 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -2,7 +2,7 @@ autoconf, automake, libtool, pkg-config, zlib, libaio, libxml2, acl, sqlite, liburcu, liburing, attr, makeWrapper, coreutils, gnused, gnugrep, which, openssh, gawk, findutils, util-linux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd, - rsync, glibc, rpcsvc-proto, libtirpc, gperftools + rsync, glibc, rpcsvc-proto, libtirpc, gperftools, nixosTests }: let # NOTE: On each glusterfs release, it should be checked if gluster added @@ -85,6 +85,7 @@ in stdenv.mkDerivation rec { # but fails when the version is empty. # See upstream GlusterFS bug https://bugzilla.redhat.com/show_bug.cgi?id=1452705 preConfigure = '' + patchShebangs build-aux/pkg-version echo "v${version}" > VERSION ./autogen.sh export PYTHON=${python3}/bin/python @@ -181,6 +182,10 @@ in stdenv.mkDerivation rec { rm -r $out/bin/conf.py ''; + passthru.tests = { + glusterfs = nixosTests.glusterfs; + }; + meta = with lib; { description = "Distributed storage system"; homepage = "https://www.gluster.org"; |