From 359166a810aa5b103730c0e52e1bf655c745374e Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Wed, 17 Jul 2024 22:53:50 +0800 Subject: [PATCH 1/2] emacsPackages.elisp-ffi: clean --- .../manual-packages/elisp-ffi/default.nix | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/default.nix index 74b829701b0b..5a562acf25a3 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/default.nix @@ -3,22 +3,17 @@ , fetchFromGitHub , pkg-config , libffi -, writeText }: -let - rev = "da37c516a0e59bdce63fb2dc006a231dee62a1d9"; -in melpaBuild { +melpaBuild { pname = "elisp-ffi"; - version = "20170518.0"; - - commit = rev; + version = "1.0.0-unstable-2017-05-18"; src = fetchFromGitHub { owner = "skeeto"; repo = "elisp-ffi"; - inherit rev; - sha256 = "sha256-StOezQEnNTjRmjY02ub5FRh59aL6gWfw+qgboz0wF94="; + rev = "da37c516a0e59bdce63fb2dc006a231dee62a1d9"; + hash = "sha256-StOezQEnNTjRmjY02ub5FRh59aL6gWfw+qgboz0wF94="; }; nativeBuildInputs = [ pkg-config ]; @@ -30,10 +25,6 @@ in melpaBuild { make ''; - recipe = writeText "recipe" '' - (elisp-ffi :repo "skeeto/elisp-ffi" :fetcher github) - ''; - meta = { description = "Emacs Lisp Foreign Function Interface"; longDescription = '' @@ -42,6 +33,6 @@ in melpaBuild { driving a subprocess to do the heavy lifting, passing result values on to Emacs. ''; - license = lib.licenses.publicDomain; + license = lib.licenses.unlicense; }; } From d4dca99880ece93192c25589db48919f3f3b9419 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Wed, 17 Jul 2024 22:54:54 +0800 Subject: [PATCH 2/2] emacsPackages.elisp-ffi: format using nixfmt-rfc-style --- .../manual-packages/elisp-ffi/default.nix | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/default.nix index 5a562acf25a3..4e21c8e8e79e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/default.nix @@ -1,8 +1,9 @@ -{ lib -, melpaBuild -, fetchFromGitHub -, pkg-config -, libffi +{ + lib, + melpaBuild, + fetchFromGitHub, + pkg-config, + libffi, }: melpaBuild { @@ -23,16 +24,16 @@ melpaBuild { preBuild = '' mv ffi.el elisp-ffi.el make - ''; + ''; meta = { description = "Emacs Lisp Foreign Function Interface"; longDescription = '' - This library provides an FFI for Emacs Lisp so that Emacs - programs can invoke functions in native libraries. It works by - driving a subprocess to do the heavy lifting, passing result - values on to Emacs. - ''; + This library provides an FFI for Emacs Lisp so that Emacs + programs can invoke functions in native libraries. It works by + driving a subprocess to do the heavy lifting, passing result + values on to Emacs. + ''; license = lib.licenses.unlicense; }; }