From c51ca826cecee4b78d0334bff0cb2007461c3f40 Mon Sep 17 00:00:00 2001 From: Maximilian Marx Date: Mon, 9 Sep 2024 10:46:29 +0200 Subject: [PATCH 1/2] melpa2nix: update to work with current MELPA recipes MELPA has started to use :rename in the :files attribute of recipes (e.g., for bbdb), which is rejected as an invalid recipe by earlier versions of package-build. --- pkgs/applications/editors/emacs/build-support/melpa.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/build-support/melpa.nix b/pkgs/applications/editors/emacs/build-support/melpa.nix index e129e3ebdeb0..a6e6e7c5d4b1 100644 --- a/pkgs/applications/editors/emacs/build-support/melpa.nix +++ b/pkgs/applications/editors/emacs/build-support/melpa.nix @@ -12,8 +12,8 @@ let src = fetchFromGitHub { owner = "melpa"; repo = "package-build"; - rev = "c48aa078c01b4f07b804270c4583a0a58ffea1c0"; - sha256 = "sha256-MzPj375upIiYXdQR+wWXv3A1zMqbSrZlH0taLuxx/1M="; + rev = "d5661f1f1996a893fbcbacb4d290c57acab4fb0e"; + hash = "sha256-zVhFR2kLLkCKC+esPBbIk3qOa033YND1HF9GiNI4JM8="; }; patches = [ ./package-build-dont-use-mtime.patch ]; From 685864af83d81b4c1a8cfa912df10974c5360eb7 Mon Sep 17 00:00:00 2001 From: Maximilian Marx Date: Mon, 9 Sep 2024 19:11:44 +0200 Subject: [PATCH 2/2] emacs.pkgs.melpaPackages.ttl-mode: update recipe Signed-off-by: Maximilian Marx --- .../editors/emacs/elisp-packages/recipes-archive-melpa.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 375b589bcb9a..67a0025d0cf1 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -123226,8 +123226,8 @@ }, { "ename": "ttl-mode", - "commit": "0575169e8fb9a2537582f5aa77fc9950f1f1384c", - "sha256": "1fi8xxzwz3h7kgn69h4p1wlvhvia0v8qqh7k64pgh44b2fq040p1", + "commit": "8a7d0c7287d157f45ebcb7a6ba2a776b3ee2bc2d", + "sha256": "1v34axc96n5aqsm9w2j94z8h9mqfa41300lx8aqccwj8a5qwk90k", "fetcher": "github", "repo": "nxg/ttl-mode", "unstable": {