elisp-packages: update overrides (#348330) (889dd46a) · Commits · nix / nixpkgs

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