diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2024-05-11 12:47:40 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2024-05-11 12:47:40 +0200 |
| commit | 4be4408157159e40a946af47bb2f646efbbc5519 (patch) | |
| tree | 4ad14315153832c4ff287a8239b876e02b08b75e /pkgs/by-name/in | |
| parent | 9a226faa3885169ccb8d9677d57aa27b000786c7 (diff) | |
| parent | 435233f4d1f4f592716f661d9c5657b40e78bfc1 (diff) | |
Merge branch 'master' into staging-next
; Conflicts: ; maintainers/scripts/luarocks-packages.csv ; pkgs/development/lua-modules/generated-packages.nix
Diffstat (limited to 'pkgs/by-name/in')
| -rw-r--r-- | pkgs/by-name/in/incus/generic.nix | 2 | ||||
| -rw-r--r-- | pkgs/by-name/in/incus/package.nix | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/by-name/in/incus/generic.nix b/pkgs/by-name/in/incus/generic.nix index dacbe6e96e3f1..56b10804079b7 100644 --- a/pkgs/by-name/in/incus/generic.nix +++ b/pkgs/by-name/in/incus/generic.nix @@ -113,7 +113,7 @@ buildGoModule rec { ; }; - tests = nixosTests.incus; + tests = if lts then nixosTests.incus-lts else nixosTests.incus; ui = callPackage ./ui.nix { }; diff --git a/pkgs/by-name/in/incus/package.nix b/pkgs/by-name/in/incus/package.nix index 50fccf3e77ee4..be289a05e0772 100644 --- a/pkgs/by-name/in/incus/package.nix +++ b/pkgs/by-name/in/incus/package.nix @@ -1,6 +1,6 @@ import ./generic.nix { - hash = "sha256-+q5qP7w2RdtuwvxPThCryYYEJ7s5WDnWHRvjo4TuajA="; - version = "6.0.0"; - vendorHash = "sha256-wcauzIbBcYpSWttZCVVE9m49AEQGolGYSsv9eEkhb7Y="; + hash = "sha256-BFB4bdfh3hI7D1m7a20ckPPyP9CYXW7mjqeTZ/21Gqs="; + version = "6.1.0"; + vendorHash = "sha256-a8ZPhzs7sNIJLjQ9Y87Zf9SXAsmbdVn250Q0OQwy69A="; patches = [ ]; } |