Merge master into staging-nixos (8239142d) · Commits · nix / nixpkgs

nixos/modules/system/boot/clevis.nix

+3 −2

Original line number	Diff line number	Diff line
		@@ -78,8 +78,8 @@ in
		copy_bin_and_libs ${pkgs.curl}/bin/curl
		copy_bin_and_libs ${pkgs.bashNonInteractive}/bin/bash
		copy_bin_and_libs ${pkgs.cryptsetup}/bin/cryptsetup
		copy_bin_and_libs ${pkgs.gnused}/bin/gnused
		copy_bin_and_libs ${pkgs.gnugrep}/bin/gnugrep
		copy_bin_and_libs ${pkgs.gnused}/bin/sed
		copy_bin_and_libs ${pkgs.gnugrep}/bin/grep

		copy_bin_and_libs ${pkgs.tpm2-tools}/bin/.tpm2-wrapped
		mv $out/bin/{.tpm2-wrapped,tpm2}
		@@ -106,6 +106,7 @@ in
		systemd = {
		extraBin = lib.mkIf systemd.enable {
		clevis = "${cfg.package}/bin/clevis";
		curl = "${pkgs.curl}/bin/curl";
		};

		storePaths = lib.mkIf systemd.enable [

pkgs/by-name/ab/ablog/package.nix

+2 −3

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@
		}:

		let
		version = "0.11.12";
		version = "0.11.13";
		in
		python3Packages.buildPythonApplication {
		pname = "ablog";
		@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication {
		owner = "sunpy";
		repo = "ablog";
		tag = "v${version}";
		hash = "sha256-bPTaxkuIKeypfnZItG9cl51flHBIx/yg0qENuiqQgY4=";
		hash = "sha256-P1eSN3wqlPNYbYW3Rkz2Y6yFcC379dt/qK8aVNwZRSs=";
		};

		build-system = with python3Packages; [
		@@ -43,7 +43,6 @@ python3Packages.buildPythonApplication {

		pytestFlags = [
		"--rootdir=src/ablog"
		"-Wignore::sphinx.deprecation.RemovedInSphinx90Warning" # Ignore ImportError
		];

		disabledTests = [

pkgs/by-name/cc/ccextractor/package.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@
		lib,
		stdenv,
		fetchFromGitHub,
		fetchpatch,
		writeTextFile,

		pkg-config,
		@@ -43,6 +44,11 @@ stdenv.mkDerivation (finalAttrs: {
		./remove-default-commit-hash.patch
		./remove-vendored-libraries.patch
		./fix-avcodec-close.patch
		(fetchpatch {
		name = "CVE-2026-2245.patch";
		url = "https://github.com/CCExtractor/ccextractor/commit/fd7271bae238ccb3ae8a71304ea64f0886324925.patch";
		hash = "sha256-wZiJob5v4SVa5YBmiHuNvgphSi4PhTTb3hg4vs1lhVg=";
		})
		]
		++ finalAttrs.cargoDeps.vendorStaging.patches;

pkgs/by-name/fr/frotz/0001-Fix-SDL_SOUND_CFLAGS-usage.patch

0 → 100644

+38 −0

Original line number	Diff line number	Diff line
		From 8b1db0c6724640ff995c24145a9777bd49da1ce4 Mon Sep 17 00:00:00 2001
		From: Marcin Serwin <marcin@serwin.dev>
		Date: Fri, 21 Nov 2025 19:11:48 +0100
		Subject: [PATCH] Fix SDL_SOUND_CFLAGS usage

		The flags were quried but unused during compilation. Also, there was a
		typo in the else branch.

		Signed-off-by: Marcin Serwin <marcin@serwin.dev>
		---
		src/sdl/Makefile \| 4 ++--
		1 file changed, 2 insertions(+), 2 deletions(-)

		diff --git a/src/sdl/Makefile b/src/sdl/Makefile
		index e21477e..84a2136 100644
		--- a/src/sdl/Makefile
		+++ b/src/sdl/Makefile
		@@ -22,7 +22,7 @@ SDL_CFLAGS += $(shell $(PKGCONF) $(SDL_PKGS) --cflags)
		SDL_SOUND_CFLAGS += $(shell $(PKGCONF) $(SDL_SOUND_PKGS) --cflags)
		else
		SDL_CFLAGS += $(SDL_CFLAGS_DEF)
		-SD_SOUND_CFLAGS += $(SDL_SOUND_CFLAGS_DEF)
		+SDL_SOUND_CFLAGS += $(SDL_SOUND_CFLAGS_DEF)
		endif


		@@ -32,7 +32,7 @@ $(TARGET): $(DEFINES) $(OBJECTS) \| $(DEFINES)
		@echo "** Done with SDL interface."

		%.o: %.c
		- $(CC) $(CFLAGS) $(SDL_CFLAGS) -fPIC -fpic -o $@ -c $<
		+ $(CC) $(CFLAGS) $(SDL_CFLAGS) $(SDL_SOUND_CFLAGS) -fPIC -fpic -o $@ -c $<

		$(DEFINES):
		@echo "** Generating $@"
		--
		2.51.2

pkgs/by-name/fr/frotz/package.nix

+48 −14

Original line number	Diff line number	Diff line
		@@ -2,7 +2,6 @@
		lib,
		stdenv,
		fetchFromGitLab,
		fetchpatch,
		libao,
		libmodplug,
		libsamplerate,
		@@ -11,28 +10,42 @@
		ncurses,
		which,
		pkg-config,
		SDL2,
		SDL2_mixer,
		zlib,
		libjpeg,
		libpng,
		freetype,
		frontend ? "ncurses",
		}:

		assert lib.assertOneOf "frontend" frontend [
		"ncurses"
		"sdl"
		# NOTE: more options are present in the Makefile, e.g., x11, dumb, nosound, ...
		];
		let
		progName = if frontend == "ncurses" then "frotz" else "sfrotz";
		in
		stdenv.mkDerivation (finalAttrs: {
		pname = "frotz";
		version = "2.54";
		pname = progName;
		version = "2.55";

		src = fetchFromGitLab {
		domain = "gitlab.com";
		owner = "DavidGriffith";
		repo = "frotz";
		rev = finalAttrs.version;
		hash = "sha256-GvGxojD8d5GVy/d8h3q6K7KJroz2lsKbfE0F0acjBl8=";
		tag = finalAttrs.version;
		hash = "sha256-XZjimskjupTtYdgfVaOS2QnQrDIBSwkJqxrffdjgZk0=";
		};

		patches = [
		(fetchpatch {
		url = "https://github.com/macports/macports-ports/raw/496e5b91e3b6c9dc6820d77ab60dbe400d1924ee/games/frotz/files/Makefile.patch";
		extraPrefix = "";
		hash = "sha256-P83ZzSi3bhncQ52Y38Q3F/7v1SJKr5614tytt862HRg=";
		})
		# https://gitlab.com/DavidGriffith/frotz/-/merge_requests/226
		./0001-Fix-SDL_SOUND_CFLAGS-usage.patch
		];

		strictDeps = true;
		enableParallelBuilding = true;
		nativeBuildInputs = [
		which
		pkg-config
		@@ -43,16 +56,37 @@ stdenv.mkDerivation (finalAttrs: {
		libsamplerate
		libsndfile
		libvorbis
		ncurses
		]
		++ (
		if frontend == "ncurses" then
		[ ncurses ]
		else
		[
		freetype
		libjpeg
		libpng
		SDL2
		SDL2_mixer
		zlib
		]
		);

		makeFlags = [
		"PREFIX=${placeholder "out"}"
		"HOMEBREW_PREFIX=/var/empty"
		];
		preConfigure = ''
		makeFlagsArray+=(CURSES_CONFIG="$PKG_CONFIG ncurses")
		'';

		installFlags = [ "PREFIX=$(out)" ];
		buildFlags = [ frontend ];
		installTargets = if frontend == "ncurses" then "install-frotz" else "install-${frontend}";

		meta = {
		homepage = "https://davidgriffith.gitlab.io/frotz/";
		changelog = "https://gitlab.com/DavidGriffith/frotz/-/raw/${finalAttrs.version}/NEWS";
		description = "Z-machine interpreter for Infocom games and other interactive fiction";
		mainProgram = "frotz";
		description = "Z-machine interpreter for Infocom games and other interactive fiction (${frontend})";
		mainProgram = progName;
		platforms = lib.platforms.unix;
		maintainers = with lib.maintainers; [
		nicknovitski

Admin message