Renaud
GitHub
parent
95dc1c615e
commit
f0b9bd93ec
4 changed files with 47 additions and 107 deletions
|
|
@ -1,78 +1,78 @@
|
|||
{ stdenv, fetchFromGitHub
|
||||
, cmake, pkgconfig, coreutils
|
||||
, boost, cryptopp, curl, fuse, openssl, python, spdlog
|
||||
{ stdenv, fetchFromGitHub, fetchpatch
|
||||
, cmake, pkgconfig, python, gtest
|
||||
, boost, cryptopp, curl, fuse, openssl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cryfs";
|
||||
version = "0.9.10";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cryfs";
|
||||
repo = "cryfs";
|
||||
rev = version;
|
||||
sha256 = "04yqpad8x0hiiwpykcn3swi0py6sg9xid6g15ny2qs4j3llin5ry";
|
||||
sha256 = "1m6rcc82hbaiwcwcvf5xmxma8n0jal9zhcykv9xgwiax4ny0l8kz";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
patchShebangs src
|
||||
|
||||
substituteInPlace vendor/scrypt/CMakeLists.txt \
|
||||
--replace /usr/bin/ ""
|
||||
|
||||
# scrypt in nixpkgs only produces a binary so we lift the patching from that so allow
|
||||
# building the vendored version. This is very much NOT DRY.
|
||||
# The proper solution is to have scrypt generate a dev output with the required files and just symlink
|
||||
# into vendor/scrypt
|
||||
for f in Makefile.in autocrap/Makefile.am libcperciva/cpusupport/Build/cpusupport.sh ; do
|
||||
substituteInPlace vendor/scrypt/scrypt-*/scrypt/$f --replace "command -p " ""
|
||||
done
|
||||
|
||||
# cryfs is vendoring an old version of spdlog
|
||||
rm -rf vendor/spdlog/spdlog
|
||||
ln -s ${spdlog} vendor/spdlog/spdlog
|
||||
'';
|
||||
|
||||
buildInputs = [ boost cryptopp curl fuse openssl python spdlog ];
|
||||
|
||||
patches = [
|
||||
./test-no-network.patch # Disable tests using external networking
|
||||
./skip-failing-test-large-malloc.patch
|
||||
(fetchpatch {
|
||||
name = "cryfs-0.10.2-install-targets.patch";
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/cryfs/files/cryfs-0.10.2-install-targets.patch?id=192ac7421ddd4093125f4997898fb62e8a140a44";
|
||||
sha256 = "1jz6gpi1i7dnfm88a6n3mccwfmsmvg0d0bmp3fmqqrkbcg7in00l";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "cryfs-0.10.2-unbundle-libs.patch";
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/cryfs/files/cryfs-0.10.2-unbundle-libs.patch?id=192ac7421ddd4093125f4997898fb62e8a140a44";
|
||||
sha256 = "0hzss5rawcjrh8iqzc40w5yjhxdqya4gbg6dzap70180s50mahzs";
|
||||
})
|
||||
];
|
||||
|
||||
# coreutils is needed for the vendored scrypt
|
||||
nativeBuildInputs = [ cmake coreutils pkgconfig ];
|
||||
postPatch = ''
|
||||
patchShebangs src
|
||||
|
||||
# remove tests that require network access:
|
||||
substituteInPlace test/cpp-utils/CMakeLists.txt \
|
||||
--replace "network/CurlHttpClientTest.cpp" "" \
|
||||
--replace "network/FakeHttpClientTest.cpp" ""
|
||||
|
||||
# remove CLI test trying to access /dev/fuse
|
||||
substituteInPlace test/cryfs-cli/CMakeLists.txt \
|
||||
--replace "CliTest_IntegrityCheck.cpp" ""
|
||||
|
||||
# downsize large file test as 4.5G is too big for Hydra:
|
||||
substituteInPlace test/cpp-utils/data/DataTest.cpp \
|
||||
--replace "(4.5L*1024*1024*1024)" "(0.5L*1024*1024*1024)"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake gtest pkgconfig python ];
|
||||
|
||||
buildInputs = [ boost cryptopp curl fuse openssl ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCRYFS_UPDATE_CHECKS=OFF"
|
||||
"-DBoost_USE_STATIC_LIBS=OFF" # this option is case sensitive
|
||||
"-DCRYFS_UPDATE_CHECKS:BOOL=FALSE"
|
||||
"-DBoost_USE_STATIC_LIBS:BOOL=FALSE" # this option is case sensitive
|
||||
"-DUSE_SYSTEM_LIBS:BOOL=TRUE"
|
||||
"-DBUILD_TESTING:BOOL=TRUE"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
doCheck = (!stdenv.isDarwin); # Cryfs tests are broken on darwin
|
||||
|
||||
# Cryfs tests are broken on darwin
|
||||
checkPhase = stdenv.lib.optionalString (!stdenv.isDarwin) ''
|
||||
checkPhase = ''
|
||||
# Skip CMakeFiles directory and tests depending on fuse (does not work well with sandboxing)
|
||||
SKIP_IMPURE_TESTS="CMakeFiles|fspp|cryfs-cli"
|
||||
SKIP_IMPURE_TESTS="CMakeFiles|fspp|my-gtest-main"
|
||||
|
||||
for test in `ls -d test/*/ | egrep -v "$SKIP_IMPURE_TESTS"`; do
|
||||
"./$test`basename $test`-test"
|
||||
for t in $(ls -d test/*/ | egrep -v "$SKIP_IMPURE_TESTS"); do
|
||||
"./$t$(basename $t)-test"
|
||||
done
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
# Building with BUILD_TESTING=ON is missing the install target
|
||||
mkdir -p $out/bin
|
||||
install -m 755 ./src/cryfs-cli/cryfs $out/bin/cryfs
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Cryptographic filesystem for the cloud";
|
||||
homepage = https://www.cryfs.org;
|
||||
license = licenses.lgpl3;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
maintainers = with maintainers; [ peterhoeg c0bw3b ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,34 +0,0 @@
|
|||
From ad3f7e9fa2dececfaab43963887a2f03de52d659 Mon Sep 17 00:00:00 2001
|
||||
From: adisbladis <adis@blad.is>
|
||||
Date: Thu, 12 Oct 2017 21:45:26 +0800
|
||||
Subject: [PATCH] Skip failing test: large malloc
|
||||
|
||||
---
|
||||
test/cpp-utils/data/DataTest.cpp | 11 -----------
|
||||
1 file changed, 11 deletions(-)
|
||||
|
||||
diff --git a/test/cpp-utils/data/DataTest.cpp b/test/cpp-utils/data/DataTest.cpp
|
||||
index 6f9df070..bd426e62 100644
|
||||
--- a/test/cpp-utils/data/DataTest.cpp
|
||||
+++ b/test/cpp-utils/data/DataTest.cpp
|
||||
@@ -191,17 +191,6 @@ TEST_F(DataTest, Inequality_DifferentLastByte) {
|
||||
EXPECT_TRUE(data1 != data2);
|
||||
}
|
||||
|
||||
-#ifdef __x86_64__
|
||||
-TEST_F(DataTest, LargesizeSize) {
|
||||
- //Needs 64bit for representation. This value isn't in the size param list, because the list is also used for read/write checks.
|
||||
- uint64_t size = 4.5L*1024*1024*1024;
|
||||
- Data data(size);
|
||||
- EXPECT_EQ(size, data.size());
|
||||
-}
|
||||
-#else
|
||||
-#warning This is not a 64bit architecture. Large size data tests are disabled.
|
||||
-#endif
|
||||
-
|
||||
TEST_F(DataTest, LoadingNonexistingFile) {
|
||||
TempFile file(false); // Pass false to constructor, so the tempfile is not created
|
||||
EXPECT_FALSE(Data::LoadFromFile(file.path()));
|
||||
--
|
||||
2.14.2
|
||||
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
From 8b1808e1278d2cb0dc56a4e98781eceeadfb9718 Mon Sep 17 00:00:00 2001
|
||||
From: adisbladis <adis@blad.is>
|
||||
Date: Thu, 12 Oct 2017 18:13:28 +0800
|
||||
Subject: [PATCH] Disable tests using external networking
|
||||
|
||||
---
|
||||
test/cpp-utils/CMakeLists.txt | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/test/cpp-utils/CMakeLists.txt b/test/cpp-utils/CMakeLists.txt
|
||||
index 5a2bc9f8..d838edba 100644
|
||||
--- a/test/cpp-utils/CMakeLists.txt
|
||||
+++ b/test/cpp-utils/CMakeLists.txt
|
||||
@@ -20,7 +20,6 @@ set(SOURCES
|
||||
tempfile/TempFileIncludeTest.cpp
|
||||
tempfile/TempDirIncludeTest.cpp
|
||||
tempfile/TempDirTest.cpp
|
||||
- network/CurlHttpClientTest.cpp
|
||||
network/FakeHttpClientTest.cpp
|
||||
io/ConsoleIncludeTest.cpp
|
||||
io/ConsoleTest_AskYesNo.cpp
|
||||
--
|
||||
2.14.2
|
||||
|
||||
|
|
@ -3022,9 +3022,7 @@ in
|
|||
|
||||
endlessh = callPackage ../servers/endlessh { };
|
||||
|
||||
cryfs = callPackage ../tools/filesystems/cryfs {
|
||||
spdlog = spdlog_0;
|
||||
};
|
||||
cryfs = callPackage ../tools/filesystems/cryfs { };
|
||||
|
||||
encfs = callPackage ../tools/filesystems/encfs {
|
||||
tinyxml2 = tinyxml-2;
|
||||
|
|
@ -6648,7 +6646,7 @@ in
|
|||
thin-provisioning-tools = callPackage ../tools/misc/thin-provisioning-tools { };
|
||||
|
||||
tiled = libsForQt5.callPackage ../applications/editors/tiled { };
|
||||
|
||||
|
||||
tiledb = callPackage ../development/libraries/tiledb { };
|
||||
|
||||
timemachine = callPackage ../applications/audio/timemachine { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue