Merge pull request #154055 from AndersonTorres/new-elisp

elisp misc updates

pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix

@@ -7,13 +7,13 @@
 
 trivialBuild rec {
   pname = "apheleia";
-  version = "1.1.2+unstable=2021-10-03";
+  version = "1.2";
 
   src = fetchFromGitHub {
     owner = "raxod502";
     repo = pname;
-    rev = "8b9d576f2fda10d0c9051fc03c1eb1d9791e32fd";
-    hash = "sha256-QwGlCdHBll16mbfQxGw1EORZFUxYCZSt8ThYTTGjRpo=";
+    rev = "v${version}";
+    hash = "sha256-yd9yhQOs0+RB8RKaXnV/kClDm8cO97RkC8yw5b8IKRo=";
   };
 
   buildInputs = [
@@ -23,8 +23,12 @@ trivialBuild rec {
   meta = with lib; {
     homepage = "https://github.com/raxod502/apheleia";
     description = "Asynchronous buffer reformat";
+    longDescription = ''
+      Run code formatter on buffer contents without moving point, using RCS
+      patches and dynamic programming.
+    '';
     license = licenses.mit;
     maintainers = with maintainers; [ AndersonTorres leungbk ];
-    platforms = emacs.meta.platforms;
+    inherit (emacs.meta) platforms;
   };
 }

pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix

@@ -5,13 +5,13 @@
 
 trivialBuild {
   pname = "bqn-mode";
-  version = "0.pre+date=2021-12-03";
+  version = "0.pre+date=2022-01-07";
 
   src = fetchFromGitHub {
     owner = "museoa";
     repo = "bqn-mode";
-    rev = "38fba1193e0d1101f3b90bd76e419c011651ad6f";
-    sha256 = "0fdfz3kmrdgmx2i6fgrrj1cvapvrgnc3ahnwx3aayrpl1f091439";
+    rev = "86ef8b4d32d272b2765cd4a6e6e0b70a4f3e99a2";
+    hash = "sha256-6ygV/iNzzpZ77w+Dh/snHAzUxrbfaU9TxuNOtJK6pNQ=";
   };
 
   meta = with lib; {

pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix

@@ -229,8 +229,6 @@
 
   sv-kalender = callPackage ./sv-kalender { };
 
-  tramp = callPackage ./tramp { };
-
   youtube-dl = callPackage ./youtube-dl { };
 
   # From old emacsPackages (pre emacsPackagesNg)

pkgs/applications/editors/emacs/elisp-packages/org-generated.nix

@@ -1,33 +0,0 @@
-{ callPackage }:
-  {
-    org = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "org";
-        ename = "org";
-        version = "20210929";
-        src = fetchurl {
-          url = "https://orgmode.org/elpa/org-20210929.tar";
-          sha256 = "1fxhxjy48jxvs16x7270c4qj6n4lm952sn7q369c88gbf2jqxis4";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/org.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "org-plus-contrib";
-        ename = "org-plus-contrib";
-        version = "20210929";
-        src = fetchurl {
-          url = "https://orgmode.org/elpa/org-plus-contrib-20210929.tar";
-          sha256 = "0bn80kji2h423d39c0am2r3p2hwvdxs9rm31xa4810dff27ihxb1";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/org-plus-contrib.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-  }

pkgs/applications/editors/emacs/elisp-packages/tramp/default.nix

@@ -1,29 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, emacs
-, texinfo
-}:
-
-stdenv.mkDerivation rec {
-  pname = "tramp";
-  version = "2.5.1";
-
-  src = fetchurl {
-    url = "mirror://gnu/tramp/${pname}-${version}.tar.gz";
-    hash = "sha256-+jjWBcj2dP9Xyj4dzpAX86KnajVa9eFDcjD9xTw6vks=";
-  };
-
-  buildInputs = [
-    emacs
-    texinfo
-  ];
-
-  meta = with lib; {
-    homepage = "https://www.gnu.org/software/tramp";
-    description = "Transparently access remote files from Emacs (latest version)";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ AndersonTorres ];
-    inherit (emacs.meta) platforms;
-  };
-}