public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #76911 from wucke13/lxd 

raft-canonical: 0.9.6 -> 0.9.17, dqlite: 1.0.0 -> 1.4.0, lxd: 3.18 -> 3.22
This commit is contained in:
Mario Rodas 2020-03-13 08:32:52 -05:00 committed by GitHub
parent 9139701255 5d21d99575
commit cc1f45ba65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/dqlite/default.nix
View File

@ -5,13 +5,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "dqlite";
version = "1.0.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "canonical";
repo = pname;
rev = "v${version}";
sha256 = "0670c1c84lcf5vl3h6mlff00fz2fnm766bzlk526sjjzysx3zjya";
sha256 = "19snm6cicxagcw9ys2jmjf6fchzs6pwm7h4jmyr0pn6zks2yjf1i";
};
nativeBuildInputs = [ autoreconfHook file pkgconfig ];
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
'';
homepage = https://github.com/CanonicalLtd/dqlite/;
license = licenses.asl20;
maintainers = with maintainers; [ joko ];
maintainers = with maintainers; [ joko wucke13 ];
platforms = platforms.unix;
};
}

16
pkgs/development/libraries/raft-canonical/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "raft-canonical";
version = "0.9.6";
version = "0.9.17";
src = fetchFromGitHub {
owner = "canonical";
repo = "raft";
rev = "v${version}";
sha256 = "083il7b5kw3pc7m5p9xjpb9dlvfarc51sni92mkgm9ckc32x9vpp";
sha256 = "0q444wd6wz85g4zjkdsrf8z7chkjq9rxzq8l6fh37mgf7c23hv09";
};
nativeBuildInputs = [ autoreconfHook file pkgconfig ];
@ -18,12 +18,14 @@ stdenv.mkDerivation rec {
substituteInPlace configure --replace /usr/bin/ " "
'';
doCheck = false;
# Due to
#io_uv_recv/success/first [ ERROR ]
#Error: test/lib/dir.c:97: No such file or directory
# test fails
#
#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" ];
meta = with stdenv.lib; {
@ -39,6 +41,6 @@ stdenv.mkDerivation rec {
'';
homepage = "https://github.com/canonical/raft";
license = licenses.asl20;
maintainers = [ maintainers.wucke13 ];
maintainers = with maintainers; [ wucke13 ];
};
}

8
pkgs/tools/admin/lxd/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, pkgconfig, lxc, buildGoPackage, fetchurl
, makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq
, squashfsTools, iproute, iptables, ebtables, libcap, libco-canonical, dqlite
, raft-canonical, sqlite-replication
, raft-canonical, sqlite-replication, udev
, writeShellScriptBin, apparmor-profiles, apparmor-parser
, criu
, bash
@ -9,13 +9,13 @@
buildGoPackage rec {
pname = "lxd";
version = "3.18";
version = "3.22";
goPackagePath = "github.com/lxc/lxd";
src = fetchurl {
url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "1p8g2gbwgn3kln5rxddpc2fxk8bvf026wjiqip2b0vvpi7h3955h";
sha256 = "1j60xajcycqnnkasbghcvx3dvb5iadvvq2l3hh9i0sw3dk1wx4hn";
};
preBuild = ''
@ -45,7 +45,7 @@ buildGoPackage rec {
nativeBuildInputs = [ pkgconfig makeWrapper ];
buildInputs = [ lxc acl libcap libco-canonical.dev dqlite.dev
raft-canonical.dev sqlite-replication ];
raft-canonical.dev sqlite-replication udev.dev ];
meta = with stdenv.lib; {
description = "Daemon based on liblxc offering a REST API to manage containers";