Merge branch 'master' into staging-next
This commit is contained in:
commit
e204eefe86
|
@ -17,8 +17,8 @@
|
|||
, fftwFloat
|
||||
, flex
|
||||
, glib
|
||||
, gtk3
|
||||
, gtksourceview3
|
||||
, gtk4
|
||||
, gtksourceview5
|
||||
, guile
|
||||
, graphviz
|
||||
, help2man
|
||||
|
@ -56,17 +56,19 @@
|
|||
, xxHash
|
||||
, vamp-plugin-sdk
|
||||
, zstd
|
||||
, libadwaita
|
||||
, sassc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zrythm";
|
||||
version = "1.0.0-alpha.26.0.13";
|
||||
version = "1.0.0-alpha.28.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dkXlkJ+qlfxV9Bv2UvZZa2iRVm8tgpK4JxkWL2Jeq48=";
|
||||
sha256 = "sha256-ERE7I6E3+RmmpnZEtcJL/1v9a37IwFauVsbJvI9gsRQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -99,8 +101,8 @@ stdenv.mkDerivation rec {
|
|||
flex
|
||||
breeze-icons
|
||||
glib
|
||||
gtk3
|
||||
gtksourceview3
|
||||
gtk4
|
||||
gtksourceview5
|
||||
graphviz
|
||||
guile
|
||||
json-glib
|
||||
|
@ -128,6 +130,8 @@ stdenv.mkDerivation rec {
|
|||
xdg-utils
|
||||
xxHash
|
||||
zstd
|
||||
libadwaita
|
||||
sassc
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
|
@ -157,7 +161,7 @@ stdenv.mkDerivation rec {
|
|||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix GSETTINGS_SCHEMA_DIR : "$out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas/"
|
||||
)
|
||||
)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "velero";
|
||||
version = "1.7.1";
|
||||
version = "1.8.0";
|
||||
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware-tanzu";
|
||||
repo = "velero";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Jz3Tp5FqpmPuBscRB0KleQxtCvB43qmeLZNtGPnjuL0=";
|
||||
sha256 = "sha256-tQGAzQFrpCUAEzdd5vr4j2oIb6TKeN9DQm96TdP0n40=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
@ -18,9 +18,9 @@ buildGoModule rec {
|
|||
"-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean"
|
||||
];
|
||||
|
||||
vendorSha256 = "sha256-fX9FeoIkxxSi3dl5W2MZLz5vN1VHkPNpTBGRxGP5Qx8=";
|
||||
vendorSha256 = "sha256-DyQ+MHRNZFg80Yz/SCxhnF4NVbIsyhz4mApx0+kgHoA=";
|
||||
|
||||
excludedPackages = [ "issue-template-gen" "crd-gen" "release-tools" "velero-restic-restore-helper" "v1" "v1beta1" ];
|
||||
excludedPackages = [ "issue-template-gen" "release-tools" "v1" "velero-restic-restore-helper" ];
|
||||
|
||||
doCheck = false; # Tests expect a running cluster see https://github.com/vmware-tanzu/velero/tree/main/test/e2e
|
||||
doInstallCheck = true;
|
||||
|
|
Loading…
Reference in a new issue