incus: fix broken custom storage volume

This commit is contained in:
Adam Stephens 2024-02-24 13:11:18 -05:00
parent cc0e4bb80c
commit d6e0a22033
No known key found for this signature in database
4 changed files with 19 additions and 5 deletions

View File

@ -3,12 +3,13 @@
lib,
buildGoModule,
fetchpatch,
fetchFromGitHub,
installShellFiles,
}:
let
releaseFile = if lts then ./lts.nix else ./latest.nix;
inherit (import releaseFile) version hash vendorHash;
inherit (import releaseFile { inherit fetchpatch; }) version hash vendorHash;
in
buildGoModule rec {

View File

@ -1,5 +1,12 @@
{ fetchpatch }:
{
hash = "sha256-tGuAS0lZvoYb+TvmCklQ8TADZhbm4w/lhdI0ycS4/0o=";
version = "0.6.0";
vendorHash = "sha256-+WmgLOEBJ/7GF596iiTgyTPxn8l+hE6RVqjLKfCi5rs=";
patches = [
(fetchpatch {
url = "https://github.com/lxc/incus/pull/529.patch";
hash = "sha256-2aaPrzW/LVJidWeom0rqYOGpT2gvuV1yHLJN/TwQ1fk=";
})
];
}

View File

@ -1,3 +1,3 @@
# this release doesn't exist yet, but satisfay the by-name checks
# will be added as incus-lts in all-packages.nix once ready
{ }
_: { }

View File

@ -3,6 +3,7 @@
lib,
buildGoModule,
fetchpatch,
fetchFromGitHub,
writeShellScript,
acl,
@ -19,14 +20,19 @@
let
releaseFile = if lts then ./lts.nix else ./latest.nix;
inherit (import releaseFile) version hash vendorHash;
inherit (import releaseFile { inherit fetchpatch; })
version
hash
patches
vendorHash
;
name = "incus${lib.optionalString lts "-lts"}";
in
buildGoModule rec {
buildGoModule {
pname = "${name}-unwrapped";
inherit vendorHash version;
inherit patches vendorHash version;
src = fetchFromGitHub {
owner = "lxc";