Merge master into staging-next (249b458e) · Commits · nix / nixpkgs

nixos/modules/hardware/opengl.nix

+4 −4

Original line number	Diff line number	Diff line
		@@ -90,8 +90,8 @@ in

		mesaPackage = mkOption {
		type = types.package;
		default = pkgs.mesa_23;
		defaultText = literalExpression "pkgs.mesa_23";
		default = pkgs.mesa;
		defaultText = literalExpression "pkgs.mesa";
		example = literalExpression "pkgs.mesa_22";
		description = lib.mdDoc ''
		The Mesa driver package used for rendering support on the system.
		@@ -103,8 +103,8 @@ in
		};
		mesaPackage32 = mkOption {
		type = types.package;
		default = pkgs.pkgsi686Linux.mesa_23;
		defaultText = literalExpression "pkgs.pkgsi686Linux.mesa_23";
		default = pkgs.pkgsi686Linux.mesa;
		defaultText = literalExpression "pkgs.pkgsi686Linux.mesa";
		example = literalExpression "pkgs.pkgsi686Linux.mesa_22";
		description = lib.mdDoc ''
		Same as {option}`mesaPackage` but for the 32-bit Mesa on 64-bit

+2 −2

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

		stdenv.mkDerivation rec {
		name = "holochain-launcher";
		version = "0.9.2";
		version = "0.9.3";

		src = fetchurl {
		url = "https://github.com/holochain/launcher/releases/download/v${version}/holochain-launcher_${version}_amd64.deb";
		sha256 = "sha256-ipcv1rP4DDjBEybmntsfw2ubjCgm1cGDlYM7sN0jeVo=";
		sha256 = "sha256-hvnOB6cTL+VffwtBulrEzujxVZEQMSDoJx2HjivJ9z8=";
		};

		nativeBuildInputs = [

0 → 100644

+66 −0

Original line number	Diff line number	Diff line
		{ lib
		, stdenv
		, fetchFromGitHub
		, fetchpatch
		, cmake
		, pkg-config
		, libuv
		, libX11
		, libXi
		, libyaml
		, luajit
		, udev
		}:

		stdenv.mkDerivation rec {
		pname = "keyleds";
		version = "unstable-2021-04-08";

		src = fetchFromGitHub {
		owner = "keyleds";
		repo = pname;
		rev = "171361654a64b570d747c2d196acb2da4b8dc293";
		sha256 = "sha256-mojgHMT0gni0Po0hiZqQ8eMzqfwUipXue1uqpionihw=";
		};

		# This commit corresponds to the following open PR:
		# https://github.com/keyleds/keyleds/pull/74
		# According to the author of the PR, the maintainer of keyleds is unreachable.
		# This patch fixes the build process which is broken on the current master branch of keyleds.
		patches = [
		(fetchpatch {
		url = "https://github.com/keyleds/keyleds/commit/bffed5eb181127df915002b6ed830f85f15feafd.patch";
		sha256 = "sha256-i2N3D/K++34JVqJloNK2UcN473NarIjdjAz6PUhXcNY=";
		})
		];

		strictDeps = true;

		nativeBuildInputs = [
		cmake
		pkg-config
		];

		buildInputs = [
		libuv
		libX11
		libXi
		libyaml
		luajit
		udev
		];

		enableParallelBuilding = true;

		cmakeFlags = [
		"-DCMAKE_BUILD_TYPE=MinSizeRel"
		];

		meta = {
		homepage = "https://github.com/keyleds/keyleds";
		description = "Advanced RGB animation service for Logitech keyboards";
		license = lib.licenses.gpl3;
		platforms = lib.platforms.linux;
		maintainers = with lib.maintainers; [ GaetanLepage ];
		};
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -2,13 +2,13 @@

		python3Packages.buildPythonApplication rec {
		pname = "yewtube";
		version = "2.10.1";
		version = "2.10.2";

		src = fetchFromGitHub {
		owner = "mps-youtube";
		repo = "yewtube";
		rev = "refs/tags/v${version}";
		hash = "sha256-1qYHgMp9OZQuKDycvVwp0ADvF8xNY668JvRMVIE/dko=";
		hash = "sha256-yqztce6t7VTtrumxbhbikYY54FiyUaegBPYSnF4wTkU=";
		};

		postPatch = ''

+2 −2

Original line number	Diff line number	Diff line
		@@ -2,13 +2,13 @@

		buildGoModule rec {
		pname = "argocd";
		version = "2.6.5";
		version = "2.6.7";

		src = fetchFromGitHub {
		owner = "argoproj";
		repo = "argo-cd";
		rev = "v${version}";
		sha256 = "sha256-+3d20bD2sxck8fCrMv6Z9O70g7iWdHA5FdFVoLDtY2k=";
		sha256 = "sha256-KvnKz+NxCiCqX/lDsm4YdrUmtK028D9KM9Ke9mxiZQw=";
		};

		proxyVendor = true; # darwin/linux hash mismatch