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

nixos/release-combined.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ in rec {
		(onFullSupported "nixos.dummy")
		(onAllSupported "nixos.iso_minimal")
		(onSystems ["x86_64-linux" "aarch64-linux"] "nixos.amazonImage")
		(onFullSupported "nixos.iso_plasma5")
		(onFullSupported "nixos.iso_plasma6")
		(onFullSupported "nixos.iso_gnome")
		(onFullSupported "nixos.manual")
		(onSystems ["x86_64-linux"] "nixos.ova")

+2 −1

Original line number	Diff line number	Diff line
		@@ -98,6 +98,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
		driver = Firefox(options=options, service=service)
		driver = Firefox(options=options)
		driver.implicitly_wait(30)
		driver.set_page_load_timeout(60)

		# install ##########################################################

		@@ -207,7 +208,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
		text = ''
		out=/tmp/podcast.mp3
		sox -n -r 48000 -t wav - synth ${targetPodcastDuration} sine 440 `
		`\| lame --noreplaygain -cbr -q 9 -b 320 - $out
		`\| lame --noreplaygain --cbr -q 9 -b 320 - $out
		FILESIZE="$(stat -c%s $out)"
		[ "$FILESIZE" -gt 0 ]
		[ "$FILESIZE" -le "${toString targetPodcastSize}" ]

+15 −9

Original line number	Diff line number	Diff line
		@@ -36,13 +36,13 @@ in

		stdenv.mkDerivation (finalAttrs: {
		pname = "imagemagick";
		version = "6.9.12-68";
		version = "6.9.13-10";

		src = fetchFromGitHub {
		owner = "ImageMagick";
		repo = "ImageMagick6";
		rev = finalAttrs.version;
		sha256 = "sha256-slQcA0cblxtG/1DiJx5swUh7Kfwgz5HG70eqJFLaQJI=";
		sha256 = "sha256-AdlJaCJOrN+NkkzzzgELtgAr5iZ9dvlVYVc7tYiM+R8=";
		};

		outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
		@@ -121,24 +121,30 @@ stdenv.mkDerivation (finalAttrs: {
		maintainers = with maintainers; [ ];
		license = licenses.asl20;
		knownVulnerabilities = [
		"CVE-2018-16328"
		"CVE-2018-16329"
		"CVE-2019-13136"
		"CVE-2019-17547"
		"CVE-2020-25663"
		"CVE-2020-27768"
		"CVE-2021-3596"
		"CVE-2021-3596"
		"CVE-2021-3596"
		"CVE-2021-3610"
		"CVE-2021-20244"
		"CVE-2020-27769"
		"CVE-2020-27829"
		"CVE-2021-20243"
		"CVE-2021-20244"
		"CVE-2021-20310"
		"CVE-2021-20311"
		"CVE-2021-20312"
		"CVE-2021-20313"
		"CVE-2021-3596"
		"CVE-2022-0284"
		"CVE-2022-2719"
		"CVE-2023-1289"
		"CVE-2023-2157"
		"CVE-2023-34151"
		"CVE-2023-34152"
		"CVE-2023-34153"
		"CVE-2023-3428"
		"CVE-2023-34474"
		"CVE-2023-34475"
		"CVE-2023-5341"
		];
		};
		})

+6 −6

Original line number	Diff line number	Diff line
		{
		beta = import ./browser.nix {
		channel = "beta";
		version = "125.0.2535.37";
		version = "125.0.2535.51";
		revision = "1";
		hash = "sha256-/fZcFIVj4stIxim2UYsxA5rNkyGf/i3eDf25npsdDi4=";
		hash = "sha256-ZOuC4+1Vp+i/vA783h+ilz97YwPwLMwk5eoc2hR5Y9E=";
		};
		dev = import ./browser.nix {
		channel = "dev";
		version = "126.0.2566.1";
		version = "126.0.2578.1";
		revision = "1";
		hash = "sha256-PePosWGdkLm5OK82YP9LQbvVz5de8KL06I6rv0TKP3A=";
		hash = "sha256-L1w8d0IdqCps7BuyL3AWMzPPkZtwLuiA+Z/dWSlEJU8=";
		};
		stable = import ./browser.nix {
		channel = "stable";
		version = "124.0.2478.97";
		version = "125.0.2535.51";
		revision = "1";
		hash = "sha256-hdCtHWOEez3VTw8hTRiitURiu0MpFTbnc60biym795k=";
		hash = "sha256-bpI3ePjjJLAoF/+ygXWYV1RY/FxOjs6/V8N0XWcal70=";
		};
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
		scitokens-cpp
		];

		env.CXXFLAGS = "-fpermissive";

		cmakeFlags = [ "-DSYSTEM_NAME=NixOS" "-DWITH_PYTHON_BINDINGS=false" ];