From 21b45f71677feefa08c42905a2dd99de5ffa8038 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Wed, 3 Jan 2024 08:46:27 -0500 Subject: [PATCH] incus: install all shell completions --- pkgs/by-name/in/incus-unwrapped/package.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/by-name/in/incus-unwrapped/package.nix b/pkgs/by-name/in/incus-unwrapped/package.nix index 43bf65bef83e..925a485a0723 100644 --- a/pkgs/by-name/in/incus-unwrapped/package.nix +++ b/pkgs/by-name/in/incus-unwrapped/package.nix @@ -1,6 +1,7 @@ { lib , buildGoModule , fetchFromGitHub +, fetchpatch , acl , cowsql , hwdata @@ -27,6 +28,14 @@ buildGoModule rec { vendorHash = "sha256-YfUvkN1qUS3FFKb1wysg40WcJA8fT9SGDChSdT+xnkc="; + patches = [ + # remove with > 0.4.0 + (fetchpatch { + url = "https://github.com/lxc/incus/commit/c0200b455a1468685d762649120ce7e2bb25adc9.patch"; + hash = "sha256-4fiSv6GcsKpdLh3iNbw3AGuDzcw1EadUvxtSjxRjtTA="; + }) + ]; + postPatch = '' substituteInPlace internal/usbid/load.go \ --replace "/usr/share/misc/usb.ids" "${hwdata}/share/hwdata/usb.ids" @@ -77,9 +86,15 @@ buildGoModule rec { ''; postInstall = '' + # use custom bash completion as it has extra logic for e.g. instance names installShellCompletion --bash --name incus ./scripts/bash/incus + + installShellCompletion --cmd incus \ + --fish <($out/bin/incus completion fish) \ + --zsh <($out/bin/incus completion zsh) ''; + passthru = { tests.incus = nixosTests.incus;