Merge staging-next into staging (97b2abc6) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+10 −15

Original line number	Diff line number	Diff line
		@@ -2094,15 +2094,6 @@
		githubId = 68566724;
		name = "bootstrap-prime";
		};
		boppyt = {
		email = "boppy@nwcpz.com";
		github = "boppyt";
		githubId = 71049646;
		name = "Zack A";
		keys = [{
		fingerprint = "E8D7 5C19 9F65 269B 439D F77B 6310 C97D E31D 1545";
		}];
		};
		borisbabic = {
		email = "boris.ivan.babic@gmail.com";
		github = "borisbabic";
		@@ -13611,6 +13602,16 @@
		githubId = 17243347;
		name = "Sebastian Sellmeier";
		};
		sefidel = {
		name = "sefidel";
		email = "contact@sefidel.net";
		matrix = "@sef:exotic.sh";
		github = "sefidel";
		githubId = 71049646;
		keys = [{
		fingerprint = "8BDF DFB5 6842 2393 82A0 441B 9238 BC70 9E05 516A";
		}];
		};
		sei40kr = {
		name = "Seong Yong-ju";
		email = "sei40kr@gmail.com";
		@@ -16176,12 +16177,6 @@
		github = "wegank";
		githubId = 9713184;
		};
		weihua = {
		email = "luwh364@gmail.com";
		github = "weihua-lu";
		githubId = 9002575;
		name = "Weihua Lu";
		};
		welteki = {
		email = "welteki@pm.me";
		github = "welteki";

maintainers/team-list.nix

+5 −2

Original line number	Diff line number	Diff line
		@@ -424,11 +424,14 @@ with lib.maintainers; {

		llvm = {
		members = [
		dtzWill
		ericson2314
		sternenseemann
		lovek323
		dtzWill
		primeos
		qyliss
		raitobezarius
		rrbutani
		sternenseemann
		];
		scope = "Maintain LLVM package sets and related packages";
		shortName = "LLVM";

nixos/modules/hardware/opengl.nix

+33 −8

Original line number	Diff line number	Diff line
		@@ -69,19 +69,48 @@ in
		package = mkOption {
		type = types.package;
		internal = true;
		default = cfg.mesaPackage;
		description = lib.mdDoc ''
		The package that provides the OpenGL implementation.

		The default is Mesa's drivers which should cover all OpenGL-capable
		hardware. If you want to use another Mesa version, adjust
		{option}`mesaPackage`.
		'';
		};

		package32 = mkOption {
		type = types.package;
		internal = true;
		default = cfg.mesaPackage32;
		description = lib.mdDoc ''
		Same as {option}`package` but for the 32-bit OpenGL implementation on
		64-bit systems. Used when {option}`driSupport32Bit` is set.
		'';
		};

		mesaPackage = mkOption {
		type = types.package;
		default = pkgs.mesa_23;
		defaultText = literalExpression "pkgs.mesa_23";
		example = literalExpression "pkgs.mesa_22";
		description = lib.mdDoc ''
		The package that provides the 32-bit OpenGL implementation on
		64-bit systems. Used when {option}`driSupport32Bit` is
		set.
		The Mesa driver package used for rendering support on the system.

		You should only need to adjust this if you require a newer Mesa
		version for your hardware or because you need to patch a bug.
		'';
		apply = mesa: mesa.drivers or throw "`mesa` package must have a `drivers` output.";
		};
		mesaPackage32 = mkOption {
		type = types.package;
		default = pkgs.pkgsi686Linux.mesa_23;
		defaultText = literalExpression "pkgs.pkgsi686Linux.mesa_23";
		example = literalExpression "pkgs.pkgsi686Linux.mesa_22";
		description = lib.mdDoc ''
		Same as {option}`mesaPackage` but for the 32-bit Mesa on 64-bit
		systems. Used when {option}`driSupport32Bit` is set.
		'';
		apply = mesa: mesa.drivers or throw "`mesa` package must have a `drivers` output.";
		};

		extraPackages = mkOption {
		@@ -97,7 +126,6 @@ in
		:::
		'';
		};

		extraPackages32 = mkOption {
		type = types.listOf types.package;
		default = [];
		@@ -153,9 +181,6 @@ in
		environment.sessionVariables.LD_LIBRARY_PATH = mkIf cfg.setLdLibraryPath
		([ "/run/opengl-driver/lib" ] ++ optional cfg.driSupport32Bit "/run/opengl-driver-32/lib");

		hardware.opengl.package = mkDefault pkgs.mesa.drivers;
		hardware.opengl.package32 = mkDefault pkgs.pkgsi686Linux.mesa.drivers;

		boot.extraModulePackages = optional (elem "virtualbox" videoDrivers) kernelPackages.virtualboxGuestAdditions;
		};
		}

pkgs/applications/audio/ebumeter/default.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -4,11 +4,11 @@

		stdenv.mkDerivation rec {
		pname = "ebumeter";
		version = "0.4.2";
		version = "0.5.1";

		src = fetchurl {
		url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
		sha256 = "1wm9j1phmpicrp7jdsvdbc3mghdd92l61yl9qbps0brq2ljjyd5s";
		url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.xz";
		hash = "sha256-U2ZpNfvy+X1RdA9Q4gvFYzAxlgc6kYjJpQ/0sEX0A4I=";
		};

		buildInputs = [

pkgs/applications/audio/lingot/default.nix

+2 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@
		, alsa-lib
		, libpulseaudio
		, fftw
		, fftwFloat
		, json_c
		, libjack2
		, jackSupport ? true
		@@ -33,6 +34,7 @@ stdenv.mkDerivation rec {
		alsa-lib
		libpulseaudio
		fftw
		fftwFloat
		json_c
		] ++ lib.optional jackSupport libjack2;

Admin message