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

pkgs/by-name/al/alacritty/package.nix

+14 −7

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ let
		in
		rustPlatform.buildRustPackage (finalAttrs: {
		pname = "alacritty";
		version = if !withGraphics then "0.16.1" else "0.16.0-graphics";
		version = if !withGraphics then "0.16.1" else "0.16.1-graphics";

		src =
		# by default we want the official package
		@@ -61,14 +61,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
		owner = "ayosec";
		repo = "alacritty";
		tag = "v${finalAttrs.version}";
		hash = "sha256-JbsHozYMh7hFMAsu823IcVZTzvMEGQP+oKpUnlmM7Nk=";
		hash = "sha256-e+o0GLy05qXEY4T57dCuqhukTKBSm1WIHzPUV8uswRI=";
		};

		cargoHash =
		if !withGraphics then
		"sha256-OBhrd4q44LCUGnjDEedhrOuoSC2UFR90IKSQfEPY/Q4="
		else
		"sha256-fsTs37w4CvYvFN8ZgWxMA2hmgW0hJcIvhLiuhYxs4+Y=";
		"sha256-VR+URXqsB9zCOSow/f/aWXUlrp6j2XeK0zKESQGzMek=";

		nativeBuildInputs = [
		cmake
		@@ -151,9 +151,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
		"https://github.com/ayosec/alacritty";
		license = lib.licenses.asl20;
		mainProgram = "alacritty";
		maintainers = with lib.maintainers; [
		maintainers =
		with lib.maintainers;
		if !withGraphics then
		[
		Br1ght0ne
		rvdp
		]
		else
		[
		afh
		];
		platforms = lib.platforms.unix;
		changelog =

pkgs/by-name/ca/calibre/package.nix

+35 −19

Original line number	Diff line number	Diff line
		@@ -221,26 +221,42 @@ stdenv.mkDerivation (finalAttrs: {
		installCheckInputs = with python3Packages; [
		psutil
		];
		installCheckPhase = ''
		runHook preInstallCheck
		installCheckPhase =
		let
		excludedTestNames = [
		"test_7z" # we don't include 7z support
		"test_zstd" # we don't include zstd support
		"test_qt" # we don't include svg or webp support
		"test_import_of_all_python_modules" # explores actual file paths, gets confused
		"test_websocket_basic" # flaky

		ETN='--exclude-test-name'
		EXCLUDED_FLAGS=(
		$ETN 'test_7z' # we don't include 7z support
		$ETN 'test_zstd' # we don't include zstd support
		$ETN 'test_qt' # we don't include svg or webp support
		$ETN 'test_import_of_all_python_modules' # explores actual file paths, gets confused
		$ETN 'test_websocket_basic' # flakey
		# hangs with cuda enabled, also:
		# eglInitialize: Failed to get system egl display
		# Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory
		$ETN 'test_recipe_browser_webengine'
		"test_recipe_browser_webengine"
		]
		++ lib.optionals stdenv.hostPlatform.isAarch64 [
		# https://github.com/microsoft/onnxruntime/issues/10038
		"test_piper"

		${lib.optionalString stdenv.hostPlatform.isAarch64 "$ETN 'test_piper'"} # https://github.com/microsoft/onnxruntime/issues/10038
		${lib.optionalString (!unrarSupport) "$ETN 'test_unrar'"}
		)
		# terminate called after throwing an instance of 'onnxruntime::OnnxRuntimeException'
		# what(): /build/source/include/onnxruntime/core/common/logging/logging.h:371
		# static const onnxruntime::logging::Logger& onnxruntime::logging::LoggingManager::DefaultLogger()
		# Attempt to use DefaultLogger but none has been registered.
		"test_plugins"
		]
		++ lib.optionals (!unrarSupport) [
		"test_unrar"
		];

		testFlags = lib.concatStringsSep " " (
		lib.map (testName: "--exclude-test-name ${testName}") excludedTestNames
		);
		in
		''
		runHook preInstallCheck

		python setup.py test ''${EXCLUDED_FLAGS[@]}
		python setup.py test ${testFlags}

		runHook postInstallCheck
		'';

pkgs/by-name/ce/ceph/package.nix

+21 −1

Original line number	Diff line number	Diff line
		@@ -107,6 +107,7 @@

		# Linux Only Dependencies
		linuxHeaders,
		systemd,
		util-linux,
		libuuid,
		udev,
		@@ -117,6 +118,7 @@
		libxfs ? null,
		liburing ? null,
		zfs ? null,
		withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
		}:

		# We must have one crypto library
		@@ -402,6 +404,20 @@ stdenv.mkDerivation {
		url = "https://gitlab.alpinelinux.org/ashpool/aports/-/raw/d22b70eafe33c3daabe4eea6913c5be87d9463ad/community/ceph19/cpp_redis.patch";
		hash = "sha256-wxPIsYt25CjXhJ6kmr/MXwFD58Sl4y4W+r9jAMND+uw=";
		})

		# See:
		# * <https://github.com/ceph/ceph/pull/55560>
		# * <https://github.com/ceph/ceph/pull/60575>
		(fetchpatch2 {
		name = "ceph-systemd-sans-cluster-name.patch";
		url = "https://github.com/ceph/ceph/commit/5659920c7c128cb8d9552580dbe23dd167a56c31.patch?full_index=1";
		hash = "sha256-Uch8ZghyTowUvSq0p/RxiVpdG1Yqlww9inpVksO6zyk=";
		})
		(fetchpatch2 {
		name = "ceph-systemd-prefix.patch";
		url = "https://github.com/ceph/ceph/commit/9b38df488d7101b02afa834ea518fd52076d582a.patch?full_index=1";
		hash = "sha256-VcbJhCGTUdNISBd6P96Mm5M3fFVmZ8r7pMl+srQmnIQ=";
		})
		];

		nativeBuildInputs = [
		@@ -519,6 +535,9 @@ stdenv.mkDerivation {
		substituteInPlace src/client/fuse_ll.cc \
		--replace-fail "mount -i -o remount" "${util-linux}/bin/mount -i -o remount"

		substituteInPlace systemd/*.service.in \
		--replace-quiet "/bin/kill" "${util-linux}/bin/kill"

		substituteInPlace src/{ceph-osd-prestart.sh,ceph-post-file.in,init-ceph.in} \
		--replace-fail "GETOPT=/usr/local/bin/getopt" "GETOPT=${getopt}/bin/getopt" \
		--replace-fail "GETOPT=getopt" "GETOPT=${getopt}/bin/getopt"
		@@ -532,7 +551,8 @@ stdenv.mkDerivation {
		"-DCMAKE_INSTALL_DATADIR=${placeholder "lib"}/lib"

		"-DWITH_CEPHFS_SHELL:BOOL=ON"
		"-DWITH_SYSTEMD:BOOL=OFF"
		"-DWITH_SYSTEMD:BOOL=${if withSystemd then "ON" else "OFF"}"
		"-DSYSTEMD_SYSTEM_UNIT_DIR=${placeholder "out"}/lib/systemd/system"
		# `WITH_JAEGER` requires `thrift` as a depenedncy (fine), but the build fails with:
		# CMake Error at src/opentelemetry-cpp-stamp/opentelemetry-cpp-build-Release.cmake:49 (message):
		# Command failed: 2

pkgs/by-name/co/coder/package.nix

+10 −10

Original line number	Diff line number	Diff line
		@@ -15,21 +15,21 @@ let

		channels = {
		stable = {
		version = "2.23.4";
		version = "2.26.2";
		hash = {
		x86_64-linux = "sha256-tpU26+3NrfOUWgd4Wav1fhTMtErh2CXt3Nr8BTIUdbc=";
		x86_64-darwin = "sha256-07pSXm++a9VWcnc4AgrR7OaaDw2ki2XMtr8PZkWW2Vw=";
		aarch64-linux = "sha256-Rm1CIVK7qPLizK+0H3Eb2qwPEj1TjHtIqdBr+Z+21eA=";
		aarch64-darwin = "sha256-H5MLnRokC5Wb3FrotprunG+kx0qwT8/Ou6ScO7N2h+E=";
		x86_64-linux = "sha256-bIt20dfLgKtR/pnm2ZKAdMOw5tBGSiL7VdY7n1+KtGo=";
		x86_64-darwin = "sha256-VSoNXyHXKLJTxEOCNQ04j4bk3s9zRL9ITxfO8Ow7Sw4=";
		aarch64-linux = "sha256-7J6KneDZZyXwaM0ebTmVezUFcwR9w7dxIDsp9aSuPbs=";
		aarch64-darwin = "sha256-tfECXi7deg73fyQU10a5G+XU7Ql1A/jyOlJwAAVqeA8=";
		};
		};
		mainline = {
		version = "2.24.2";
		version = "2.27.1";
		hash = {
		x86_64-linux = "sha256-Al3bvIsSnU0vdNAkZknpP/rxJIP6UGUIeIZ6kw84SuM=";
		x86_64-darwin = "sha256-0+n69BWKIgKFUCQzW4AMRW4QdRQcZkK5Ioiu4d4RvnE=";
		aarch64-linux = "sha256-2JkEO7hhLY9e22OTYLhzv+Zb0aP6PRVG8ZX5r686o0Q=";
		aarch64-darwin = "sha256-7CJQEj7VA3SwaZeimng6BPDtw14LXt7+1E7HxVs8kYM=";
		x86_64-linux = "sha256-BkUC6D9Qdewj+nQo8Oi8BiJkrdSnud4bFHDbXCthKqQ=";
		x86_64-darwin = "sha256-OPL7Fb0mUhGBEjdjPOTh3W6SWqOB7JvVosft/6K0Sos=";
		aarch64-linux = "sha256-oMCR5hroO9HqygakQwxRTlrJiha2MTj+gQsY8WEVe7w=";
		aarch64-darwin = "sha256-UDOaG+cT0X6t2UX4N7Wlgok9MxLLDTDZ9eY9TMN6iT8=";
		};
		};
		};

pkgs/by-name/du/duo-unix/package.nix

+2 −2

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

		stdenv.mkDerivation rec {
		pname = "duo-unix";
		version = "2.2.0";
		version = "2.2.1";

		src = fetchurl {
		url = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz";
		sha256 = "sha256-o5myAUg2tf+Yu7tB93EU/gZkGAHYtrEh6zyCiVJ2pmY=";
		sha256 = "sha256-43a+BYWzw9ETpYjxlSXjV83uJG1prrjoYMv0/dv5AMo=";
		};

		buildInputs = [