Merge master into staging-nixos (136c6b28) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -19266,6 +19266,12 @@
		githubId = 2946283;
		name = "Brian Cohen";
		};
		nouritsu = {
		name = "Aneesh Bhave";
		email = "aneesh1701@gmail.com";
		github = "nouritsu";
		githubId = 113834791;
		};
		nova-madeline = {
		matrix = "@nova:tchncs.de";
		github = "nova-r";

pkgs/applications/networking/browsers/firefox-bin/release_sources.nix

+619 −619

File changed.

Preview size limit exceeded, changes collapsed.

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -9,10 +9,10 @@

		buildMozillaMach rec {
		pname = "firefox";
		version = "147.0.2";
		version = "147.0.3";
		src = fetchurl {
		url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
		sha512 = "60f8c96dddb337f46746c22d3c282be5e58ce7dc7cd2ae65097eb6405a533a2baa2c7f48e178acfc7d7e2bee1b06bd07a1ae801dae9c9d7609c2fcec8e99e2e6";
		sha512 = "37e39c47d694eccdcabb7d8a0a4cfe1b02860a97f604653f364c60f4e98796ffc7f1c6ab51226b2e5034a4b4805ccc6ec3983f0d830c9f36692df2ec261273d9";
		};

		meta = {

pkgs/build-support/node/fetch-yarn-deps/default.nix

+4 −2

Original line number	Diff line number	Diff line
		@@ -30,7 +30,8 @@ let
		in
		{
		prefetch-yarn-deps = stdenv.mkDerivation {
		name = "prefetch-yarn-deps";
		pname = "prefetch-yarn-deps";
		inherit (lib.trivial) version;

		dontUnpack = true;
		dontBuild = true;
		@@ -66,7 +67,8 @@ in
		};

		fixup-yarn-lock = stdenv.mkDerivation {
		name = "fixup-yarn-lock";
		pname = "fixup-yarn-lock";
		inherit (lib.trivial) version;

		dontUnpack = true;
		dontBuild = true;

pkgs/by-name/ai/airwave/package.nix

+16 −27

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		lib,
		multiStdenv,
		fetchFromGitHub,
		wine,
		wineWowPackages,
		cmake,
		makeWrapper,
		file,
		@@ -12,33 +12,19 @@
		}:

		let
		wine-wow64 = wineWowPackages.stableFull;
		in
		multiStdenv.mkDerivation (finalAttrs: {
		pname = "airwave";
		version = "1.3.3";

		airwave-src = fetchFromGitHub {
		src = fetchFromGitHub {
		owner = "phantom-code";
		repo = "airwave";
		rev = version;
		sha256 = "1ban59skw422mak3cp57lj27hgq5d3a4f6y79ysjnamf8rpz9x4s";
		};

		wine-wow64 = wine.override {
		wineRelease = "stable";
		wineBuild = "wineWow";
		tag = finalAttrs.version;
		hash = "sha256-mvT0b0auKiu1T8cbR9RoBT94hKSnXDamqkIQPnUqVq0=";
		};

		wine-xembed = wine-wow64.overrideDerivation (oldAttrs: {
		patchFlags = [ "-p2" ];
		patches = [ "${airwave-src}/fix-xembed-wine-windows.patch" ];
		});

		in

		multiStdenv.mkDerivation {
		pname = "airwave";
		inherit version;

		src = airwave-src;

		nativeBuildInputs = [
		cmake
		makeWrapper
		@@ -49,17 +35,20 @@ multiStdenv.mkDerivation {
		file
		libX11
		qt5.qtbase
		wine-xembed
		wine-wow64
		];

		postPatch = ''
		substituteInPlace CMakeLists.txt \
		--replace-fail "cmake_minimum_required(VERSION 2.8.11)" "cmake_minimum_required(VERSION 3.10)"

		# Binaries not used directly should land in libexec/.
		substituteInPlace src/common/storage.cpp --replace '"/bin"' '"/libexec"'

		# For airwave-host-32.exe.so, point wineg++ to 32-bit versions of
		# these libraries, as $NIX_LDFLAGS contains only 64-bit ones.
		substituteInPlace src/host/CMakeLists.txt --replace '-m32' \
		'-m32 -L${wine-xembed}/lib -L${wine-xembed}/lib/wine -L${multiStdenv.cc.libc.out}/lib/32'
		'-m32 -L${lib.getLib wine-wow64}/lib -L${lib.getLib wine-wow64}/lib/wine -L${lib.getLib multiStdenv.cc.libc}/lib/32'
		'';

		# libstdc++.so link gets lost in 64-bit executables during
		@@ -75,8 +64,8 @@ multiStdenv.mkDerivation {
		mv $out/bin $out/libexec
		mkdir $out/bin
		mv $out/libexec/airwave-manager $out/bin
		wrapProgram $out/libexec/airwave-host-32.exe --set WINELOADER ${wine-xembed}/bin/wine
		wrapProgram $out/libexec/airwave-host-64.exe --set WINELOADER ${wine-xembed}/bin/wine64
		wrapProgram $out/libexec/airwave-host-32.exe --set WINELOADER ${lib.getExe' wine-wow64 "wine"}
		wrapProgram $out/libexec/airwave-host-64.exe --set WINELOADER ${lib.getExe' wine-wow64 "wine64"}
		'';

		meta = {
		@@ -95,4 +84,4 @@ multiStdenv.mkDerivation {
		maintainers = with lib.maintainers; [ michalrus ];
		hydraPlatforms = [ ];
		};
		}
		})