Merge pull request #86102 from Mic92/dqlite

This commit is contained in:
Jörg Thalheim 2020-04-27 09:51:56 +01:00 committed by GitHub
commit 2060bc08c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 12 deletions

View File

@ -5,24 +5,25 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "dqlite";
version = "1.4.0";
version = "1.4.1";
src = fetchFromGitHub {
owner = "canonical";
repo = pname;
rev = "v${version}";
sha256 = "19snm6cicxagcw9ys2jmjf6fchzs6pwm7h4jmyr0pn6zks2yjf1i";
sha256 = "04h3wbfv6bkzzmcwaja33x2qkj3czn0p6fgbdgqd1xli8sx2c2k4";
};
nativeBuildInputs = [ autoreconfHook file pkgconfig ];
buildInputs = [ libco-canonical.dev libuv raft-canonical.dev
sqlite-replication ];
buildInputs = [
libco-canonical.dev
libuv
raft-canonical.dev
sqlite-replication
];
preConfigure= ''
substituteInPlace configure --replace /usr/bin/ " "
'';
doCheck = true;
# tests hang for ever on x86_64-linux
doCheck = false;
outputs = [ "dev" "out" ];
@ -34,6 +35,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/CanonicalLtd/dqlite/";
license = licenses.asl20;
maintainers = with maintainers; [ joko wucke13 ];
platforms = platforms.unix;
platforms = platforms.linux;
};
}

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "raft-canonical";
version = "0.9.17";
version = "0.9.18";
src = fetchFromGitHub {
owner = "canonical";
repo = "raft";
rev = "v${version}";
sha256 = "0q444wd6wz85g4zjkdsrf8z7chkjq9rxzq8l6fh37mgf7c23hv09";
sha256 = "0f613aiyxqskz9d10f7r37ar9ngqsf9qsyk3jjf7s5l14wh6vl5k";
};
nativeBuildInputs = [ autoreconfHook file pkgconfig ];