From d0337caca8ec0ae30bc3c68cf6c609fa71b1d540 Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Fri, 25 Sep 2026 02:26:09 +0200 Subject: [PATCH 1/2] incus: drop patch to loosen go requirement to 1.26.6 The bump of go_1_26 to 1.26.7 has since reached the branch. Not-cherry-picked-because: The patch was only ever present on 26.05 --- pkgs/by-name/in/incus/go_1_26_6.patch | 12 ------------ pkgs/by-name/in/incus/package.nix | 4 +--- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 pkgs/by-name/in/incus/go_1_26_6.patch diff --git a/pkgs/by-name/in/incus/go_1_26_6.patch b/pkgs/by-name/in/incus/go_1_26_6.patch deleted file mode 100644 index 2544f77a1c3c..000000000000 --- a/pkgs/by-name/in/incus/go_1_26_6.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git i/go.mod w/go.mod -index 0fd8ca7b49..9b7b05b433 100644 ---- i/go.mod -+++ w/go.mod -@@ -1,6 +1,6 @@ - module github.com/lxc/incus/v7 - --go 1.26.7 -+go 1.26.6 - - require ( - github.com/FuturFusion/vsock v0.0.0-20260219213046-d78a7104f821 diff --git a/pkgs/by-name/in/incus/package.nix b/pkgs/by-name/in/incus/package.nix index ed520180bcae..ba73221152a9 100644 --- a/pkgs/by-name/in/incus/package.nix +++ b/pkgs/by-name/in/incus/package.nix @@ -2,9 +2,7 @@ import ./generic.nix { hash = "sha256-9q4YrumeCb8u0O6e0Ftisb33s2dz/DOdUO3JD05W8K0="; version = "7.4.0"; vendorHash = "sha256-zplmn+JH/zEaQgo2xa5wzc6rCIb5tLIVlM1vYJpw9zQ="; - patches = fetchpatch2: [ - ./go_1_26_6.patch - ]; + patches = fetchpatch2: [ ]; nixUpdateExtraArgs = [ "--override-filename=pkgs/by-name/in/incus/package.nix" ]; From 96885f7a131efa55a142bdeab380d554e3d0ae11 Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Fri, 25 Sep 2026 02:26:09 +0200 Subject: [PATCH 2/2] incus: 7.4.0 -> 7.5.1 Changelog: https://github.com/lxc/incus/releases/tag/v7.5.1 (cherry picked from commit f2e33f7ac29e8af6cd8524d9be1117d1f22a7756) --- pkgs/by-name/in/incus/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/in/incus/package.nix b/pkgs/by-name/in/incus/package.nix index ba73221152a9..a6ca1f8765ec 100644 --- a/pkgs/by-name/in/incus/package.nix +++ b/pkgs/by-name/in/incus/package.nix @@ -1,7 +1,7 @@ import ./generic.nix { - hash = "sha256-9q4YrumeCb8u0O6e0Ftisb33s2dz/DOdUO3JD05W8K0="; - version = "7.4.0"; - vendorHash = "sha256-zplmn+JH/zEaQgo2xa5wzc6rCIb5tLIVlM1vYJpw9zQ="; + hash = "sha256-Kqz1fF/0jvqOtYqYSPI37M5vmqNrpfdZx2isbLcJTJg="; + version = "7.5.1"; + vendorHash = "sha256-erg2ull2Dvw4lXIcjDyS/HVObqYUIh7k4GUsTJ61giY="; patches = fetchpatch2: [ ]; nixUpdateExtraArgs = [ "--override-filename=pkgs/by-name/in/incus/package.nix"