From fcc04127fc282c2c092a34c5584ad44b69693dfb Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Thu, 18 Jul 2024 01:55:14 +0800 Subject: [PATCH 1/2] emacsPackages.font-lock-plus: trivialBuild -> melpaBuild --- .../manual-packages/font-lock-plus/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix index be52cf155e5b..4182f43c2269 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix @@ -1,10 +1,11 @@ { lib , fetchFromGitHub -, trivialBuild +, melpaBuild }: -trivialBuild { +melpaBuild { pname = "font-lock-plus"; + ename = "font-lock+"; version = "208-unstable-2018-01-01"; src = fetchFromGitHub { @@ -14,9 +15,9 @@ trivialBuild { hash = "sha256-lFmdVMXIIXZ9ZohAJw5rhxpTv017qIyzmpuKOWDdeJ4="; }; - meta = with lib; { + meta = { homepage = "https://github.com/emacsmirror/font-lock-plus"; description = "Enhancements to standard library font-lock.el"; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; } From bc466268d5a9214880157f45a193e85047a5b934 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Thu, 18 Jul 2024 01:55:53 +0800 Subject: [PATCH 2/2] emacsPackages.font-lock-plus: format using nixfmt-rfc-style --- .../manual-packages/font-lock-plus/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix index 4182f43c2269..1360d3bff7f7 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix @@ -1,6 +1,7 @@ -{ lib -, fetchFromGitHub -, melpaBuild +{ + lib, + fetchFromGitHub, + melpaBuild, }: melpaBuild {