From a5b62475d74dc8bb664888cf5a83bfa9ca54faf4 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 15 Jul 2024 13:37:11 -0300 Subject: [PATCH 1/2] emacsPackages.ess-R-object-popup: use melpaBuild --- .../manual-packages/ess-R-object-popup/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ess-R-object-popup/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ess-R-object-popup/default.nix index 7809dcd73566..54852385f927 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ess-R-object-popup/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ess-R-object-popup/default.nix @@ -1,11 +1,11 @@ -{ trivialBuild -, fetchFromGitHub -, emacs -, popup -, ess +{ + ess, + fetchFromGitHub, + melpaBuild, + popup, }: -trivialBuild rec { +melpaBuild rec { pname = "ess-R-object-popup"; version = "1.0"; @@ -24,6 +24,5 @@ trivialBuild rec { meta = { homepage = "https://github.com/myuhe/ess-R-object-popup.el"; description = "Popup descriptions of R objects"; - inherit (emacs.meta) platforms; }; } From dee59a26e273fc3f66fa68471716763928a9face Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 15 Jul 2024 18:42:46 -0300 Subject: [PATCH 2/2] emacsPackages.ess-R-object-popup: remove The upstream is basically abandoned. --- .../emacs/elisp-packages/manual-packages.nix | 6 ++-- .../ess-R-object-popup/default.nix | 28 ------------------- 2 files changed, 4 insertions(+), 30 deletions(-) delete mode 100644 pkgs/applications/editors/emacs/elisp-packages/manual-packages/ess-R-object-popup/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 73e7f9a2c672..8e6d98361e09 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -37,8 +37,6 @@ in enlight = callPackage ./manual-packages/enlight { }; - ess-R-object-popup = callPackage ./manual-packages/ess-R-object-popup { }; - evil-markdown = callPackage ./manual-packages/evil-markdown { }; font-lock-plus = callPackage ./manual-packages/font-lock-plus { }; @@ -128,3 +126,7 @@ in __attrsFailEvaluation = true; } +### Aliases +// lib.optionalAttrs pkgs.config.allowAliases { + ess-R-object-popup = throw "emacsPackages.ess-R-object-popup was deleted, since the upstream repo looks abandoned."; # Added 2024-07-15 +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ess-R-object-popup/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ess-R-object-popup/default.nix deleted file mode 100644 index 54852385f927..000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ess-R-object-popup/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - ess, - fetchFromGitHub, - melpaBuild, - popup, -}: - -melpaBuild rec { - pname = "ess-R-object-popup"; - version = "1.0"; - - src = fetchFromGitHub { - owner = "myuhe"; - repo = "ess-R-object-popup.el"; - rev = "v${version}"; - hash = "sha256-YN8ZLXEbwTFdFfovkV2IXV9v6y/PTgCdiRQqbpRaF2E="; - }; - - packageRequires = [ - popup - ess - ]; - - meta = { - homepage = "https://github.com/myuhe/ess-R-object-popup.el"; - description = "Popup descriptions of R objects"; - }; -}