From 0990419a8785b4696f3d3581c76b0132278036c2 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Thu, 18 Jul 2024 01:19:21 +0800 Subject: [PATCH 1/2] emacsPackages.urweb-mode: trivialBuild -> melpaBuild --- .../manual-packages/urweb-mode/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/default.nix index 6f7e822d81d3..4a407c454085 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/default.nix @@ -1,11 +1,11 @@ { lib -, trivialBuild +, melpaBuild , urweb , cl-lib , flycheck }: -trivialBuild { +melpaBuild { pname = "urweb-mode"; inherit (urweb) src version; @@ -15,9 +15,9 @@ trivialBuild { flycheck ]; - postUnpack = '' - sourceRoot=$sourceRoot/src/elisp - ''; + files = ''("src/elisp/*.el")''; + + dontConfigure = true; meta = { description = "Major mode for editing Ur/Web"; From 8e0546503a04dc2414bd87b6fd32721794ec692e Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Thu, 18 Jul 2024 01:24:01 +0800 Subject: [PATCH 2/2] emacsPackages.urweb-mode: format using nixfmt-rfc-style --- .../manual-packages/urweb-mode/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/default.nix index 4a407c454085..d5b597bdf47b 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/default.nix @@ -1,8 +1,9 @@ -{ lib -, melpaBuild -, urweb -, cl-lib -, flycheck +{ + lib, + melpaBuild, + urweb, + cl-lib, + flycheck, }: melpaBuild {