1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-05-01 07:17:47 +00:00

Merge pull request #90316 from wucke13/dqlite

dqlite: 1.4.1 -> 1.4.4, raft-canonical: 0.9.18 -> 0.9.23
This commit is contained in:
Benjamin Hipple 2020-07-05 19:54:05 -04:00 committed by GitHub
commit 3d8ba20e3a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 12 deletions

View file

@ -5,13 +5,13 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dqlite"; pname = "dqlite";
version = "1.4.1"; version = "1.4.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "canonical"; owner = "canonical";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "04h3wbfv6bkzzmcwaja33x2qkj3czn0p6fgbdgqd1xli8sx2c2k4"; sha256 = "0wm7vkapjg8hdjm6bi48hwsf4w4ppgn3r655gqms5ssjxm50m15d";
}; };
nativeBuildInputs = [ autoreconfHook file pkgconfig ]; nativeBuildInputs = [ autoreconfHook file pkgconfig ];
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
sqlite-replication sqlite-replication
]; ];
# tests hang for ever on x86_64-linux # tests fail
doCheck = false; doCheck = false;
outputs = [ "dev" "out" ]; outputs = [ "dev" "out" ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "raft-canonical"; pname = "raft-canonical";
version = "0.9.18"; version = "0.9.23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "canonical"; owner = "canonical";
repo = "raft"; repo = "raft";
rev = "v${version}"; rev = "v${version}";
sha256 = "0f613aiyxqskz9d10f7r37ar9ngqsf9qsyk3jjf7s5l14wh6vl5k"; sha256 = "0swn95cf11fqczllmxr0nj3ig532rw4n3w6g3ckdnqka8520xjyr";
}; };
nativeBuildInputs = [ autoreconfHook file pkgconfig ]; nativeBuildInputs = [ autoreconfHook file pkgconfig ];
@ -18,13 +18,7 @@ stdenv.mkDerivation rec {
substituteInPlace configure --replace /usr/bin/ " " substituteInPlace configure --replace /usr/bin/ " "
''; '';
# test fails doCheck = true;
#
#append/finalizeSegment [ ERROR ]
#Error: test/integration/test_uv_append.c:264: assertion failed: test_dir_has_file(f->dir, "0000000000000001-0000000000000004") is not true
#Error: child killed by signal 6 (Aborted)
doCheck = false;
outputs = [ "dev" "out" ]; outputs = [ "dev" "out" ];