diff --git a/pkgs/by-name/in/incus/client.nix b/pkgs/by-name/in/incus/client.nix index 46bf691c6951..76f792377b10 100644 --- a/pkgs/by-name/in/incus/client.nix +++ b/pkgs/by-name/in/incus/client.nix @@ -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 { diff --git a/pkgs/by-name/in/incus/latest.nix b/pkgs/by-name/in/incus/latest.nix index 0c0c32ba9af3..78c09a857488 100644 --- a/pkgs/by-name/in/incus/latest.nix +++ b/pkgs/by-name/in/incus/latest.nix @@ -1,5 +1,12 @@ +{ fetchpatch }: { - hash = "sha256-3eWkQT2P69ZfN62H9B4WLnmlUOGkpzRR0rctgchP+6A="; - version = "0.5.1"; - vendorHash = "sha256-2ZJU7WshN4UIbJv55bFeo9qiAQ/wxu182mnz7pE60xA="; + 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="; + }) + ]; } diff --git a/pkgs/by-name/in/incus/lts.nix b/pkgs/by-name/in/incus/lts.nix index d70793f94dfa..a78deb48e23b 100644 --- a/pkgs/by-name/in/incus/lts.nix +++ b/pkgs/by-name/in/incus/lts.nix @@ -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 -{ } +_: { } diff --git a/pkgs/by-name/in/incus/unwrapped.nix b/pkgs/by-name/in/incus/unwrapped.nix index 73257c583940..7a28737ea390 100644 --- a/pkgs/by-name/in/incus/unwrapped.nix +++ b/pkgs/by-name/in/incus/unwrapped.nix @@ -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";