Merge pull request #299340 from adamcstephens/incus/0.7

incus: 0.6 -> 0.7
NixOS · Mar 27, 2024 · 0ca930a · 0ca930a
2 parents 098e283 + a5a4da8
commit 0ca930a
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 50 deletions.
diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix
@@ -263,6 +263,7 @@ in
  {
  INCUS_LXC_TEMPLATE_CONFIG = "${pkgs.lxcfs}/share/lxc/config";
  INCUS_OVMF_PATH = ovmf;
+ INCUS_USBIDS_PATH = "${pkgs.hwdata}/share/hwdata/usb.ids";
  PATH = lib.mkForce serverBinPath;
  }
  (lib.mkIf (cfg.ui.enable) { "INCUS_UI" = cfg.ui.package; })

diff --git a/pkgs/by-name/in/incus/529.patch b/pkgs/by-name/in/incus/529.patch
diff --git a/pkgs/by-name/in/incus/client.nix b/pkgs/by-name/in/incus/client.nix
@@ -31,10 +31,8 @@ buildGoModule {
  subPackages = [ "cmd/incus" ];
 
  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 \
+ --bash <($out/bin/incus completion bash) \
  --fish <($out/bin/incus completion fish) \
  --zsh <($out/bin/incus completion zsh)
  '';

diff --git a/pkgs/by-name/in/incus/generic.nix b/pkgs/by-name/in/incus/generic.nix
@@ -45,12 +45,6 @@ buildGoModule rec {
  inherit hash;
  };
 
- # replace with env var > 0.6 https://github.com/lxc/incus/pull/610
- postPatch = ''
- substituteInPlace internal/usbid/load.go \
- --replace-fail "/usr/share/misc/usb.ids" "${hwdata}/share/hwdata/usb.ids"
- '';
-
  excludedPackages = [
  # statically compile these
  "cmd/incus-agent"
@@ -103,10 +97,8 @@ 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 \
+ --bash <($out/bin/incus completion bash) \
  --fish <($out/bin/incus completion fish) \
  --zsh <($out/bin/incus completion zsh)
  '';

diff --git a/pkgs/by-name/in/incus/package.nix b/pkgs/by-name/in/incus/package.nix
@@ -1,9 +1,6 @@
 import ./generic.nix {
- hash = "sha256-tGuAS0lZvoYb+TvmCklQ8TADZhbm4w/lhdI0ycS4/0o=";
- version = "0.6.0";
- vendorHash = "sha256-+WmgLOEBJ/7GF596iiTgyTPxn8l+hE6RVqjLKfCi5rs=";
- patches = [
- # fix storage bug, fixed in > 0.6
- ./529.patch
- ];
+ hash = "sha256-6TLoua3rooDRyPc5BPYgzU/oeVy6F8h+p3UtKGPZkAE=";
+ version = "0.7.0";
+ vendorHash = "sha256-Slw58pszT6sbpxK6/f+ojA+uStt0zSWxztFTm5ovZr8=";
+ patches = [ ];
 }
diff --git a/pkgs/by-name/in/incus/update.nu b/pkgs/by-name/in/incus/update.nu
@@ -10,12 +10,19 @@ def main [--lts = false, --regex: string] {
  let current_version = nix eval --raw -f default.nix $"($attr).version" | str trim
 
  if $latest_tag != $current_version {
+ print $"Updating: new ($latest_tag) != old ($current_version)"
  update-source-version $attr $latest_tag $"--file=($file)"
 
  let oldVendorHash = nix-instantiate . --eval --strict -A $"($attr).goModules.drvAttrs.outputHash" --json | from json
- let vendorHash = do { nix-build -A $"($attr).goModules" } | complete | get stderr | lines | str trim | find --regex 'got:[[:space:]]*sha256' | split row ' ' | last
- open $file | str replace $oldVendorHash $vendorHash | save --force $file
+ let checkBuild = do { nix-build -A $"($attr).goModules" } | complete
+ let vendorHash = $checkBuild.stderr | lines | str trim | find --regex 'got:[[:space:]]*sha256' | split row ' ' | last
 
+ if $vendorHash != null {
+ open $file | str replace $oldVendorHash $vendorHash | save --force $file
+ } else {
+ print $checkBuild.stderr
+ exit 1
+ }
  }
 
  {"lts?": $lts, before: $current_version, after: $latest_tag}