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

lxd: URLs have changed to canonical

Browse Source
This commit is contained in:
Adam Stephens 2023-07-19 09:16:20 -04:00
parent 21061e4e4a
commit fdf9837118
No known key found for this signature in database
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,10 +21,7 @@ buildGoModule rec {
version = "5.15";
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"
];
url = "https://github.com/canonical/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz";
hash = "sha256-ez/875yu0XYu5ORf4ak6RN1jWGxuGk0n9023zJkoluM=";
};
@ -52,7 +49,7 @@ 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)"
'';
@ -78,14 +75,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;

3
pkgs/tools/admin/lxd/ui.nix
View File

@ -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;

2
pkgs/tools/virtualization/distrobuilder/default.nix
View File

@ -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";