From 2901fae0e419110799c2fe639c70b47f8e7c1515 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 21 Jul 2024 20:27:30 -0300 Subject: [PATCH 1/2] emacs updater: trivialBuild -> melpaBuild --- .../emacs/elisp-packages/updater-emacs.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/updater-emacs.nix b/pkgs/applications/editors/emacs/elisp-packages/updater-emacs.nix index 0f69da2384d5..a79e259357eb 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/updater-emacs.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/updater-emacs.nix @@ -3,27 +3,30 @@ let emacsEnv = pkgs.emacs.pkgs.withPackages (epkgs: let - promise = epkgs.trivialBuild { + promise = epkgs.melpaBuild { pname = "promise"; - version = "1"; + version = "0-unstable-2019-06-07"; + src = pkgs.fetchFromGitHub { owner = "bendlas"; repo = "emacs-promise"; rev = "4da97087c5babbd8429b5ce62a8323b9b03c6022"; - sha256 = "0yin7kj69g4zxs30pvk47cnfygxlaw7jc7chr3b36lz51yqczjsy"; + hash = "sha256-XsvPsA/lUzPWyJAdJg9XtD/vLDtk7guG7p+8ZOQ8Nno="; }; }; - semaphore = epkgs.trivialBuild { + semaphore = epkgs.melpaBuild { pname = "semaphore"; - version = "1"; - packageRequires = [ promise ]; + version = "0-unstable-2019-06-07"; + src = pkgs.fetchFromGitHub { owner = "webnf"; repo = "semaphore.el"; rev = "93802cb093073bc6a6ccd797328dafffcef248e0"; - sha256 = "09pfyp27m35sv340xarhld7xx2vv5fs5xj4418709iw6l6hpk853"; + hash = "sha256-o6B5oaGGxwQOCoTIXrQre4veT6Mwqw7I2LqMesT17iY="; }; + + packageRequires = [ promise ]; }; in [ promise semaphore ]); From 23e718e21e40638008819a9c82f62aa77f08b82c Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 28 Jul 2024 09:57:57 -0300 Subject: [PATCH 2/2] emacs updater: add emacs.async dependency in promise --- .../applications/editors/emacs/elisp-packages/updater-emacs.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/emacs/elisp-packages/updater-emacs.nix b/pkgs/applications/editors/emacs/elisp-packages/updater-emacs.nix index a79e259357eb..f527e64f0885 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/updater-emacs.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/updater-emacs.nix @@ -13,6 +13,8 @@ let rev = "4da97087c5babbd8429b5ce62a8323b9b03c6022"; hash = "sha256-XsvPsA/lUzPWyJAdJg9XtD/vLDtk7guG7p+8ZOQ8Nno="; }; + + packageRequires = [ epkgs.async ]; }; semaphore = epkgs.melpaBuild {