mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-23 13:48:21 +03:00
lxd-to-incus: 0.2 -> 0.3
This commit is contained in:
parent
2fb50aab69
commit
0d0cc171b1
@ -1,25 +0,0 @@
|
||||
From d7f7ae55a54437616174f80fb8faa80ae4ffcda4 Mon Sep 17 00:00:00 2001
|
||||
From: Adam Stephens <adam@valkor.net>
|
||||
Date: Fri, 27 Oct 2023 13:26:11 -0400
|
||||
Subject: [PATCH] lxd-to-incus: query systemd instead of assuming service file
|
||||
path
|
||||
|
||||
Signed-off-by: Adam Stephens <adam@valkor.net>
|
||||
---
|
||||
cmd/lxd-to-incus/targets.go | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cmd/lxd-to-incus/targets.go b/cmd/lxd-to-incus/targets.go
|
||||
index f2b405e0e4..ed84d3ebce 100644
|
||||
--- a/cmd/lxd-to-incus/targets.go
|
||||
+++ b/cmd/lxd-to-incus/targets.go
|
||||
@@ -25,7 +25,8 @@ func (s *targetSystemd) Present() bool {
|
||||
return false
|
||||
}
|
||||
|
||||
- if !util.PathExists("/lib/systemd/system/incus.service") {
|
||||
+ _, err := subprocess.RunCommand("systemctl", "list-unit-files", "incus.service")
|
||||
+ if err != nil {
|
||||
return false
|
||||
}
|
||||
|
@ -6,29 +6,25 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lxd-to-incus";
|
||||
version = "0.2";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxc";
|
||||
repo = "incus";
|
||||
rev = "refs/tags/incus-${version}";
|
||||
hash = "sha256-WhprzGzTeB8sEMMTYN5j1Zrwg0GiGLlXTqCkcPq0XVo=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-oPBrIN4XUc9GnBszEWAAnEcNahV4hfB48XSKvkpq5Kk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./d7f7ae55a54437616174f80fb8faa80ae4ffcda4.patch
|
||||
];
|
||||
|
||||
modRoot = "cmd/lxd-to-incus";
|
||||
|
||||
vendorHash = "sha256-J95b4fm+VwndoxS8RQF8V8ufI3RjclqzAskEd3ut4bU=";
|
||||
vendorHash = "sha256-/ONflpW1HGvXooPF+Xui8q4xFu/Zq5br+Vjm9d2gm5U=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"-vr" "incus-\(.*\)"
|
||||
"-vr" "v\(.*\)"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user