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

nixos/modules/services/audio/snapserver.nix

+2 −1

Original line number	Diff line number	Diff line
		@@ -186,7 +186,8 @@ in {

		http.docRoot = lib.mkOption {
		type = with lib.types; nullOr path;
		default = null;
		default = pkgs.snapweb;
		defaultText = lib.literalExpression "pkgs.snapweb";
		description = ''
		Path to serve from the HTTP servers root.
		'';

pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix

+1 −0

Original line number	Diff line number	Diff line
		@@ -217,6 +217,7 @@ in

		preview-tailor = mkHome super.preview-tailor;

		# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=73325
		psgml = ignoreCompilationError super.psgml; # elisp error

		# native-ice https://github.com/mattiase/relint/issues/15

pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix

+55 −34

Original line number	Diff line number	Diff line
		@@ -757,15 +757,20 @@ let
		# https://github.com/gongo/airplay-el/issues/2
		airplay = addPackageRequires super.airplay [ self.request-deferred ];

		alectryon = super.alectryon.overrideAttrs (
		finalAttrs: previousAttrs: {
		# https://github.com/melpa/melpa/pull/9185
		alectryon = super.alectryon.overrideAttrs (old: {
		preBuild =
		old.preBuild or ""
		if lib.versionOlder finalAttrs.version "20241006.1902" then
		previousAttrs.preBuild or ""
		+ "\n"
		+ ''
		rm --recursive --verbose etc/elisp/screenshot
		'';
		});
		''
		else
		previousAttrs.preBuild or null;
		}
		);

		# https://github.com/gergelypolonkai/alert-termux/issues/2
		alert-termux = addPackageRequires super.alert-termux [ self.alert ];
		@@ -803,15 +808,20 @@ let
		# missing optional dependencies
		boogie-friends = addPackageRequires super.boogie-friends [ self.lsp-mode ];

		bpr = super.bpr.overrideAttrs (
		finalAttrs: previousAttrs: {
		# https://github.com/melpa/melpa/pull/9181
		bpr = super.bpr.overrideAttrs (old: {
		preBuild =
		old.preBuild or ""
		if lib.versionOlder finalAttrs.version "20241013.1803" then
		previousAttrs.preBuild or ""
		+ "\n"
		+ ''
		rm --verbose --force test-bpr.el
		'';
		});
		''
		else
		previousAttrs;
		}
		);

		bts = ignoreCompilationError super.bts; # elisp error

		@@ -853,13 +863,19 @@ let
		# one optional dependency spark is removed in https://github.com/melpa/melpa/pull/9151
		chronometrist = ignoreCompilationError super.chronometrist;

		chronometrist-key-values = super.chronometrist-key-values.overrideAttrs (
		finalAttrs: previousAttrs: {
		# https://github.com/melpa/melpa/pull/9184
		chronometrist-key-values = super.chronometrist-key-values.overrideAttrs (old: {
		recipe = ''
		recipe =
		if lib.versionOlder finalAttrs.version "20241006.1831" then
		''
		(chronometrist-key-values :fetcher git :url ""
		:files (:defaults "elisp/chronometrist-key-values.*"))
		'';
		});
		''
		else
		previousAttrs.recipe;
		}
		);

		clingo-mode = super.clingo-mode.overrideAttrs (
		finalAttrs: previousAttrs: {
		@@ -1072,15 +1088,20 @@ let

		fold-dwim-org = ignoreCompilationError super.fold-dwim-org; # elisp error

		frontside-javascript = super.frontside-javascript.overrideAttrs (
		finalAttrs: previousAttrs: {
		# https://github.com/melpa/melpa/pull/9182
		frontside-javascript = super.frontside-javascript.overrideAttrs (old: {
		preBuild =
		old.preBuild or ""
		if lib.versionOlder finalAttrs.version "20240929.1858" then
		previousAttrs.preBuild or ""
		+ "\n"
		+ ''
		rm --verbose packages/javascript/test-suppport.el
		'';
		});
		''
		else
		previousAttrs.preBuild or null;
		}
		);

		fxrd-mode = ignoreCompilationError super.fxrd-mode; # elisp error

pkgs/applications/misc/khal/default.nix

+48 −17

Original line number	Diff line number	Diff line
		{ lib
		, stdenv
		, fetchFromGitHub
		, glibcLocales
		, installShellFiles
		, python3
		{
		lib,
		stdenv,
		fetchFromGitHub,
		glibcLocales,
		installShellFiles,
		python3,
		}:

		python3.pkgs.buildPythonApplication rec {
		let
		python = python3.override {
		packageOverrides = self: super: {
		# https://github.com/pimutils/khal/issues/1361
		icalendar = super.icalendar.overridePythonAttrs (old: rec {
		version = "5.0.13";
		src = fetchFromGitHub {
		owner = "collective";
		repo = "icalendar";
		rev = "refs/tags/v${version}";
		hash = "sha256-2gpWfLXR4HThw23AWxY2rY9oiK6CF3Qiad8DWHCs4Qk=";
		};
		patches = [ ];
		build-system = with self; [ setuptools ];
		dependencies = with self; [
		python-dateutil
		pytz
		];
		});
		};
		};
		in
		python.pkgs.buildPythonApplication rec {
		pname = "khal";
		version = "0.11.3";
		pyproject = true;
		@@ -18,16 +41,17 @@ python3.pkgs.buildPythonApplication rec {
		hash = "sha256-YP2kQ/qXPDwvFvlHf+A2Ymvk49dmt5tAnTaOhrOV92M=";
		};

		build-system = with python.pkgs; [
		setuptools
		setuptools-scm
		];

		nativeBuildInputs = [
		glibcLocales
		installShellFiles
		] ++ (with python3.pkgs; [
		setuptools-scm
		sphinx
		sphinxcontrib-newsfeed
		]);
		];

		propagatedBuildInputs = with python3.pkgs;[
		dependencies = with python.pkgs; [
		atomicwrites
		click
		click-log
		@@ -45,7 +69,7 @@ python3.pkgs.buildPythonApplication rec {
		urwid
		];

		nativeCheckInputs = with python3.pkgs;[
		nativeCheckInputs = with python.pkgs; [
		freezegun
		hypothesis
		packaging
		@@ -61,7 +85,14 @@ python3.pkgs.buildPythonApplication rec {
		--fish <(_KHAL_COMPLETE=fish_source $out/bin/khal)

		# man page
		PATH="${python3.withPackages (ps: with ps; [ sphinx sphinxcontrib-newsfeed ])}/bin:$PATH" \
		PATH="${
		python3.withPackages (
		ps: with ps; [
		sphinx
		sphinxcontrib-newsfeed
		]
		)
		}/bin:$PATH" \
		make -C doc man
		installManPage doc/build/man/khal.1

		@@ -71,7 +102,7 @@ python3.pkgs.buildPythonApplication rec {

		doCheck = !stdenv.hostPlatform.isAarch64;

		LC_ALL = "en_US.UTF-8";
		env.LC_ALL = "en_US.UTF-8";

		disabledTests = [
		# timing based

pkgs/applications/office/todoman/default.nix

+21 −18

Original line number	Diff line number	Diff line
		{ lib
		, fetchFromGitHub
		, glibcLocales
		, installShellFiles
		, jq
		, python3
		{
		fetchFromGitHub,
		installShellFiles,
		jq,
		lib,
		python3,
		}:

		python3.pkgs.buildPythonApplication rec {
		pname = "todoman";
		version = "4.4.0";
		format = "pyproject";
		pyproject = true;

		src = fetchFromGitHub {
		owner = "pimutils";
		repo = pname;
		repo = "todoman";
		rev = "refs/tags/v${version}";
		hash = "sha256-5tQaNT6QVN9mxa9t6OvMux4ZGy4flUqszTAwet2QL0w=";
		};

		nativeBuildInputs = [
		installShellFiles
		] ++ (with python3.pkgs; [
		];

		build-system = with python3.pkgs; [
		setuptools-scm
		]);
		];

		propagatedBuildInputs = with python3.pkgs; [
		dependencies = with python3.pkgs; [
		atomicwrites
		click
		click-log
		@@ -34,22 +36,18 @@ python3.pkgs.buildPythonApplication rec {
		parsedatetime
		python-dateutil
		pyxdg
		pytz
		tabulate
		urwid
		];

		nativeCheckInputs = with python3.pkgs; [
		flake8
		flake8-import-order
		freezegun
		hypothesis
		pytestCheckHook
		glibcLocales
		pytest-cov-stub
		];

		LC_ALL = "en_US.UTF-8";

		postInstall = ''
		installShellCompletion --bash contrib/completion/bash/_todo
		substituteInPlace contrib/completion/zsh/_todo --replace "jq " "${lib.getExe jq} "
		@@ -87,9 +85,14 @@ python3.pkgs.buildPythonApplication rec {
		now.
		Unsupported fields may not be shown but are never deleted or altered.
		'';
		changelog = "https://todoman.readthedocs.io/en/stable/changelog.html#v${builtins.replaceStrings ["."] ["-"] version}";
		changelog = "https://todoman.readthedocs.io/en/stable/changelog.html#v${
		builtins.replaceStrings [ "." ] [ "-" ] version
		}";
		license = lib.licenses.isc;
		maintainers = with lib.maintainers; [ leenaars antonmosich ];
		maintainers = with lib.maintainers; [
		leenaars
		antonmosich
		];
		mainProgram = "todo";
		};
		}