qbit/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elisp-packages: update overrides (#348330)

Browse Source
This commit is contained in:
Lin Jian 2024-10-14 09:21:06 +08:00 committed by GitHub
commit 889dd46a3c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 56 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

89
pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
View File

@ -757,15 +757,20 @@ let
# https://github.com/gongo/airplay-el/issues/2
airplay = addPackageRequires super.airplay [ self.request-deferred ];
# https://github.com/melpa/melpa/pull/9185
alectryon = super.alectryon.overrideAttrs (old: {
preBuild =
old.preBuild or ""
+ "\n"
+ ''
rm --recursive --verbose etc/elisp/screenshot
'';
});
alectryon = super.alectryon.overrideAttrs (
finalAttrs: previousAttrs: {
# https://github.com/melpa/melpa/pull/9185
preBuild =
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 ];
# https://github.com/melpa/melpa/pull/9181
bpr = super.bpr.overrideAttrs (old: {
preBuild =
old.preBuild or ""
+ "\n"
+ ''
rm --verbose --force test-bpr.el
'';
});
bpr = super.bpr.overrideAttrs (
finalAttrs: previousAttrs: {
# https://github.com/melpa/melpa/pull/9181
preBuild =
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;
# https://github.com/melpa/melpa/pull/9184
chronometrist-key-values = super.chronometrist-key-values.overrideAttrs (old: {
recipe = ''
(chronometrist-key-values :fetcher git :url ""
:files (:defaults "elisp/chronometrist-key-values.*"))
'';
});
chronometrist-key-values = super.chronometrist-key-values.overrideAttrs (
finalAttrs: previousAttrs: {
# https://github.com/melpa/melpa/pull/9184
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
# https://github.com/melpa/melpa/pull/9182
frontside-javascript = super.frontside-javascript.overrideAttrs (old: {
preBuild =
old.preBuild or ""
+ "\n"
+ ''
rm --verbose packages/javascript/test-suppport.el
'';
});
frontside-javascript = super.frontside-javascript.overrideAttrs (
finalAttrs: previousAttrs: {
# https://github.com/melpa/melpa/pull/9182
preBuild =
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