Merge master into staging-next (13988f84) · Commits · nix / nixpkgs

nixos/modules/system/boot/systemd/initrd.nix

+0 −2

Original line number	Diff line number	Diff line
		@@ -90,8 +90,6 @@ let
		inherit (cfg) packages package;
		};

		fileSystems = filter utils.fsNeededForBoot config.system.build.fileSystems;

		kernel-name = config.boot.kernelPackages.kernel.name or "kernel";
		modulesTree = config.system.modulesTree.override { name = kernel-name + "-modules"; };
		firmware = config.hardware.firmware;

+4 −0

Original line number	Diff line number	Diff line
		@@ -955,6 +955,10 @@
		dependencies = with self; [ nui-nvim ];
		};

		none-ls-nvim = super.none-ls-nvim.overrideAttrs {
		dependencies = [ self.plenary-nvim ];
		};

		null-ls-nvim = super.null-ls-nvim.overrideAttrs {
		dependencies = with self; [ plenary-nvim ];
		};

+37 −0

Original line number	Diff line number	Diff line
		@@ -7,10 +7,14 @@
		, cmake
		, curl
		, fetchFromGitHub
		, fetchpatch
		, ffmpeg
		, ffmpeg_4
		, fluidsynth
		, fmt
		, freetype
		, gettext
		, harfbuzz
		, hexdump
		, hidapi
		, icu
		@@ -19,21 +23,28 @@
		, libGL
		, libGLU
		, libjpeg
		, liblcf
		, libpcap
		, libpng
		, libsndfile
		, libvorbis
		, libxml2
		, libxmp
		, libzip
		, makeWrapper
		, mpg123
		, nasm
		, openssl
		, opusfile
		, pcre
		, pixman
		, pkg-config
		, portaudio
		, python3
		, retroarch
		, sfml
		, snappy
		, speexdsp
		, udev
		, which
		, xorg
		@@ -400,6 +411,32 @@ in
		};
		};

		easyrpg = mkLibretroCore {
		core = "easyrpg";
		extraNativeBuildInputs = [ cmake pkg-config ];
		extraBuildInputs = [ fmt freetype harfbuzz liblcf libpng libsndfile libvorbis libxmp mpg123 opusfile pcre pixman speexdsp ];
		patches = [
		# The following patch is shared with easyrpg-player.
		# Update when new versions of liblcf and easyrpg-player are released.
		# See pkgs/games/easyrpg-player/default.nix for details.
		(fetchpatch {
		name = "0001-Fix-building-with-fmtlib-10.patch";
		url = "https://github.com/EasyRPG/Player/commit/ab6286f6d01bada649ea52d1f0881dde7db7e0cf.patch";
		hash = "sha256-GdSdVFEG1OJCdf2ZIzTP+hSrz+ddhTMBvOPjvYQHy54=";
		})
		];
		cmakeFlags = [
		"-DBUILD_SHARED_LIBS=ON"
		"-DPLAYER_TARGET_PLATFORM=libretro"
		"-DCMAKE_INSTALL_DATADIR=${placeholder "out"}/share"
		];
		makefile = "Makefile";
		meta = {
		description = "EasyRPG Player libretro port";
		license = lib.licenses.gpl3Only;
		};
		};

		eightyone = mkLibretroCore {
		core = "81";
		repo = "eightyone";

+11 −0

Original line number	Diff line number	Diff line
		@@ -251,6 +251,17 @@
		},
		"version": "unstable-2023-12-29"
		},
		"easyrpg": {
		"fetcher": "fetchFromGitHub",
		"src": {
		"owner": "EasyRPG",
		"repo": "Player",
		"rev": "f8e41f43b619413f95847536412b56f85307d378",
		"hash": "sha256-nvWM4czTv/GxY9raomBEn7dmKBeLtSA9nvjMJxc3Q8s=",
		"fetchSubmodules": true
		},
		"version": "unstable-2023-04-29"
		},
		"eightyone": {
		"fetcher": "fetchFromGitHub",
		"src": {

+5 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,11 @@ CORES = {
		"dolphin": {"repo": "dolphin"},
		"dosbox": {"repo": "dosbox-libretro"},
		"dosbox-pure": {"repo": "dosbox-pure", "owner": "schellingb"},
		# The EasyRPG core is pinned to 0.8 since it depends on version 0.8 of liblcf, which
		# was released in April 2023.
		# Update the version when a compatible liblcf is available.
		# See pkgs/games/easyrpg-player/default.nix for details.
		"easyrpg": {"repo": "Player", "owner": "EasyRPG", "fetch_submodules": True, "rev": "0.8"},
		"eightyone": {"repo": "81-libretro"},
		"fbalpha2012": {"repo": "fbalpha2012"},
		"fbneo": {"repo": "fbneo"},