diff options
| author | Will Dietz <w@wdtz.org> | 2019-03-12 12:56:47 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2019-03-12 16:26:20 -0500 |
| commit | c3fb95b4ee667224739b0389899d4f08f9ac24eb (patch) | |
| tree | 0247d7f49cf2186d5b65e70701fc84803288a445 /pkgs/tools/admin | |
| parent | e5a71bd9f7963ed9114f7cbab82ce8dad0895698 (diff) | |
lxd: 3.10 -> 3.11, patch vendored go-dqlite to fix w/dqlite 0.2.6
Diffstat (limited to 'pkgs/tools/admin')
| -rw-r--r-- | pkgs/tools/admin/lxd/default.nix | 18 |
1 files changed, 14 insertions, 4 deletions
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 |