Merge staging-next into staging

Changed files
+41 -38
nixos
modules
services
hardware
sane_extra_backends
pkgs
applications
audio
bitwig-studio
networking
cluster
cmctl
fluxcd
terraform-providers
window-managers
berry
development
tools
oh-my-posh
rust
svd2rust
+2 -1
nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix
···
stdenv.mkDerivation {
-
name = "brscan4-etc-files-0.4.3-3";
+
pname = "brscan4-etc-files";
+
version = "0.4.3-3";
src = "${brscan4}/opt/brother/scanner/brscan4";
nativeBuildInputs = [ brscan4 ];
+2 -2
pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix
···
stdenv.mkDerivation rec {
pname = "bitwig-studio";
-
version = "4.4";
+
version = "4.4.1";
src = fetchurl {
url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb";
-
sha256 = "sha256-5xZTJc3NMhSnmrhls7EC+F5gPoHNmGih9Zwi5Hdg5V8=";
+
sha256 = "sha256-+NvQ7TA8WLnZKbzsB+jLl/CIg7tayKd+W2svtXtDsT4=";
};
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];
+2
pkgs/applications/networking/cluster/cmctl/default.nix
···
--zsh <($out/bin/cmctl completion zsh)
'';
+
passthru.updateScript = ./update.sh;
+
meta = with lib; {
description = "A CLI tool for managing cert-manager service on Kubernetes clusters";
longDescription = ''
+4 -4
pkgs/applications/networking/cluster/fluxcd/default.nix
···
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }:
let
-
version = "0.35.0";
-
sha256 = "11bbrxgfwvf6gnm402mcq6na75gcifx8m1b28pzspvw01p2yshf9";
-
manifestsSha256 = "0ink2cvysgnqvid4hh2x969iqc86pmz654nd7wv37iqndfhy7rd5";
+
version = "0.36.0";
+
sha256 = "1rjsdisj2cib8pyfc1lx5jgx0dksh0zhiqccgvqvfja24azvhc4n";
+
manifestsSha256 = "0kzbzn43i35kyl7h9kb4f21sbrz90jx9pj35002j2i1j20b2xzh8";
manifests = fetchzip {
url =
···
inherit sha256;
};
-
vendorSha256 = "sha256-HCBEMMFMoepr4bUYICAGMb2A42smgd3VlE7b9TR6LAc=";
+
vendorSha256 = "sha256-2N91+anR0nD9E563MgSQPwslR9J/uvSHLs6kD4Yc3So=";
postUnpack = ''
cp -r ${manifests} source/cmd/flux/manifests
+24 -24
pkgs/applications/networking/cluster/terraform-providers/providers.json
···
"version": "2.4.2"
},
"alicloud": {
-
"hash": "sha256-k5WZpqZvoL4R1kQ0CBWK8JLkWCvfpkl1b849ZbJsPxw=",
+
"hash": "sha256-CyubHE3YFGDt4T4dJ6ZHgvQ6V/nIHK/LODkl7Qm65Sk=",
"owner": "aliyun",
"provider-source-address": "registry.terraform.io/aliyun/alicloud",
"repo": "terraform-provider-alicloud",
-
"rev": "v1.188.0",
+
"rev": "v1.189.0",
"vendorHash": null,
-
"version": "1.188.0"
+
"version": "1.189.0"
},
"ansible": {
"hash": "sha256-3nha5V4rNgVzgqliebmbC5e12Lj/zlCsyyiIVFlmUrY=",
···
"version": "1.0.0"
},
"baiducloud": {
-
"hash": "sha256-ivVgHJveSkfoV+Ctf9G7HbZScfKQ85kxdeBDfOptl6Q=",
+
"hash": "sha256-9r9Y1iegVgaZk+2bKB0uHy6w0JotDuNUXemOqtJSAeg=",
"owner": "baidubce",
"provider-source-address": "registry.terraform.io/baidubce/baiducloud",
"repo": "terraform-provider-baiducloud",
-
"rev": "v1.15.11",
+
"rev": "v1.16.0",
"vendorHash": null,
-
"version": "1.15.11"
+
"version": "1.16.0"
},
"bigip": {
"hash": "sha256-uSe+J4AlW8Dt96BVF1ZI/yrgWUbZsl64b/D+k5ysHC0=",
···
"version": "1.3.0"
},
"cloudamqp": {
-
"hash": "sha256-RllW85iootELA7iz+UPD0s4KKP7gGRNHVwHd/CCUv0c=",
+
"hash": "sha256-EtFGqYNfyDbS4f1tjRTKcrQNFqEZmmILeuEOpwkx6/4=",
"owner": "cloudamqp",
"provider-source-address": "registry.terraform.io/cloudamqp/cloudamqp",
"repo": "terraform-provider-cloudamqp",
-
"rev": "v1.19.3",
-
"vendorHash": "sha256-S8xlMpsHeJePYyydUpBSuOxW0APZw8qxcm+Ou9u1rWc=",
-
"version": "1.19.3"
+
"rev": "v1.20.0",
+
"vendorHash": "sha256-fDYkeUOW9wuypAJR1YFEQp8KhtTfMr8NZeT7TMYXEmU=",
+
"version": "1.20.0"
},
"cloudflare": {
"hash": "sha256-uItV3BTB3bY8NrjD63oUWZMB0gEscEN4Y6aDTuDQW7c=",
···
"version": "0.11.0"
},
"datadog": {
-
"hash": "sha256-viQDfs3xOsGOsRmTB6LkdN1JPc95UYpQ6et2ud+Or94=",
+
"hash": "sha256-GSm1SIWEPdQls3FXkRjvcxZDRjpNAoUQK1zUHvU4tZo=",
"owner": "DataDog",
"provider-source-address": "registry.terraform.io/DataDog/datadog",
"repo": "terraform-provider-datadog",
-
"rev": "v3.16.0",
-
"vendorHash": "sha256-U533VGe37ItG5EK+fJo8Nj8t1MhDAHdT03ghQLL3WzI=",
-
"version": "3.16.0"
+
"rev": "v3.17.0",
+
"vendorHash": "sha256-xOXLwSKj48nY0ikh2+c8Ti1eNwnsizgAfWyhGE5ZAXE=",
+
"version": "3.17.0"
},
"dhall": {
"hash": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=",
···
"version": "2.2.0"
},
"github": {
-
"hash": "sha256-dUL01cuP5fQdPPm6+R1XDQNups5BJC2oq8LSjJ1+tB0=",
+
"hash": "sha256-sNm5/gj4QY7LvYpj5fUNcz/4gf+SiBaeu70VlWZC4aw=",
"owner": "integrations",
"provider-source-address": "registry.terraform.io/integrations/github",
"repo": "terraform-provider-github",
-
"rev": "v5.5.0",
+
"rev": "v5.6.0",
"vendorHash": null,
-
"version": "5.5.0"
+
"version": "5.6.0"
},
"gitlab": {
"hash": "sha256-eNd1o0UjG6A9OTRmcJfcPLLtWIJmdZ+viDnSZhyHpgY=",
···
"version": "2.7.1"
},
"heroku": {
-
"hash": "sha256-V6jShbhVwsUTxj2tp2msIseZnckHgB7bBswqIRlrwjQ=",
+
"hash": "sha256-NabwjOTbBRlDNFBpCshxZMO9E958tfAIPPuyArvacFI=",
"owner": "heroku",
"provider-source-address": "registry.terraform.io/heroku/heroku",
"repo": "terraform-provider-heroku",
-
"rev": "v5.1.5",
+
"rev": "v5.1.6",
"vendorHash": null,
-
"version": "5.1.5"
+
"version": "5.1.6"
},
"hetznerdns": {
"hash": "sha256-wmXZ6+5Ex3G2JUdw2is2VIo/X1X0V1Auw5KmYpGllug=",
···
"version": "1.78.5"
},
"tfe": {
-
"hash": "sha256-jh5bRe/3OsdgvSpraYEc1NgvBmYb1tFuVSPQ2ZAesSY=",
+
"hash": "sha256-MDlRwB2iVi/Rv7/UtukI6mIDImz8Gnpm5Qv5R6EDpiU=",
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/tfe",
"repo": "terraform-provider-tfe",
-
"rev": "v0.37.0",
-
"vendorHash": "sha256-Su5WpKF9zXeGKdaV8TxsTc6OGUYToNnXAbxWaNxS52U=",
-
"version": "0.37.0"
+
"rev": "v0.38.0",
+
"vendorHash": "sha256-reXq1MyAhHRet1WwDJZafdOg1r7J4sktQ/QhQUPhDak=",
+
"version": "0.38.0"
},
"thunder": {
"hash": "sha256-fXvwBOIW3/76V3O9t25wff0oGViqSaSB2VgMdItXyn4=",
+2 -2
pkgs/applications/window-managers/berry/default.nix
···
stdenv.mkDerivation rec {
pname = "berry";
-
version = "0.1.11";
+
version = "0.1.12";
src = fetchFromGitHub {
owner = "JLErvin";
repo = pname;
rev = version;
-
hash = "sha256-cs1NVwaANMIteCQuGqPcEWuUbfJulhjmfWnlU8Eb2OM=";
+
hash = "sha256-xMJRiLNtwVRQf9HiCF3ClLKEmdDNxcY35IYxe+L7+Hk=";
};
nativeBuildInputs = [
+2 -2
pkgs/development/tools/oh-my-posh/default.nix
···
buildGoModule rec {
pname = "oh-my-posh";
-
version = "12.6.8";
+
version = "12.7.1";
src = fetchFromGitHub {
owner = "jandedobbeleer";
repo = pname;
rev = "v${version}";
-
sha256 = "sha256-Tn3XOkNBV6hOAV8SuOKX5ktplTtn/HXc+8hdl96XuJU=";
+
sha256 = "sha256-vTOxH4nRneyed4vuEq1b6ACSnl3neLvQdLlIH9Stu7k=";
};
vendorSha256 = "sha256-OrtKFkWXqVoXKmN6BT8YbCNjR1gRTT4gPNwmirn7fjU=";
+3 -3
pkgs/development/tools/rust/svd2rust/default.nix
···
rustPlatform.buildRustPackage rec {
pname = "svd2rust";
-
version = "0.26.0";
+
version = "0.27.0";
src = fetchCrate {
inherit pname version;
-
sha256 = "sha256-XoiAnJDTwO93cMH8Z8mJbPfVMhq7c/Xc38gUNYmSX6Y=";
+
sha256 = "sha256-fU/qaYuuZM9tfveWYD4tCJugLELTR4DlQsr4WP/0f4o=";
};
-
cargoSha256 = "sha256-5mu+8tmO70PZq13VuFeovgAmhPmL5G4ju5AvjsC7Idc=";
+
cargoSha256 = "sha256-csiwkBOiIzIVADjKFE8YvBRO0iqtEr4I4s0XDMyb7Sc=";
meta = with lib; {
description = "Generate Rust register maps (`struct`s) from SVD files";