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

Merge pull request #48818 from jokogr/u/lxd-3.0.2

Browse Source 
lxd: 3.0.0 -> 3.0.2
This commit is contained in:
Jörg Thalheim 2018-10-22 21:07:52 +01:00 committed by GitHub
commit 0a9bfd69ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 57 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/development/libraries/dqlite/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libuv, sqlite-replication }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "dqlite-${version}";
version = "0.2.4";
src = fetchFromGitHub {
owner = "CanonicalLtd";
repo = "dqlite";
rev = "v${version}";
sha256 = "03dikhjppraagyvjx4zbp7f5jfg74jivighxkwrbzrcy0g8pmcvd";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libuv sqlite-replication ];
meta = {
description = "Expose a SQLite database over the network and replicate it across a cluster of peers";
homepage = https://github.com/CanonicalLtd/dqlite/;
license = licenses.asl20;
maintainers = with maintainers; [ joko ];
platforms = platforms.unix;
};
}

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

@ -1,16 +1,17 @@
{ stdenv, pkgconfig, lxc, buildGoPackage, fetchurl { stdenv, pkgconfig, lxc, buildGoPackage, fetchurl
, makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq
, squashfsTools, iproute, iptables, ebtables , squashfsTools, iproute, iptables, ebtables, libcap, dqlite
, sqlite-replication
}: }:
buildGoPackage rec { buildGoPackage rec {
name = "lxd-3.0.0"; name = "lxd-3.0.2";
goPackagePath = "github.com/lxc/lxd"; goPackagePath = "github.com/lxc/lxd";
src = fetchurl { src = fetchurl {
url = "https://github.com/lxc/lxd/releases/download/${name}/${name}.tar.gz"; url = "https://github.com/lxc/lxd/releases/download/${name}/${name}.tar.gz";
sha256 = "0m5prdf9sk8k5bws1zva4n9ycggmy76wnjr6wb423066pszz24ww"; sha256 = "1ha8ijzblf15p0kcpgwshswz6s2rdd2b4qnzjw3l72ww620hr84j";
}; };
preBuild = '' preBuild = ''
@ -22,6 +23,8 @@ buildGoPackage rec {
popd popd
''; '';
buildFlags = [ "-tags libsqlite3" ];
postInstall = '' postInstall = ''
# binaries from test/ # binaries from test/
rm $bin/bin/{deps,macaroon-identity} rm $bin/bin/{deps,macaroon-identity}
@ -32,7 +35,7 @@ buildGoPackage rec {
''; '';
nativeBuildInputs = [ pkgconfig makeWrapper ]; nativeBuildInputs = [ pkgconfig makeWrapper ];
buildInputs = [ lxc acl ]; buildInputs = [ lxc acl libcap dqlite sqlite-replication ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Daemon based on liblxc offering a REST API to manage containers"; description = "Daemon based on liblxc offering a REST API to manage containers";

23
pkgs/top-level/all-packages.nix
View File

@ -12310,6 +12310,29 @@ with pkgs;
sqlite-jdbc = callPackage ../servers/sql/sqlite/jdbc { }; sqlite-jdbc = callPackage ../servers/sql/sqlite/jdbc { };
sqlite-replication = sqlite.overrideAttrs (oldAttrs: rec {
name = "sqlite-${version}";
version = "3.24.0+replication3";
src = pkgs.fetchFromGitHub {
owner = "CanonicalLtd";
repo = "sqlite";
rev = "version-${version}";
sha256 = "19557b7aick1pxk0gw013cf5jy42i7539qn1ziza8dzy16a6zs8b";
};
nativeBuildInputs = [ pkgs.tcl ];
configureFlags = oldAttrs.configureFlags ++ [
"--enable-replication"
"--disable-amalgamation"
"--disable-tcl"
];
preConfigure = ''
echo "D 2018-08-01T13:22:18" > manifest
echo -n "c94dbda1a570c1ab180e7694afd3cc7116268c06" > manifest.uuid
'';
});
dqlite = callPackage ../development/libraries/dqlite { };
sqlcipher = lowPrio (callPackage ../development/libraries/sqlcipher { sqlcipher = lowPrio (callPackage ../development/libraries/sqlcipher {
readline = null; readline = null;
ncurses = null; ncurses = null;