ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-17 06:06:13 +03:00
Code Issues Projects Releases Wiki Activity

incus: fix broken custom storage volume

Browse Source
This commit is contained in:
Adam Stephens 2024-02-24 13:11:18 -05:00
parent cc0e4bb80c
commit d6e0a22033
No known key found for this signature in database
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/by-name/in/incus/client.nix
View File

@ -3,12 +3,13 @@
lib, lib,
buildGoModule, buildGoModule,
fetchpatch,
fetchFromGitHub, fetchFromGitHub,
installShellFiles, installShellFiles,
}: }:
let let
releaseFile = if lts then ./lts.nix else ./latest.nix; releaseFile = if lts then ./lts.nix else ./latest.nix;
inherit (import releaseFile) version hash vendorHash; inherit (import releaseFile { inherit fetchpatch; }) version hash vendorHash;
in in
buildGoModule rec { buildGoModule rec {

7
pkgs/by-name/in/incus/latest.nix
View File

@ -1,5 +1,12 @@
{ fetchpatch }:
{ {
hash = "sha256-tGuAS0lZvoYb+TvmCklQ8TADZhbm4w/lhdI0ycS4/0o="; hash = "sha256-tGuAS0lZvoYb+TvmCklQ8TADZhbm4w/lhdI0ycS4/0o=";
version = "0.6.0"; version = "0.6.0";
vendorHash = "sha256-+WmgLOEBJ/7GF596iiTgyTPxn8l+hE6RVqjLKfCi5rs="; vendorHash = "sha256-+WmgLOEBJ/7GF596iiTgyTPxn8l+hE6RVqjLKfCi5rs=";
patches = [
(fetchpatch {
url = "https://github.com/lxc/incus/pull/529.patch";
hash = "sha256-2aaPrzW/LVJidWeom0rqYOGpT2gvuV1yHLJN/TwQ1fk=";
})
];
} }

2
pkgs/by-name/in/incus/lts.nix
View File

@ -1,3 +1,3 @@
# this release doesn't exist yet, but satisfay the by-name checks # this release doesn't exist yet, but satisfay the by-name checks
# will be added as incus-lts in all-packages.nix once ready # will be added as incus-lts in all-packages.nix once ready
{ } _: { }

12
pkgs/by-name/in/incus/unwrapped.nix
View File

@ -3,6 +3,7 @@
lib, lib,
buildGoModule, buildGoModule,
fetchpatch,
fetchFromGitHub, fetchFromGitHub,
writeShellScript, writeShellScript,
acl, acl,
@ -19,14 +20,19 @@
let let
releaseFile = if lts then ./lts.nix else ./latest.nix; 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"}"; name = "incus${lib.optionalString lts "-lts"}";
in in
buildGoModule rec { buildGoModule {
pname = "${name}-unwrapped"; pname = "${name}-unwrapped";
inherit vendorHash version; inherit patches vendorHash version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxc"; owner = "lxc";