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

pkgs/applications/editors/emacs/make-emacs.nix

+5 −1

Original line number	Diff line number	Diff line
		@@ -66,7 +66,11 @@
		zlib,

		# Boolean flags
		withNativeCompilation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,

		# FIXME: Native compilation breaks build and runtime on macOS 15.4;
		# see <https://github.com/NixOS/nixpkgs/issues/395169>.
		withNativeCompilation ?
		stdenv.buildPlatform.canExecute stdenv.hostPlatform && !stdenv.hostPlatform.isDarwin,
		noGui ? false,
		srcRepo ? true,
		withAcl ? false,

pkgs/applications/emulators/wine/sources.nix

+28 −3

Original line number	Diff line number	Diff line
		@@ -65,6 +65,23 @@ let
		source ${./update-lib.sh}
		'';

		# Needed for wine versions < 10.2 to fix compatibility with binutils 2.44
		# https://github.com/NixOS/nixpkgs/issues/399714
		# https://bugs.winehq.org/show_bug.cgi?id=57819
		# https://gitlab.winehq.org/wine/wine/-/merge_requests/7328
		patches-binutils-2_44-fix-wine-older-than-10_2 = [
		(pkgs.fetchpatch {
		name = "ntdll-use-signed-type";
		url = "https://gitlab.winehq.org/wine/wine/-/commit/fd59962827a715d321f91c9bdb43f3e61f9ebbc.patch";
		hash = "sha256-PvFom9NJ32XZO1gYor9Cuk8+eaRFvmG572OAtNx1tks=";
		})
		(pkgs.fetchpatch {
		name = "winebuild-avoid using-idata-section";
		url = "https://gitlab.winehq.org/wine/wine/-/commit/c9519f68ea04915a60704534ab3afec5ec1b8fd7.patch";
		hash = "sha256-vA58SfAgCXoCT+NB4SRHi85AnI4kj9S2deHGp4L36vI=";
		})
		];

		inherit (pkgs) writeShellScript;
		in
		rec {
		@@ -96,7 +113,7 @@ rec {
		patches = [
		# Also look for root certificates at $NIX_SSL_CERT_FILE
		./cert-path.patch
		];
		] ++ patches-binutils-2_44-fix-wine-older-than-10_2;

		updateScript = writeShellScript "update-wine-stable" (''
		${updateScriptPreamble}
		@@ -118,7 +135,11 @@ rec {
		version = "10.5";
		url = "https://dl.winehq.org/wine/source/10.x/wine-${version}.tar.xz";
		hash = "sha256-wDbsHvR2dHdKX5lFgwIuni62j+j8GLOox55oWzvsibw=";
		inherit (stable) patches;

		patches = [
		# Also look for root certificates at $NIX_SSL_CERT_FILE
		./cert-path.patch
		];

		# see https://gitlab.winehq.org/wine/wine-staging
		staging = fetchFromGitLab {
		@@ -177,7 +198,11 @@ rec {
		version = "9.21";
		url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz";
		hash = "sha256-REK0f/2bLqRXEA427V/U5vTYKdnbeaJeYFF1qYjKL/8=";
		inherit (stable) patches;

		patches = [
		# Also look for root certificates at $NIX_SSL_CERT_FILE
		./cert-path.patch
		] ++ patches-binutils-2_44-fix-wine-older-than-10_2;

		# see https://gitlab.winehq.org/wine/wine-staging
		staging = fetchFromGitLab {

pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -10,13 +10,13 @@
		buildMozillaMach rec {
		pname = "firefox-devedition";
		binaryName = pname;
		version = "138.0b5";
		version = "138.0b9";
		applicationName = "Firefox Developer Edition";
		requireSigning = false;
		branding = "browser/branding/aurora";
		src = fetchurl {
		url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
		sha512 = "07da38a6aa19de812539ba9b286d5189607ef45e7d8665a0f42facdcf7b3f7854561ad3cb54dce7e049199574b7d6dff01dba03763730e49306efb82833270fb";
		sha512 = "cf737b8c394150430cda512a84ebdf04426db0c413863eb37a327c44fc952db7de1be07956aaded3ddb769480fb307a102c1f4f7dab4ba8a38f2371fdd35a961";
		};

		meta = {

pkgs/by-name/cl/clightning/package.nix

+2 −7

Original line number	Diff line number	Diff line
		@@ -28,11 +28,11 @@ let
		in
		stdenv.mkDerivation rec {
		pname = "clightning";
		version = "24.11.1";
		version = "25.02.1";

		src = fetchurl {
		url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
		hash = "sha256-FdrD+FA0t90oJnXjUA8oalU7DDjUv70fAteNxbhscgk=";
		hash = "sha256-0eRLc/bR4sjnNIKzhkX9yVCAoypf1TVhpa884mmVC54=";
		};

		# when building on darwin we need cctools to provide the correct libtool
		@@ -95,11 +95,6 @@ stdenv.mkDerivation rec {
		stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64
		) "-Wno-error=gnu-folding-constant";

		# The `clnrest` plugin requires a Python environment to run
		postInstall = ''
		rm -r $out/libexec/c-lightning/plugins/clnrest
		'';

		meta = with lib; {
		description = "Bitcoin Lightning Network implementation in C";
		longDescription = ''

pkgs/by-name/fu/furnace/package.nix

+5 −1

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@
		freetype,
		libsndfile,
		libX11,
		libGL,
		rtmidi,
		SDL2,
		zlib,
		@@ -63,16 +64,19 @@ stdenv.mkDerivation (finalAttrs: {
		libsndfile
		rtmidi
		SDL2
		libX11
		zlib
		portaudio
		]
		++ lib.optionals withGL [
		libGL
		]
		++ lib.optionals withJACK [
		libjack2
		]
		++ lib.optionals stdenv.hostPlatform.isLinux [
		# portaudio pkg-config is pulling this in as a link dependency, not set in propagatedBuildInputs
		alsa-lib
		libX11
		]
		++ lib.optionals stdenv.hostPlatform.isDarwin (
		with darwin.apple_sdk.frameworks;