From 8fb8d6f95c9579922ca4b4cd43d7af229ec78824 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 7 Oct 2024 02:46:47 +0800 Subject: [PATCH] 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 ];