diff options
-rw-r--r-- | pkgs/development/libraries/dqlite/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/admin/lxd/default.nix | 18 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
3 files changed, 22 insertions, 12 deletions
diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index edb8c968aae6..093abe085f0a 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -3,14 +3,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "dqlite-${version}"; - version = "0.2.5"; + pname = "dqlite"; + version = "0.2.6"; src = fetchFromGitHub { owner = "CanonicalLtd"; - repo = "dqlite"; + repo = pname; rev = "v${version}"; - sha256 = "0pv7nf4siijlcy5asrl8j1ib3viifk65yzqzckarm2mcl16y7fc3"; + sha256 = "13l7na5858v2ah1vim6lafmzajgkymfi5rd6bk14cm4vcnxc40wb"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index e037541557c7..a94cf1d37ec5 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, lxc, buildGoPackage, fetchurl +{ stdenv, pkgconfig, lxc, buildGoPackage, fetchurl, fetchpatch , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq , squashfsTools, iproute, iptables, ebtables, libcap, dqlite , sqlite-replication @@ -7,15 +7,25 @@ }: buildGoPackage rec { - name = "lxd-3.10"; + pname = "lxd"; + version = "3.11"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { - url = "https://github.com/lxc/lxd/releases/download/${name}/${name}.tar.gz"; - sha256 = "0vd0p3xf54s7f9vcjfiin29py6hxyyxnisvp6am67l5nwhg7rnnc"; + url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; + sha256 = "0xxzrwhyzzp23arj57vjs1yh91gy3r4wpd5qy9ksifzd390clf2x"; }; + patches = [ + (fetchpatch { + url = https://github.com/CanonicalLtd/go-dqlite/commit/88a96df66e3e3bdc290fd4a0d41615d284d2c92c.patch; + sha256 = "0z6r4shh1rlf0in9xk1gi6ms2kcvplc3878106d2zzzfz7ad83a4"; + extraPrefix = "dist/src/github.com/CanonicalLtd/go-dqlite/"; + stripLen = 1; + }) + ]; + preBuild = '' # unpack vendor pushd go/src/github.com/lxc/lxd diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2af6e48cdb6b..40b07205b486 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12749,12 +12749,12 @@ in sqlite-replication = sqlite.overrideAttrs (oldAttrs: rec { name = "sqlite-${version}"; - version = "3.24.0+replication3"; + version = "3.27.2+replication3"; src = pkgs.fetchFromGitHub { owner = "CanonicalLtd"; repo = "sqlite"; rev = "version-${version}"; - sha256 = "19557b7aick1pxk0gw013cf5jy42i7539qn1ziza8dzy16a6zs8b"; + sha256 = "1aw1naa5y25ial251f74h039pgcz92p4b3994jvfzqpjlz06qwvw"; }; nativeBuildInputs = [ pkgs.tcl ]; configureFlags = oldAttrs.configureFlags ++ [ @@ -12763,8 +12763,8 @@ in "--disable-tcl" ]; preConfigure = '' - echo "D 2018-08-01T13:22:18" > manifest - echo -n "c94dbda1a570c1ab180e7694afd3cc7116268c06" > manifest.uuid + echo "D 2019-03-09T15:45:46" > manifest + echo -n "8250984a368079bb1838d48d99f8c1a6282e00bc" > manifest.uuid ''; }); |