nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-04 21:03:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #130180 from marsam/update-lxd

Browse Source 
lxd: 4.15 -> 4.16
This commit is contained in:
Mario Rodas 2021-07-14 20:26:40 -05:00 committed by GitHub
commit 66446f8047
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "dqlite";
version = "1.7.0";
version = "1.8.0";
src = fetchFromGitHub {
owner = "canonical";
repo = pname;
rev = "v${version}";
sha256 = "sha256-lCMTmKnDv/fb5fP/Ch8AwpuNfmR+gecxeIweO6hHj5U=";
sha256 = "0ghvwlgj5574kpgc53bfhqp4437xxvr05061wwxplpjxn37hy26d";
};
nativeBuildInputs = [ autoreconfHook file pkg-config ];

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

@ -19,13 +19,13 @@ let
in
buildGoPackage rec {
pname = "lxd";
version = "4.15";
version = "4.16";
goPackagePath = "github.com/lxc/lxd";
src = fetchurl {
url = "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz";
sha256 = "sha256-UXipGNWclBKgr0r0wav85Gnhp2SXkTvDFr9gKJWismU=";
sha256 = "1da9avmxs8sy92d9nrdgry2x685ral58zgf89yr88qxc0llbzq7r";
};
postPatch = ''
@ -40,6 +40,9 @@ buildGoPackage rec {
cp -r _dist/src/* ../../..
popd
# required for go-dqlite. See: https://github.com/lxc/lxd/pull/8939
export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)"
makeFlagsArray+=("-tags libsqlite3")
'';