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

pkgs/applications/video/kodi/unwrapped.nix

+327 −278

Original line number	Diff line number	Diff line
		@@ -186,9 +186,65 @@ let
		lib.optional gbmSupport "gbm"
		++ lib.optional waylandSupport "wayland"
		++ lib.optional x11Support "x11";
		in
		stdenv.mkDerivation (
		finalAttrs:
		let
		texturePacker = buildPackages.callPackage (
		{
		cmake,
		giflib,
		libjpeg,
		libpng,
		lzo,
		stdenv,
		zlib,
		pkg-config,
		}:
		stdenv.mkDerivation {
		pname = finalAttrs.pname + "-build-tool-texture-packer";
		inherit (finalAttrs) version src;

		sourceRoot = "${finalAttrs.src.name}/tools/depends/native/TexturePacker/src";

		nativeBuildInputs = [
		pkg-config
		cmake
		];

		buildInputs = [
		giflib
		libjpeg
		libpng
		lzo
		zlib
		];

		env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.hostPlatform.isWindows) "-DTARGET_POSIX";

		preConfigure = ''
		cmakeFlagsArray+=(-DKODI_SOURCE_DIR=$src -DCMAKE_MODULE_PATH=$src/cmake/modules)
		'';

		meta.mainProgram = "TexturePacker";
		}
		) { };

		jsonSchemaBuilder = buildPackages.callPackage (
		{ stdenv, cmake }:
		stdenv.mkDerivation {
		pname = finalAttrs.pname + "-build-tool-json-schema-builder";
		inherit (finalAttrs) version src;

		sourceRoot = "${finalAttrs.src.name}/tools/depends/native/JsonSchemaBuilder/src";

		nativeBuildInputs = [ cmake ];

		meta.mainProgram = "JsonSchemaBuilder";
		}
		) { };
		in
		stdenv.mkDerivation (finalAttrs: {
		{
		pname = "kodi";
		version = "21.2";
		kodiReleaseName = "Omega";
		@@ -289,7 +345,6 @@ stdenv.mkDerivation (finalAttrs: {
		libcrossguid
		libplist
		bluez
		giflib
		glib
		harfbuzz
		lcms2
		@@ -300,6 +355,12 @@ stdenv.mkDerivation (finalAttrs: {
		rapidjson
		lirc
		mesa-gl-headers

		# Deps needed by TexturePacker, which is built and installed in normal
		# kodi build, however the one used during the build is not this one
		# in order to support cross-compilation.
		giflib
		zlib
		]
		++ lib.optionals x11Support [
		libX11
		@@ -352,13 +413,6 @@ stdenv.mkDerivation (finalAttrs: {
		gettext
		python3Packages.python
		flatbuffers

		# for TexturePacker
		giflib
		zlib
		libpng
		libjpeg
		lzo
		]
		++ lib.optionals waylandSupport [
		wayland-protocols
		@@ -391,6 +445,7 @@ stdenv.mkDerivation (finalAttrs: {
		"-DFLATBUFFERS_FLATC_EXECUTABLE=${buildPackages.flatbuffers}/bin/flatc"
		"-DPYTHON_EXECUTABLE=${buildPackages.python3Packages.python}/bin/python"
		"-DPYTHON_LIB_PATH=${python3Packages.python.sitePackages}"
		"-DWITH_JSONSCHEMABUILDER=${lib.getExe jsonSchemaBuilder}"
		# When wrapped KODI_HOME will likely contain symlinks to static assets
		# that Kodi's built in webserver will cautiously refuse to serve up
		# (because their realpaths are outside of KODI_HOME and the other
		@@ -400,24 +455,17 @@ stdenv.mkDerivation (finalAttrs: {
		]
		++ lib.optionals waylandSupport [
		"-DWAYLANDPP_SCANNER=${buildPackages.waylandpp}/bin/wayland-scanner++"
		]
		++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
		"-DWITH_TEXTUREPACKER=${lib.getExe texturePacker}"
		];

		# 14 tests fail but the biggest issue is that every test takes 30 seconds -
		# I'm guessing there is a thing waiting to time out
		doCheck = false;

		preConfigure =
		''
		preConfigure = ''
		cmakeFlagsArray+=("-DCORE_PLATFORM_NAME=${lib.concatStringsSep " " kodi_platforms}")
		''
		+ lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
		# Need these tools on the build system when cross compiling,
		# hacky, but have found no other way.
		CXX=$CXX_FOR_BUILD LD=ld make -C tools/depends/native/JsonSchemaBuilder
		appendToVar cmakeFlags "-DWITH_JSONSCHEMABUILDER=$PWD/tools/depends/native/JsonSchemaBuilder/bin"

		CXX=$CXX_FOR_BUILD LD=ld make EXTRA_CONFIGURE= -C tools/depends/native/TexturePacker
		appendToVar cmakeFlags "-DWITH_TEXTUREPACKER=$PWD/tools/depends/native/TexturePacker/bin"
		'';

		postInstall = ''
		@@ -476,4 +524,5 @@ stdenv.mkDerivation (finalAttrs: {
		teams = [ teams.kodi ];
		mainProgram = "kodi";
		};
		})
		}
		)

pkgs/by-name/cf/cfclient/package.nix

0 → 100644

+79 −0

Original line number	Diff line number	Diff line
		{
		lib,
		python3Packages,
		fetchFromGitHub,
		qt6,
		}:

		python3Packages.buildPythonApplication rec {
		pname = "cfclient";
		version = "2025.2";
		pyproject = true;

		src = fetchFromGitHub {
		owner = "bitcraze";
		repo = "crazyflie-clients-python";
		tag = version;
		hash = "sha256-LCGTMLIfGH59KFwQACyuEQTh/zkGgzXd3e6MkFTgKhA=";
		};

		strictDeps = true;

		buildInputs = [
		qt6.qtbase
		];

		nativeBuildInputs = [
		qt6.wrapQtAppsHook
		];

		dontWrapQtApps = true;

		build-system = with python3Packages; [
		setuptools
		setuptools-scm
		];

		pythonRelaxDeps = [
		"numpy"
		"pyqt6"
		"vispy"
		];

		dependencies = with python3Packages; [
		appdirs
		cflib
		numpy
		pyopengl
		pyserial
		pysdl2
		pyqtgraph
		pyqt6
		pyqt6-sip
		pyyaml
		pyzmq
		scipy
		setuptools
		vispy
		];

		# No tests
		doCheck = false;

		# Use wrapQtApp for Python scripts as the manual mentions that wrapQtAppsHook only applies to binaries
		postFixup = ''
		wrapQtApp "$out/bin/cfclient" \
		--set QT_QPA_PLATFORM "wayland" \
		--set XDG_CURRENT_DESKTOP "Wayland" \
		''${qtWrapperArgs[@]}
		'';

		meta = {
		description = "Host applications and library for Crazyflie drones written in Python";
		homepage = "https://github.com/bitcraze/crazyflie-clients-python";
		changelog = "https://github.com/bitcraze/crazyflie-clients-python/releases/tag/${version}";
		license = lib.licenses.gpl2Only;
		maintainers = [ lib.maintainers.brianmcgillion ];
		platforms = lib.platforms.linux;
		};
		}

pkgs/by-name/ma/mattermost/package.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -19,8 +19,8 @@
		#
		# Ensure you also check ../mattermostLatest/package.nix.
		regex = "^v(10\\.5\\.[0-9]+)$";
		version = "10.5.6";
		srcHash = "sha256-etHEJ3EBTolXZr/2Kd39Jdtf1qBMuVO5zRkuM6k4F3w=";
		version = "10.5.7";
		srcHash = "sha256-HPQmN6GXDTEmloIcU0k+sYx/Qeh1j6T2yCT/W1/aWz4=";
		vendorHash = "sha256-9Jl+lxvSoxUReziTqkDRyeNrijGWcBDbqoywJRIeD2k=";
		npmDepsHash = "sha256-tIeuDUZbqgqooDm5TRfViiTT5OIyN0BPwvJdI+wf7p0=";
		lockfileOverlay = ''

pkgs/by-name/na/nak/package.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -8,16 +8,16 @@

		buildGoModule (finalAttrs: {
		pname = "nak";
		version = "0.14.1";
		version = "0.14.2";

		src = fetchFromGitHub {
		owner = "fiatjaf";
		repo = "nak";
		tag = "v${finalAttrs.version}";
		hash = "sha256-uPsZV29xjVUeq0vKsTPf/hRtjsCnjaShiabnKXm5kPY=";
		hash = "sha256-+91warH+uvQ5jkPIxkJxsS9R83cZ1u+FKMy3xgjHIAQ=";
		};

		vendorHash = "sha256-q6jdczZ8K+aJJHfN2OtW0mP4OpMbKAB16Bws2wFb6Zg=";
		vendorHash = "sha256-HGZwcg8C9UuYu0+oPfJG4LEXIHqt+IRrDQdXtIjg0Hg=";

		ldflags = [
		"-s"

pkgs/by-name/na/navidrome/package.nix

+4 −4

Original line number	Diff line number	Diff line
		@@ -18,23 +18,23 @@

		buildGo124Module rec {
		pname = "navidrome";
		version = "0.55.2";
		version = "0.56.1";

		src = fetchFromGitHub {
		owner = "navidrome";
		repo = "navidrome";
		rev = "v${version}";
		hash = "sha256-RJDWpaB0rdrwLSEjwLIZ7ymvYvFSX4/fIT3xFki3278=";
		hash = "sha256-Vq8qfBqxF/PVRtYYTsFydnJ7z/IuoNUWRWTLy/RM6xg=";
		};

		vendorHash = "sha256-stdYTvYwsu00l5sAW86nBlwnACOfyLbKi7Xn5gdM/7Y=";
		vendorHash = "sha256-E7Q3wxUd5JAwERBKD2NZaVyj1kszOxvxeDY0s/fEDfY=";

		npmRoot = "ui";

		npmDeps = fetchNpmDeps {
		inherit src;
		sourceRoot = "${src.name}/ui";
		hash = "sha256-lM8637tcKc9iSPjXJPDZXFCGj7pShOXTC6X2iketg90=";
		hash = "sha256-tl6unHz0E0v0ObrfTiE0vZwVSyVFmrLggNM5QsUGsvI=";
		};

		nativeBuildInputs = [

Admin message