lxd: URLs have changed to canonical
This commit is contained in:
parent
21061e4e4a
commit
fdf9837118
|
@ -21,10 +21,7 @@ buildGoModule rec {
|
||||||
version = "5.15";
|
version = "5.15";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
urls = [
|
url = "https://github.com/canonical/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz";
|
||||||
"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=";
|
hash = "sha256-ez/875yu0XYu5ORf4ak6RN1jWGxuGk0n9023zJkoluM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -52,7 +49,7 @@ buildGoModule rec {
|
||||||
tags = [ "libsqlite3" ];
|
tags = [ "libsqlite3" ];
|
||||||
|
|
||||||
preBuild = ''
|
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)"
|
export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -78,14 +75,14 @@ buildGoModule rec {
|
||||||
passthru.tests.lxd-ui = nixosTests.lxd-ui;
|
passthru.tests.lxd-ui = nixosTests.lxd-ui;
|
||||||
passthru.ui = callPackage ./ui.nix { };
|
passthru.ui = callPackage ./ui.nix { };
|
||||||
passthru.updateScript = gitUpdater {
|
passthru.updateScript = gitUpdater {
|
||||||
url = "https://github.com/lxc/lxd.git";
|
url = "https://github.com/canonical/lxd.git";
|
||||||
rev-prefix = "lxd-";
|
rev-prefix = "lxd-";
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Daemon based on liblxc offering a REST API to manage containers";
|
description = "Daemon based on liblxc offering a REST API to manage containers";
|
||||||
homepage = "https://linuxcontainers.org/lxd/";
|
homepage = "https://ubuntu.com/lxd";
|
||||||
changelog = "https://github.com/lxc/lxd/releases/tag/lxd-${version}";
|
changelog = "https://github.com/canonical/lxd/releases/tag/lxd-${version}";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
maintainers = with maintainers; [ marsam adamcstephens ];
|
maintainers = with maintainers; [ marsam adamcstephens ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
|
|
|
@ -33,8 +33,7 @@ mkYarnPackage rec {
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Web user interface for LXD.";
|
description = "Web user interface for LXD.";
|
||||||
homepage = "https://linuxcontainers.org/lxd/";
|
homepage = "https://github.com/canonical/lxd-ui";
|
||||||
changelog = "https://github.com/canonical/lxd-ui";
|
|
||||||
license = lib.licenses.gpl3;
|
license = lib.licenses.gpl3;
|
||||||
maintainers = with lib.maintainers; [ jnsgruk ];
|
maintainers = with lib.maintainers; [ jnsgruk ];
|
||||||
platforms = lib.platforms.linux;
|
platforms = lib.platforms.linux;
|
||||||
|
|
|
@ -38,7 +38,7 @@ buildGoModule rec {
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# go.mod update: needed to to include a newer lxd which contains
|
# 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.
|
# which is needed to fix the build w/glibc-2.36.
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
url = "https://github.com/lxc/distrobuilder/commit/5346bcc77dd7f141a36a8da851f016d0b929835e.patch";
|
url = "https://github.com/lxc/distrobuilder/commit/5346bcc77dd7f141a36a8da851f016d0b929835e.patch";
|
||||||
|
|
Loading…
Reference in a new issue