Merge master into staging-nixos (d86efee9) · Commits · nix / nixpkgs

pkgs/applications/editors/vim/plugins/generated.nix

+13 −0

Original line number	Diff line number	Diff line
		@@ -606,6 +606,19 @@ final: prev: {
		meta.hydraPlatforms = [ ];
		};

		accent-vim = buildVimPlugin {
		pname = "accent.vim";
		version = "2025-01-29";
		src = fetchFromGitHub {
		owner = "Alligator";
		repo = "accent.vim";
		rev = "54e0b255cb2c93555014197c8adc59d631c25696";
		sha256 = "0mpap9348rmnnr3gma85xk5py84ax8gc54aj3n0w075yla5x0m0d";
		};
		meta.homepage = "https://github.com/Alligator/accent.vim/";
		meta.hydraPlatforms = [ ];
		};

		ack-vim = buildVimPlugin {
		pname = "ack.vim";
		version = "2018-02-27";

pkgs/applications/editors/vim/plugins/vim-plugin-names

+1 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,7 @@ https://github.com/svban/YankAssassin.vim/,HEAD,
		https://github.com/vim-scripts/YankRing.vim/,,
		https://github.com/ycm-core/YouCompleteMe/,,
		https://github.com/vim-scripts/a.vim/,,
		https://github.com/Alligator/accent.vim/,HEAD,
		https://github.com/mileszs/ack.vim/,,
		https://github.com/eikenb/acp/,,
		https://github.com/aznhe21/actions-preview.nvim/,,

pkgs/applications/networking/cluster/terraform-providers/providers.json

+11 −11

Original line number	Diff line number	Diff line
		@@ -624,13 +624,13 @@
		"vendorHash": null
		},
		"ibm": {
		"hash": "sha256-gHHJiFLVmgx+689hzGVRQZB2wcATJ41bqpcWFDV7HyI=",
		"hash": "sha256-+Ux/Xp598uRpRgBfVucrl8GYkpaKcmZ5h67ExdBEchY=",
		"homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
		"owner": "IBM-Cloud",
		"repo": "terraform-provider-ibm",
		"rev": "v1.83.1",
		"rev": "v1.83.3",
		"spdx": "MPL-2.0",
		"vendorHash": "sha256-UL+1OcRKvyyCNL7czv+Zc/arkX3gy+AoqxlgZpmINhE="
		"vendorHash": "sha256-G6kqcQMpNKioBEWNDGIYCJaoYv6EPAbu2Nh/8EkQGAA="
		},
		"icinga2": {
		"hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=",
		@@ -894,11 +894,11 @@
		"vendorHash": "sha256-ByB1ztK2/1pTFeO34eXVyQSSbe35qqoCeWe6MPZN7vY="
		},
		"oci": {
		"hash": "sha256-fEvo5R7HutlOmZ6DMvYKQiE0amwk/YPi1T2a55w70hQ=",
		"hash": "sha256-LnR1bXTr+j7tKALZll/dwUI+o9TepPGS0mAHGxYK7g0=",
		"homepage": "https://registry.terraform.io/providers/oracle/oci",
		"owner": "oracle",
		"repo": "terraform-provider-oci",
		"rev": "v7.21.0",
		"rev": "v7.22.0",
		"spdx": "MPL-2.0",
		"vendorHash": null
		},
		@@ -1128,13 +1128,13 @@
		"vendorHash": "sha256-at8i4gCFrJxE9fVIL5uI7iSFex0gLXu1SnlPKlZAmrY="
		},
		"scaleway": {
		"hash": "sha256-KEQT0PScUTtTVgsinC9kZlNwAuSCHKXtswM6qDwApTo=",
		"hash": "sha256-FT9V0qAs6NSULqOMsW9uolc1WgueUnU4vfL4rntMA1A=",
		"homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
		"owner": "scaleway",
		"repo": "terraform-provider-scaleway",
		"rev": "v2.60.3",
		"rev": "v2.60.4",
		"spdx": "MPL-2.0",
		"vendorHash": "sha256-rcidk22c7Pk3k8ZhJyBXo1y2KYRu1yzBVCVGA3GcGKM="
		"vendorHash": "sha256-OcKCtH4ciGrKwidTQC+yTWMyMfShJMsTnsKOyBxwLDg="
		},
		"secret": {
		"hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=",
		@@ -1146,13 +1146,13 @@
		"vendorHash": null
		},
		"selectel": {
		"hash": "sha256-4tU/S+YSOkQJSh1p/Fjx00i7RJYFv3OuicDvjTOGGPk=",
		"hash": "sha256-J0hz5qtT3bBKqoZ9SkZn0oxix1fIQRmwv7feME7CljM=",
		"homepage": "https://registry.terraform.io/providers/selectel/selectel",
		"owner": "selectel",
		"repo": "terraform-provider-selectel",
		"rev": "v6.6.0",
		"rev": "v6.8.0",
		"spdx": "MPL-2.0",
		"vendorHash": "sha256-uMZIze8sng80sCb6f9CsWHVMmUGMaaOD4Ezx9B2fAJ4="
		"vendorHash": "sha256-TQXj2Em665zhCqXiT2BG1xxvVCo0/G2SaQKUbqGwcQM="
		},
		"sentry": {
		"hash": "sha256-b5a0++mu6roN6VuJaBZEczfqA6Stt+a7fTOLGLvqPeQ=",

pkgs/by-name/ch/chatbox/package.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -6,11 +6,11 @@
		}:
		let
		pname = "chatbox";
		version = "1.16.3";
		version = "1.16.4";

		src = fetchurl {
		url = "https://download.chatboxai.app/releases/Chatbox-${version}-x86_64.AppImage";
		hash = "sha256-Vits1RCDAsaTglbFo1y2YeiNBGou9m6BScV+rMGp3Rw=";
		hash = "sha256-hLYOiSIOOTjBH0bxWeji7IzH9F38+e10MCXm88YgYdQ=";
		};

		appimageContents = appimageTools.extract { inherit pname version src; };

pkgs/by-name/op/openrgb-plugin-effects/package.nix

+17 −6

Original line number	Diff line number	Diff line
		@@ -2,11 +2,12 @@
		lib,
		stdenv,
		fetchFromGitLab,
		libsForQt5,
		openrgb,
		glib,
		openal,
		pkg-config,
		kdePackages,
		fetchpatch,
		}:

		stdenv.mkDerivation (finalAttrs: {
		@@ -21,20 +22,30 @@ stdenv.mkDerivation (finalAttrs: {
		fetchSubmodules = true;
		};

		patches = [
		# Fix Qt6 issues in OpenRGBPluginsFont.cpp
		(fetchpatch {
		url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin/-/commit/e952b0ed390045d4f4adec8e74b3126c2f8abcab.patch";
		hash = "sha256-xMsnVyrn/Cv2x2xQtAnPb5HJc+WolNx4v7h0TkTj9DU=";
		})
		./qt5compat.patch
		];

		postPatch = ''
		# Use the source of openrgb from nixpkgs instead of the submodule
		rm -r OpenRGB
		ln -s ${openrgb.src} OpenRGB
		'';

		nativeBuildInputs = with libsForQt5; [
		qmake
		nativeBuildInputs = [
		pkg-config
		wrapQtAppsHook
		kdePackages.wrapQtAppsHook
		kdePackages.qmake
		];

		buildInputs = with libsForQt5; [
		qtbase
		buildInputs = [
		kdePackages.qtbase
		kdePackages.qt5compat
		glib
		openal
		];