Merge master into staging-next (8422d0b6) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+10 −9

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";

+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;

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
		description = "A lightweight text editor written in Lua";
		homepage = "https://github.com/lite-xl/lite-xl";
		license = licenses.mit;
		maintainers = with maintainers; [ boppyt ];
		maintainers = with maintainers; [ sefidel ];
		platforms = platforms.unix;
		};
		}

+2 −12

Original line number	Diff line number	Diff line
		@@ -3,7 +3,6 @@
		, alsa-lib
		, cmake
		, fetchFromGitHub
		, fetchpatch
		, gtkmm3
		, libepoxy
		, libpng
		@@ -34,25 +33,16 @@ stdenv.mkDerivation rec {
		"snes9x-gtk"
		else
		"snes9x";
		version = "1.62";
		version = "1.62.1";

		src = fetchFromGitHub {
		owner = "snes9xgit";
		repo = "snes9x";
		rev = version;
		fetchSubmodules = true;
		hash = "sha256-RcxFNmUbJp0rUugWOqQa3Sy/Hh18ZPOeDTxC0JY5GJQ=";
		hash = "sha256-y/tNJmmgigMEqjBWLyqxM/GQ2jcu4YXZjP0AbIjoPLg=";
		};

		patches = [
		# Fix cross-compilation, otherwise it fails to detect host compiler features
		# Doesn't affect non CC builds
		(fetchpatch {
		url = "https://github.com/snes9xgit/snes9x/commit/f39ab408f4151c16d44e45470cc0736ffb2803f8.patch";
		hash = "sha256-GMlHBsADEF+rycmEVgpWy220hZwld5D2e8fsYA7HblM=";
		})
		];

		nativeBuildInputs = [
		pkg-config
		python3

+6 −6

Original line number	Diff line number	Diff line
		@@ -48,23 +48,23 @@ let
		# and often with different versions. We write them on three lines
		# like this (rather than using {}) so that the updater script can
		# find where to edit them.
		versions.aarch64-darwin = "5.13.11.16405";
		versions.x86_64-darwin = "5.13.11.16405";
		versions.x86_64-linux = "5.13.11.1288";
		versions.aarch64-darwin = "5.14.0.16775";
		versions.x86_64-darwin = "5.14.0.16775";
		versions.x86_64-linux = "5.14.0.1720";

		srcs = {
		aarch64-darwin = fetchurl {
		url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
		name = "zoomusInstallerFull.pkg";
		hash = "sha256-YjERJ6B06/uloHRQVyZDLyf/2Gae0P7xdk4Db9aqROs=";
		hash = "sha256-79Jb5cv9OWYM55fB8wtP+qYJc67+gNdiw9VrqnQPJ5U=";
		};
		x86_64-darwin = fetchurl {
		url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
		hash = "sha256-g6n4SKdord7gRwBaYUle3+yi1eB0T36ilScTaCcU8us=";
		hash = "sha256-HetPvZ7Bv8bC4DdoNM+92bFFQnwDY26WiEniwrBNSfk=";
		};
		x86_64-linux = fetchurl {
		url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
		hash = "sha256-BdI3HEQVe9A3D6KJ45wHWsrfb+dhTZAp/xlcr9X92EU=";
		hash = "sha256-d8R2jfol5zAaI4qcpUIVdph899d7t/LRxQImXFzXXWo=";
		};
		};