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

.github/ISSUE_TEMPLATE/unreproducible_package.md

+2 −2

Original line number	Diff line number	Diff line
		@@ -14,10 +14,10 @@ Fixing bit-by-bit reproducibility also has additional advantages, such as avoidi
		### Steps To Reproduce

		```
		nix-build '<nixpkgs>' -A ... --check --keep-failed
		nix-build '<nixpkgs>' -A ... && nix-build '<nixpkgs>' -A ... --check --keep-failed
		```

		You can use `diffoscope` to analyze the differences in the output of the two builds.
		If this command completes successfully, no differences where found. However, when it ends in `error: derivation '<X>' may not be deterministic: output '<Y>' differs from '<Z>'`, you can use `diffoscope <Y> <Z>` to analyze the differences in the output of the two builds.

		To view the build log of the build that produced the artifact in the binary cache:

maintainers/maintainer-list.nix

+6 −6

Original line number	Diff line number	Diff line
		@@ -1771,12 +1771,6 @@
		githubId = 1217745;
		name = "Aldwin Vlasblom";
		};
		aveltras = {
		email = "romain.viallard@outlook.fr";
		github = "aveltras";
		githubId = 790607;
		name = "Romain Viallard";
		};
		averelld = {
		email = "averell+nixos@rxd4.com";
		github = "averelld";
		@@ -7884,6 +7878,12 @@
		githubId = 2212681;
		name = "Jakub Grzgorz Sokołowski";
		};
		jakuzure = {
		email = "shin@posteo.jp";
		github = "jakuzure";
		githubId = 11823547;
		name = "jakuzure";
		};
		jali-clarke = {
		email = "jinnah.ali-clarke@outlook.com";
		name = "Jinnah Ali-Clarke";

nixos/modules/services/backup/borgmatic.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@ in
		config = mkIf cfg.enable {

		warnings = []
		++ optional (cfg.settings != null && cfg.settings.location != null)
		++ optional (cfg.settings != null && cfg.settings ? location)
		"`services.borgmatic.settings.location` is deprecated, please move your options out of sections to the global scope"
		++ optional (catAttrs "location" (attrValues cfg.configurations) != [])
		"`services.borgmatic.configurations.<name>.location` is deprecated, please move your options out of sections to the global scope"

nixos/release.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -123,7 +123,7 @@ let
		build = configEvaled.config.system.build;
		kernelTarget = configEvaled.pkgs.stdenv.hostPlatform.linux-kernel.target;
		in
		pkgs.symlinkJoin {
		configEvaled.pkgs.symlinkJoin {
		name = "netboot";
		paths = [
		build.netbootRamdisk

pkgs/applications/audio/cadence/default.nix

deleted100644 → 0

+0 −112

Original line number	Diff line number	Diff line
		{ lib
		, libjack2
		, fetchpatch
		, fetchFromGitHub
		, jack_capture
		, pkg-config
		, pulseaudioFull
		, qtbase
		, mkDerivation
		, python3
		}:
		#ladish missing, claudia can't work.
		#pulseaudio needs fixes (patchShebangs .pa ...)
		#desktop needs icons and exec fixing.

		mkDerivation rec {
		version = "0.9.1";
		pname = "cadence";

		src = fetchFromGitHub {
		owner = "falkTX";
		repo = "Cadence";
		rev = "v${version}";
		sha256 = "sha256-QFC4wiVF8wphhrammxtc+VMZJpXY5OGHs6DNa21+6B8=";
		};

		patches = [
		# Fix installation without DESTDIR
		(fetchpatch {
		url = "https://github.com/falkTX/Cadence/commit/1fd3275e7daf4b75f59ef1f85a9e2e93bd5c0731.patch";
		sha256 = "0q791jsh8vmjg678dzhbp1ykq8xrrlxl1mbgs3g8if1ccj210vd8";
		})
		# Fix build with Qt 5.15
		(fetchpatch {
		url = "https://github.com/falkTX/Cadence/commit/c167f35fbb76c4246c730b29262a59da73010412.patch";
		sha256 = "1gm9q6gx03sla5vcnisznc95pjdi2703f8b3mj2kby9rfx2pylyh";
		})
		];

		postPatch = ''
		libjackso=$(realpath ${lib.makeLibraryPath [libjack2]}/libjack.so.0);
		substituteInPlace ./src/jacklib.py --replace libjack.so.0 $libjackso
		substituteInPlace ./src/cadence.py --replace "/usr/bin/pulseaudio" \
		"${lib.makeBinPath[pulseaudioFull]}/pulseaudio"
		substituteInPlace ./c++/jackbridge/JackBridge.cpp --replace libjack.so.0 $libjackso
		'';

		nativeBuildInputs = [
		pkg-config
		];

		buildInputs = [
		qtbase
		jack_capture
		pulseaudioFull
		(
		(python3.withPackages (ps: with ps; [
		pyqt5
		dbus-python
		]))
		)
		];

		makeFlags = [
		"PREFIX=${placeholder "out"}"
		"SYSCONFDIR=${placeholder "out"}/etc"
		];

		dontWrapQtApps = true;

		# Replace with our own wrappers. They need to be changed manually since it wouldn't work otherwise.
		preFixup =
		let
		outRef = placeholder "out";
		prefix = "${outRef}/share/cadence/src";
		scriptAndSource = lib.mapAttrs'
		(script: source:
		lib.nameValuePair ("${outRef}/bin/" + script) ("${prefix}/" + source)
		)
		{
		"cadence" = "cadence.py";
		"claudia" = "claudia.py";
		"catarina" = "catarina.py";
		"catia" = "catia.py";
		"cadence-jacksettings" = "jacksettings.py";
		"cadence-aloop-daemon" = "cadence_aloop_daemon.py";
		"cadence-logs" = "logs.py";
		"cadence-render" = "render.py";
		"claudia-launcher" = "claudia_launcher.py";
		"cadence-session-start" = "cadence_session_start.py";
		};
		in
		lib.mapAttrsToList
		(script: source: ''
		rm -f ${script}
		makeQtWrapper ${source} ${script} \
		--prefix PATH : "${lib.makeBinPath [
		jack_capture # cadence-render
		pulseaudioFull # cadence, cadence-session-start
		]}"
		'')
		scriptAndSource;

		meta = {
		homepage = "https://github.com/falkTX/Cadence/";
		description = "Collection of tools useful for audio production";
		license = lib.licenses.gpl2Plus;
		maintainers = with lib.maintainers; [ ];
		platforms = [ "x86_64-linux" ];
		mainProgram = "cadence";
		};
		}