Merge pull request #141536 from AndersonTorres/new-recutils

emacsPackages.rec-mode: init at 1.8

3 files changed, 46 insertions, 20 deletions

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
index 3f5dd795ccb..2ee92e251bf 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
@@ -198,6 +198,8 @@
 
   railgun = callPackage ./railgun { };
 
+  rec-mode = callPackage ./rec-mode { };
+
   structured-haskell-mode = self.shm;
 
   sv-kalender = callPackage ./sv-kalender { };
diff --git a/pkgs/applications/editors/emacs/elisp-packages/rec-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/rec-mode/default.nix
new file mode 100644
index 00000000000..8cb560fde53
--- /dev/null
+++ b/pkgs/applications/editors/emacs/elisp-packages/rec-mode/default.nix
@@ -0,0 +1,18 @@
+{ lib
+, trivialBuild
+, recutils
+}:
+
+trivialBuild {
+  pname = "rec-mode";
+
+  inherit (recutils) version src;
+
+  postUnpack = ''
+    sourceRoot="$sourceRoot/etc"
+  '';
+
+  meta = recutils.meta // {
+    description = "A major mode for editing rec files";
+  };
+}
diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix
index d6a5b517a84..1501f8edda1 100644
--- a/pkgs/tools/misc/recutils/default.nix
+++ b/pkgs/tools/misc/recutils/default.nix
@@ -1,36 +1,42 @@
-{ fetchurl, lib, stdenv, emacs, curl, check, bc }:
+{ lib
+, stdenv
+, fetchurl
+, bc
+, check
+, curl
+}:
 
 stdenv.mkDerivation rec {
   pname = "recutils";
   version = "1.8";
 
   src = fetchurl {
-    url = "mirror://gnu/recutils/recutils-${version}.tar.gz";
-    sha256 = "14xiln4immfsw8isnvwvq0h23f6z0wilpgsc4qzabnrzb5lsx3nz";
+    url = "mirror://gnu/recutils/${pname}-${version}.tar.gz";
+    hash = "sha256-346uaVk/26U+Jky/SyMH37ghIMCbb6sj4trVGomlsZM=";
   };
 
   hardeningDisable = [ "format" ];
 
-  buildInputs = [ curl emacs ];
+  buildInputs = [
+    curl
+  ];
 
-  checkInputs = [ check bc ];
+  checkInputs = [
+    check
+    bc
+  ];
   doCheck = true;
 
-  meta = {
-    description = "Tools and libraries to access human-editable, text-based databases";
-
-    longDescription =
-      '' GNU Recutils is a set of tools and libraries to access
-         human-editable, text-based databases called recfiles.  The data is
-         stored as a sequence of records, each record containing an arbitrary
-         number of named fields.
-      '';
-
+  meta = with lib; {
     homepage = "https://www.gnu.org/software/recutils/";
-
-    license = lib.licenses.gpl3Plus;
-
-    platforms = lib.platforms.all;
-    maintainers = [ ];
+    description = "Tools and libraries to access human-editable, text-based databases";
+    longDescription = ''
+      GNU Recutils is a set of tools and libraries to access human-editable,
+      text-based databases called recfiles. The data is stored as a sequence of
+      records, each record containing an arbitrary number of named fields.
+    '';
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = platforms.all;
   };
 }