elisp-packages: update overrides (#348330)

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

View File

@ -217,6 +217,7 @@ in
preview-tailor = mkHome super.preview-tailor; preview-tailor = mkHome super.preview-tailor;
# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=73325
psgml = ignoreCompilationError super.psgml; # elisp error psgml = ignoreCompilationError super.psgml; # elisp error
# native-ice https://github.com/mattiase/relint/issues/15 # native-ice https://github.com/mattiase/relint/issues/15

View File

@ -757,15 +757,20 @@ let
# https://github.com/gongo/airplay-el/issues/2 # https://github.com/gongo/airplay-el/issues/2
airplay = addPackageRequires super.airplay [ self.request-deferred ]; airplay = addPackageRequires super.airplay [ self.request-deferred ];
# https://github.com/melpa/melpa/pull/9185 alectryon = super.alectryon.overrideAttrs (
alectryon = super.alectryon.overrideAttrs (old: { finalAttrs: previousAttrs: {
preBuild = # https://github.com/melpa/melpa/pull/9185
old.preBuild or "" preBuild =
+ "\n" if lib.versionOlder finalAttrs.version "20241006.1902" then
+ '' previousAttrs.preBuild or ""
rm --recursive --verbose etc/elisp/screenshot + "\n"
''; + ''
}); rm --recursive --verbose etc/elisp/screenshot
''
else
previousAttrs.preBuild or null;
}
);
# https://github.com/gergelypolonkai/alert-termux/issues/2 # https://github.com/gergelypolonkai/alert-termux/issues/2
alert-termux = addPackageRequires super.alert-termux [ self.alert ]; alert-termux = addPackageRequires super.alert-termux [ self.alert ];
@ -803,15 +808,20 @@ let
# missing optional dependencies # missing optional dependencies
boogie-friends = addPackageRequires super.boogie-friends [ self.lsp-mode ]; boogie-friends = addPackageRequires super.boogie-friends [ self.lsp-mode ];
# https://github.com/melpa/melpa/pull/9181 bpr = super.bpr.overrideAttrs (
bpr = super.bpr.overrideAttrs (old: { finalAttrs: previousAttrs: {
preBuild = # https://github.com/melpa/melpa/pull/9181
old.preBuild or "" preBuild =
+ "\n" if lib.versionOlder finalAttrs.version "20241013.1803" then
+ '' previousAttrs.preBuild or ""
rm --verbose --force test-bpr.el + "\n"
''; + ''
}); rm --verbose --force test-bpr.el
''
else
previousAttrs;
}
);
bts = ignoreCompilationError super.bts; # elisp error 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 # one optional dependency spark is removed in https://github.com/melpa/melpa/pull/9151
chronometrist = ignoreCompilationError super.chronometrist; chronometrist = ignoreCompilationError super.chronometrist;
# https://github.com/melpa/melpa/pull/9184 chronometrist-key-values = super.chronometrist-key-values.overrideAttrs (
chronometrist-key-values = super.chronometrist-key-values.overrideAttrs (old: { finalAttrs: previousAttrs: {
recipe = '' # https://github.com/melpa/melpa/pull/9184
(chronometrist-key-values :fetcher git :url "" recipe =
:files (:defaults "elisp/chronometrist-key-values.*")) 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 ( clingo-mode = super.clingo-mode.overrideAttrs (
finalAttrs: previousAttrs: { finalAttrs: previousAttrs: {
@ -1072,15 +1088,20 @@ let
fold-dwim-org = ignoreCompilationError super.fold-dwim-org; # elisp error fold-dwim-org = ignoreCompilationError super.fold-dwim-org; # elisp error
# https://github.com/melpa/melpa/pull/9182 frontside-javascript = super.frontside-javascript.overrideAttrs (
frontside-javascript = super.frontside-javascript.overrideAttrs (old: { finalAttrs: previousAttrs: {
preBuild = # https://github.com/melpa/melpa/pull/9182
old.preBuild or "" preBuild =
+ "\n" if lib.versionOlder finalAttrs.version "20240929.1858" then
+ '' previousAttrs.preBuild or ""
rm --verbose packages/javascript/test-suppport.el + "\n"
''; + ''
}); rm --verbose packages/javascript/test-suppport.el
''
else
previousAttrs.preBuild or null;
}
);
fxrd-mode = ignoreCompilationError super.fxrd-mode; # elisp error fxrd-mode = ignoreCompilationError super.fxrd-mode; # elisp error