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

lxd: 3.10 -> 3.11, patch vendored go-dqlite to fix w/dqlite 0.2.6

Browse Source
This commit is contained in:
Will Dietz 2019-03-12 12:56:47 -05:00
parent e5a71bd9f7
commit c3fb95b4ee
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, pkgconfig, lxc, buildGoPackage, fetchurl { stdenv, pkgconfig, lxc, buildGoPackage, fetchurl, fetchpatch
, makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq
, squashfsTools, iproute, iptables, ebtables, libcap, dqlite , squashfsTools, iproute, iptables, ebtables, libcap, dqlite
, sqlite-replication , sqlite-replication
@ -7,15 +7,25 @@
}: }:
buildGoPackage rec { buildGoPackage rec {
name = "lxd-3.10"; pname = "lxd";
version = "3.11";
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/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "0vd0p3xf54s7f9vcjfiin29py6hxyyxnisvp6am67l5nwhg7rnnc"; 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 = '' preBuild = ''
# unpack vendor # unpack vendor
pushd go/src/github.com/lxc/lxd pushd go/src/github.com/lxc/lxd