From 158362fe87abd94300b0ce6dbdf14e3fc04c4224 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Thu, 18 Jul 2024 03:31:11 +0800
Subject: [PATCH 1/3] emacsPackages.notdeft: trivialBuild -> melpaBuild

---
 .../manual-packages/notdeft/default.nix       | 27 ++++++++-----------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/default.nix
index f9af8c465b93..f3341c56f69c 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/default.nix
@@ -1,8 +1,7 @@
 { lib
 , stdenv
-, trivialBuild
+, melpaBuild
 , fetchFromGitHub
-, emacs
 , hydra
 , ivy
 , pkg-config
@@ -16,7 +15,7 @@
 
 let
   pname = "notdeft";
-  version = "20211204.0846";
+  version = "0-unstable-2021-12-04";
 
   src = fetchFromGitHub {
     owner = "hasu";
@@ -44,11 +43,10 @@ let
     '';
   };
 in
-trivialBuild {
+melpaBuild {
   inherit pname version src;
   packageRequires = lib.optional withHydra hydra
     ++ lib.optional withIvy ivy;
-  buildInputs = [ xapian ];
 
   postPatch = ''
     substituteInPlace notdeft-xapian.el \
@@ -56,20 +54,17 @@ trivialBuild {
                 "defcustom notdeft-xapian-program \"${notdeft-xapian}/bin/notdeft-xapian\""
   '';
 
-  # Extra modules are contained in the extras/ directory
-  preBuild = lib.optionalString withHydra ''
-    mv extras/notdeft-{mode-hydra,global-hydra}.el ./
-  '' +
-  lib.optionalString withIvy ''
-    mv extras/notdeft-ivy.el ./
-  '' + ''
-    rm -r extras/
+  files = ''
+    (:defaults
+     ${lib.optionalString withHydra ''"extras/notdeft-global-hydra.el"''}
+     ${lib.optionalString withHydra ''"extras/notdeft-mode-hydra.el"''}
+     ${lib.optionalString withIvy ''"extras/notdeft-ivy.el"''})
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://tero.hasu.is/notdeft/";
     description = "Fork of Deft that uses Xapian as a search engine";
-    maintainers = [ maintainers.nessdoor ];
-    platforms = platforms.linux;
+    maintainers = [ lib.maintainers.nessdoor ];
+    platforms = lib.platforms.linux;
   };
 }

From 31be87128a6577f3f6e04bd7fa0a145a7581d0cf Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Thu, 18 Jul 2024 03:45:24 +0800
Subject: [PATCH 2/3] emacsPackages.notdeft: add license

---
 .../emacs/elisp-packages/manual-packages/notdeft/default.nix     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/default.nix
index f3341c56f69c..c1735a3bd74f 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/default.nix
@@ -65,6 +65,7 @@ melpaBuild {
     homepage = "https://tero.hasu.is/notdeft/";
     description = "Fork of Deft that uses Xapian as a search engine";
     maintainers = [ lib.maintainers.nessdoor ];
+    license = lib.licenses.bsd3;
     platforms = lib.platforms.linux;
   };
 }

From 840872ae0c40788cc98fd3e90076ba062d2d0227 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Thu, 18 Jul 2024 03:32:58 +0800
Subject: [PATCH 3/3] emacsPackages.notdeft: format using nixfmt-rfc-style

---
 .../manual-packages/notdeft/default.nix       | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/default.nix
index c1735a3bd74f..62b6a696a384 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/default.nix
@@ -1,16 +1,17 @@
-{ lib
-, stdenv
-, melpaBuild
-, fetchFromGitHub
-, hydra
-, ivy
-, pkg-config
-, tclap
-, xapian
+{
+  lib,
+  stdenv,
+  melpaBuild,
+  fetchFromGitHub,
+  hydra,
+  ivy,
+  pkg-config,
+  tclap,
+  xapian,
   # Include pre-configured hydras
-, withHydra ? false
+  withHydra ? false,
   # Include Ivy integration
-, withIvy ? false
+  withIvy ? false,
 }:
 
 let
@@ -31,7 +32,11 @@ let
 
     sourceRoot = "${src.name}/xapian";
 
-    nativeBuildInputs = [ pkg-config tclap xapian ];
+    nativeBuildInputs = [
+      pkg-config
+      tclap
+      xapian
+    ];
 
     installPhase = ''
       runHook preInstall
@@ -45,8 +50,8 @@ let
 in
 melpaBuild {
   inherit pname version src;
-  packageRequires = lib.optional withHydra hydra
-    ++ lib.optional withIvy ivy;
+
+  packageRequires = lib.optional withHydra hydra ++ lib.optional withIvy ivy;
 
   postPatch = ''
     substituteInPlace notdeft-xapian.el \