mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-01 01:57:37 +03:00
Merge pull request #244348 from adamcstephens/lxd/agent
lxd: 5.15 -> 5.16, update URLs and statically compile tools
This commit is contained in:
commit
258f797150
@ -18,14 +18,11 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lxd-unwrapped";
|
||||
version = "5.15";
|
||||
version = "5.16";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz"
|
||||
"https://github.com/lxc/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz"
|
||||
];
|
||||
hash = "sha256-ez/875yu0XYu5ORf4ak6RN1jWGxuGk0n9023zJkoluM=";
|
||||
url = "https://github.com/canonical/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz";
|
||||
hash = "sha256-evtNPZvnx8rzr/tJkEp0E7BhUBWHBSJdMtZJQk3VZI8=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
@ -35,7 +32,7 @@ buildGoModule rec {
|
||||
--replace "/usr/share/misc/usb.ids" "${hwdata}/share/hwdata/usb.ids"
|
||||
'';
|
||||
|
||||
excludedPackages = [ "test" "lxd/db/generate" ];
|
||||
excludedPackages = [ "test" "lxd/db/generate" "lxd-agent" "lxd-migrate" ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pkg-config ];
|
||||
buildInputs = [
|
||||
@ -52,10 +49,15 @@ buildGoModule rec {
|
||||
tags = [ "libsqlite3" ];
|
||||
|
||||
preBuild = ''
|
||||
# required for go-dqlite. See: https://github.com/lxc/lxd/pull/8939
|
||||
# required for go-dqlite. See: https://github.com/canonical/lxd/pull/8939
|
||||
export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)"
|
||||
'';
|
||||
|
||||
# build static binaries: https://github.com/canonical/lxd/blob/6fd175c45e65cd475d198db69d6528e489733e19/Makefile#L43-L51
|
||||
postBuild = ''
|
||||
make lxd-agent lxd-migrate
|
||||
'';
|
||||
|
||||
preCheck =
|
||||
let skippedTests = [
|
||||
"TestValidateConfig"
|
||||
@ -78,14 +80,14 @@ buildGoModule rec {
|
||||
passthru.tests.lxd-ui = nixosTests.lxd-ui;
|
||||
passthru.ui = callPackage ./ui.nix { };
|
||||
passthru.updateScript = gitUpdater {
|
||||
url = "https://github.com/lxc/lxd.git";
|
||||
url = "https://github.com/canonical/lxd.git";
|
||||
rev-prefix = "lxd-";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Daemon based on liblxc offering a REST API to manage containers";
|
||||
homepage = "https://linuxcontainers.org/lxd/";
|
||||
changelog = "https://github.com/lxc/lxd/releases/tag/lxd-${version}";
|
||||
homepage = "https://ubuntu.com/lxd";
|
||||
changelog = "https://github.com/canonical/lxd/releases/tag/lxd-${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ marsam adamcstephens ];
|
||||
platforms = platforms.linux;
|
||||
|
@ -33,8 +33,7 @@ mkYarnPackage rec {
|
||||
|
||||
meta = {
|
||||
description = "Web user interface for LXD.";
|
||||
homepage = "https://linuxcontainers.org/lxd/";
|
||||
changelog = "https://github.com/canonical/lxd-ui";
|
||||
homepage = "https://github.com/canonical/lxd-ui";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ jnsgruk ];
|
||||
platforms = lib.platforms.linux;
|
||||
|
@ -38,7 +38,7 @@ buildGoModule rec {
|
||||
|
||||
patches = [
|
||||
# go.mod update: needed to to include a newer lxd which contains
|
||||
# https://github.com/lxc/lxd/commit/d83f061a21f509d42b7a334b97403d2a019a7b52
|
||||
# https://github.com/canonical/lxd/commit/d83f061a21f509d42b7a334b97403d2a019a7b52
|
||||
# which is needed to fix the build w/glibc-2.36.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/lxc/distrobuilder/commit/5346bcc77dd7f141a36a8da851f016d0b929835e.patch";
|
||||
|
Loading…
Reference in New Issue
Block a user