From b0cc794dcd68b21c1113a2372affe8b91ffedf23 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Wed, 25 Sep 2024 02:43:25 +0800 Subject: [PATCH 1/5] emacsPackages.psgml: add upstream bug link --- .../editors/emacs/elisp-packages/elpa-common-overrides.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix index 84924fe42e5a..fc77ac423b0e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix @@ -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 From 8fb8d6f95c9579922ca4b4cd43d7af229ec78824 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 7 Oct 2024 02:46:47 +0800 Subject: [PATCH 2/5] emacsPackages.chronometrist-key-values: override when only needed --- .../emacs/elisp-packages/melpa-packages.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 0a12189bdb05..0973981990e0 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -853,13 +853,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; + } + ); # https://github.com/atilaneves/cmake-ide/issues/176 cmake-ide = addPackageRequires super.cmake-ide [ self.dash ]; From 01ea823ea5f63e6cab5602300709aa018f5f6700 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 7 Oct 2024 02:55:53 +0800 Subject: [PATCH 3/5] emacsPackages.frontside-javascript: override only when needed --- .../emacs/elisp-packages/melpa-packages.nix | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 0973981990e0..927b2e4ee511 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -1066,15 +1066,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 From bad80f68410e0aa2c2be99c37c119c83b043ddc6 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 7 Oct 2024 04:28:21 +0800 Subject: [PATCH 4/5] emacsPackages.alectryon: override only when needed --- .../emacs/elisp-packages/melpa-packages.nix | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 927b2e4ee511..dfd99077e9fe 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -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 ]; From afc6b067d18258291021e1b8d3f6d561b57d9af1 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 14 Oct 2024 02:38:02 +0800 Subject: [PATCH 5/5] emacsPackages.bpr: override only when needed --- .../emacs/elisp-packages/melpa-packages.nix | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index dfd99077e9fe..227b8f784e07 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -808,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