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

maintainers/maintainer-list.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -3812,6 +3812,12 @@
		githubId = 199180;
		name = "Claes Wallin";
		};
		claes = {
		email = "claes.holmerson@gmail.com";
		github = "claes";
		githubId = 43564;
		name = "Claes Holmerson";
		};
		clebs = {
		email = "borja.clemente@gmail.com";
		github = "clebs";

+10 −7

Original line number	Diff line number	Diff line
		@@ -19,21 +19,22 @@
		mpg123,
		opusfile,
		pango,
		pipewire,
		wavpack,
		ffmpeg,
		pulseaudio,
		withDiscordRPC ? false,
		withDiscordRPC ? true,
		}:

		stdenv.mkDerivation (finalAttrs: {
		pname = "tauon";
		version = "7.8.0";
		version = "7.8.2";

		src = fetchFromGitHub {
		owner = "Taiko2k";
		repo = "TauonMusicBox";
		repo = "Tauon";
		rev = "v${finalAttrs.version}";
		hash = "sha256-8UnUcEvG206tPwyD+WqxcJgDvQlYvTJ6v+sm0u30Z3k=";
		hash = "sha256-fVp3RWRNIBSeALbYNRIYjyWNH9An+YnS7neQt0x33yI=";
		};

		postUnpack = ''
		@@ -54,15 +55,16 @@ stdenv.mkDerivation (finalAttrs: {
		--replace-fail 'libopenmpt.so' '${lib.getLib libopenmpt}/lib/libopenmpt.so'

		substituteInPlace t_modules/t_phazor.py \
		--replace-fail 'lib/libphazor.so' '../../lib/libphazor.so'
		--replace-fail 'lib/libphazor' '../../lib/libphazor'

		substituteInPlace compile-phazor.sh --replace-fail 'gcc' '${stdenv.cc.targetPrefix}cc'
		substituteInPlace compile-phazor*.sh --replace-fail 'gcc' '${stdenv.cc.targetPrefix}cc'

		substituteInPlace extra/tauonmb.desktop --replace-fail 'Exec=/opt/tauon-music-box/tauonmb.sh' 'Exec=${placeholder "out"}/bin/tauon'
		'';

		postBuild = ''
		bash ./compile-phazor.sh
		bash ./compile-phazor-pipewire.sh
		'';

		nativeBuildInputs = [
		@@ -84,6 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
		mpg123
		opusfile
		pango
		pipewire
		wavpack
		];

		@@ -92,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
		[
		beautifulsoup4
		dbus-python
		isounidecode
		unidecode
		jxlpy
		musicbrainzngs
		mutagen

+2 −2

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

		buildDotnetModule rec {
		pname = "btcpayserver";
		version = "1.13.1";
		version = "1.13.5";

		src = fetchFromGitHub {
		owner = pname;
		repo = pname;
		rev = "v${version}";
		sha256 = "sha256-p0GNwwbhsgChlSlPVD/RHhzWF/1URdYp/iYQmJxORU8=";
		sha256 = "sha256-xga/v+4keZSgayPzitchzV4IRdui1IBPYB/uNVVMIaM=";
		};

		projectFile = "BTCPayServer/BTCPayServer.csproj";

+378 −371

File changed.

Preview size limit exceeded, changes collapsed.

+2 −2

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

		buildDotnetModule rec {
		pname = "nbxplorer";
		version = "2.5.2";
		version = "2.5.6";

		src = fetchFromGitHub {
		owner = "dgarage";
		repo = "NBXplorer";
		rev = "v${version}";
		sha256 = "sha256-zfL+VoDfICUtw02KeRghaq3XPOa/YnSh8orhqmo3Auo=";
		sha256 = "sha256-GPquY5kfn08TUCum/INdHPasx8BWK2mf+PQlSgTl4iw=";
		};

		projectFile = "NBXplorer/NBXplorer.csproj";