diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
index 1534ee9c4c3e..832fc2c9b16f 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
@@ -3,7 +3,6 @@
   adoc-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -15,9 +14,9 @@
         url = "https://elpa.nongnu.org/nongnu/adoc-mode-0.7.0.tar";
         sha256 = "1gdjgybpbw3qj9mfmq9ljx4xaam1f6rwyrav2y2f5fpv6z7w0i61";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/adoc-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/adoc-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -25,7 +24,6 @@
   afternoon-theme = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -37,9 +35,9 @@
         url = "https://elpa.nongnu.org/nongnu/afternoon-theme-0.1.tar";
         sha256 = "0xxvr3njpbdlm8iyyklwijjaysyknwpw51hq2443wq37bsxciils";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/afternoon-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/afternoon-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -47,7 +45,6 @@
   alect-themes = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -59,9 +56,9 @@
         url = "https://elpa.nongnu.org/nongnu/alect-themes-0.10.tar";
         sha256 = "0pagkf0bb85sr3mvg8z6h6akb9hjmvfqmpiaiz121ys0r92m6nb7";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/alect-themes.html";
+        homepage = "https://elpa.nongnu.org/nongnu/alect-themes.html";
         license = lib.licenses.free;
       };
     }
@@ -82,7 +79,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ample-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/ample-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -103,7 +100,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/annotate.html";
+        homepage = "https://elpa.nongnu.org/nongnu/annotate.html";
         license = lib.licenses.free;
       };
     }
@@ -124,7 +121,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/anti-zenburn-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/anti-zenburn-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -132,7 +129,6 @@
   anzu = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -144,9 +140,9 @@
         url = "https://elpa.nongnu.org/nongnu/anzu-0.64.tar";
         sha256 = "0mv4xiy3481d5r4rypmw7nn1hjmsvlfz5dhgmpn6cqbpzkgb6zjb";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/anzu.html";
+        homepage = "https://elpa.nongnu.org/nongnu/anzu.html";
         license = lib.licenses.free;
       };
     }
@@ -167,7 +163,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/apache-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/apache-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -188,7 +184,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/apropospriate-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/apropospriate-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -196,7 +192,6 @@
   arduino-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       spinner,
@@ -209,12 +204,9 @@
         url = "https://elpa.nongnu.org/nongnu/arduino-mode-1.3.1.tar";
         sha256 = "1k42qx7kgm8svv70czzlkmm3c7cddf93bqvf6267hbkaihhyd21y";
       };
-      packageRequires = [
-        emacs
-        spinner
-      ];
+      packageRequires = [ spinner ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/arduino-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/arduino-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -235,7 +227,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/auto-dim-other-buffers.html";
+        homepage = "https://elpa.nongnu.org/nongnu/auto-dim-other-buffers.html";
         license = lib.licenses.free;
       };
     }
@@ -244,7 +236,6 @@
     {
       dash,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -256,12 +247,9 @@
         url = "https://elpa.nongnu.org/nongnu/autothemer-0.2.18.tar";
         sha256 = "1v6si9fh3rbka72r5jfd35bbvfbfaxr2kfi7jmsgj07fhx4bgl2d";
       };
-      packageRequires = [
-        dash
-        emacs
-      ];
+      packageRequires = [ dash ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/autothemer.html";
+        homepage = "https://elpa.nongnu.org/nongnu/autothemer.html";
         license = lib.licenses.free;
       };
     }
@@ -269,7 +257,6 @@
   base32 = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -281,9 +268,9 @@
         url = "https://elpa.nongnu.org/nongnu/base32-1.0.tar";
         sha256 = "1k1n0zlks9dammpmr0875xh5vw5prmc7rr5kwd262xidscj19k6w";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/base32.html";
+        homepage = "https://elpa.nongnu.org/nongnu/base32.html";
         license = lib.licenses.free;
       };
     }
@@ -291,7 +278,6 @@
   bash-completion = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -303,9 +289,9 @@
         url = "https://elpa.nongnu.org/nongnu/bash-completion-3.1.1.tar";
         sha256 = "1yc1a5cvmnp8dranrglpd7qjg35r6x4ndniinbmzinqr7dmydh62";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/bash-completion.html";
+        homepage = "https://elpa.nongnu.org/nongnu/bash-completion.html";
         license = lib.licenses.free;
       };
     }
@@ -326,7 +312,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/beancount.html";
+        homepage = "https://elpa.nongnu.org/nongnu/beancount.html";
         license = lib.licenses.free;
       };
     }
@@ -334,7 +320,6 @@
   better-jumper = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -346,9 +331,9 @@
         url = "https://elpa.nongnu.org/nongnu/better-jumper-1.0.1.tar";
         sha256 = "1jdmbp1jjip8vmmc66z2wgx95lzp1b92m66p160mdm4g3skl64c2";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/better-jumper.html";
+        homepage = "https://elpa.nongnu.org/nongnu/better-jumper.html";
         license = lib.licenses.free;
       };
     }
@@ -356,7 +341,6 @@
   bind-map = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -368,9 +352,9 @@
         url = "https://elpa.nongnu.org/nongnu/bind-map-1.1.2.tar";
         sha256 = "037xk912hx00ia62h6kdfa56g44dhd0628va22znxg251izvnqxq";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/bind-map.html";
+        homepage = "https://elpa.nongnu.org/nongnu/bind-map.html";
         license = lib.licenses.free;
       };
     }
@@ -391,7 +375,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/bison-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/bison-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -399,7 +383,6 @@
   blow = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -411,9 +394,9 @@
         url = "https://elpa.nongnu.org/nongnu/blow-1.0.tar";
         sha256 = "009x0y86692ccj2v0cizr40ly6xdp72bnwj5pjayg3y0ph4iz0cj";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/blow.html";
+        homepage = "https://elpa.nongnu.org/nongnu/blow.html";
         license = lib.licenses.free;
       };
     }
@@ -421,7 +404,6 @@
   blueprint-ts-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -433,9 +415,9 @@
         url = "https://elpa.nongnu.org/nongnu/blueprint-ts-mode-0.0.3.tar";
         sha256 = "0v1sk80dka2gdkwcbria12ih3jrna3866ngdswcskyqcnkxm7b7n";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/blueprint-ts-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/blueprint-ts-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -457,7 +439,7 @@
       };
       packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/boxquote.html";
+        homepage = "https://elpa.nongnu.org/nongnu/boxquote.html";
         license = lib.licenses.free;
       };
     }
@@ -465,7 +447,6 @@
   buttercup = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -477,9 +458,9 @@
         url = "https://elpa.nongnu.org/nongnu/buttercup-1.35.tar";
         sha256 = "0b9dxbn7pni2203xdg289ymkmhf458898i2lh7aplppmh68bms2c";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/buttercup.html";
+        homepage = "https://elpa.nongnu.org/nongnu/buttercup.html";
         license = lib.licenses.free;
       };
     }
@@ -487,7 +468,6 @@
   camera = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -499,9 +479,9 @@
         url = "https://elpa.nongnu.org/nongnu/camera-0.3.tar";
         sha256 = "0r9b20li82qcc141p4blyaj0xng5f4xrghhl09wc15ffi0cmbq7d";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/camera.html";
+        homepage = "https://elpa.nongnu.org/nongnu/camera.html";
         license = lib.licenses.free;
       };
     }
@@ -509,7 +489,6 @@
   caml = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -521,9 +500,9 @@
         url = "https://elpa.nongnu.org/nongnu/caml-4.9.tar";
         sha256 = "1xzk83bds4d23rk170n975mijlmin5dh7crfc5swwvzh8w88qxmk";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/caml.html";
+        homepage = "https://elpa.nongnu.org/nongnu/caml.html";
         license = lib.licenses.free;
       };
     }
@@ -544,7 +523,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/cdlatex.html";
+        homepage = "https://elpa.nongnu.org/nongnu/cdlatex.html";
         license = lib.licenses.free;
       };
     }
@@ -553,7 +532,6 @@
     {
       clojure-mode,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       parseedn,
@@ -573,7 +551,6 @@
       };
       packageRequires = [
         clojure-mode
-        emacs
         parseedn
         queue
         seq
@@ -582,7 +559,7 @@
         transient
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/cider.html";
+        homepage = "https://elpa.nongnu.org/nongnu/cider.html";
         license = lib.licenses.free;
       };
     }
@@ -590,7 +567,6 @@
   clojure-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -602,9 +578,9 @@
         url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.19.0.tar";
         sha256 = "10dpdi4yc7bbga2mllk46jfy58ppj8vlhs37zd9vlk9rnfc54r99";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/clojure-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/clojure-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -612,7 +588,6 @@
   clojure-ts-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -624,9 +599,9 @@
         url = "https://elpa.nongnu.org/nongnu/clojure-ts-mode-0.2.2.tar";
         sha256 = "14s3gawx2lazzd5ziz2plhl6k1qik8gfjka7fijgxb55ls9bvgrp";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/clojure-ts-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/clojure-ts-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -635,7 +610,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -647,12 +621,9 @@
         url = "https://elpa.nongnu.org/nongnu/coffee-mode-0.6.3.tar";
         sha256 = "1anywqp2b99dmilfnajxgf4msc0viw6ndl0lxpgaa7d2b3mzx9nq";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/coffee-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/coffee-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -683,7 +654,6 @@
     {
       consult,
       elpaBuild,
-      emacs,
       fetchurl,
       flycheck,
       lib,
@@ -698,11 +668,10 @@
       };
       packageRequires = [
         consult
-        emacs
         flycheck
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/consult-flycheck.html";
+        homepage = "https://elpa.nongnu.org/nongnu/consult-flycheck.html";
         license = lib.licenses.free;
       };
     }
@@ -711,7 +680,6 @@
     {
       corfu,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       popon,
@@ -726,11 +694,10 @@
       };
       packageRequires = [
         corfu
-        emacs
         popon
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/corfu-terminal.html";
+        homepage = "https://elpa.nongnu.org/nongnu/corfu-terminal.html";
         license = lib.licenses.free;
       };
     }
@@ -738,7 +705,6 @@
   crux = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -750,9 +716,9 @@
         url = "https://elpa.nongnu.org/nongnu/crux-0.5.0.tar";
         sha256 = "0cykjwwhl6r02fsyam4vnmlxiyq8b8qsgncb1hjnz4gj7mxc9gg4";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/crux.html";
+        homepage = "https://elpa.nongnu.org/nongnu/crux.html";
         license = lib.licenses.free;
       };
     }
@@ -761,7 +727,6 @@
     {
       csv-mode,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -773,12 +738,9 @@
         url = "https://elpa.nongnu.org/nongnu/csv2ledger-1.5.4.tar";
         sha256 = "1h935g97fjrs1q0yz0q071zp91bhsb3yg13zqpp8il5gif20qqls";
       };
-      packageRequires = [
-        csv-mode
-        emacs
-      ];
+      packageRequires = [ csv-mode ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/csv2ledger.html";
+        homepage = "https://elpa.nongnu.org/nongnu/csv2ledger.html";
         license = lib.licenses.free;
       };
     }
@@ -799,7 +761,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/cyberpunk-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/cyberpunk-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -807,7 +769,6 @@
   cycle-at-point = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       recomplete,
@@ -820,12 +781,9 @@
         url = "https://elpa.nongnu.org/nongnu/cycle-at-point-0.2.tar";
         sha256 = "1q3gylksr754s0pl8x1hdk0q4p0vz6lnasswgsqpx44nmnbsrw6z";
       };
-      packageRequires = [
-        emacs
-        recomplete
-      ];
+      packageRequires = [ recomplete ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/cycle-at-point.html";
+        homepage = "https://elpa.nongnu.org/nongnu/cycle-at-point.html";
         license = lib.licenses.free;
       };
     }
@@ -833,21 +791,20 @@
   d-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "d-mode";
       ename = "d-mode";
-      version = "202003130913";
+      version = "202408131340";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/d-mode-202003130913.tar";
-        sha256 = "0sdyk8q1pfk5gbj5hdyc1djmyb02vvhs4s2fbbxk52nlkx95p46s";
+        url = "https://elpa.nongnu.org/nongnu/d-mode-202408131340.tar";
+        sha256 = "19dgc0yd2fmc9xbrajc1l98p7p2wiwg43ajq4gssxdshb5vi5mn9";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/d-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/d-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -855,7 +812,6 @@
   dart-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -867,9 +823,9 @@
         url = "https://elpa.nongnu.org/nongnu/dart-mode-1.0.7.tar";
         sha256 = "1k9pn7nqskz39m3zwi9jhd1a2q440jgrla1a37qip73mwrdril1i";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/dart-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/dart-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -878,7 +834,6 @@
     {
       denote,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -890,12 +845,9 @@
         url = "https://elpa.nongnu.org/nongnu/denote-refs-0.1.2.tar";
         sha256 = "0jq14adxpx9bxddkj3a4bahyr3yarjn85iplhhy9yk7k9wy7wis0";
       };
-      packageRequires = [
-        denote
-        emacs
-      ];
+      packageRequires = [ denote ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/denote-refs.html";
+        homepage = "https://elpa.nongnu.org/nongnu/denote-refs.html";
         license = lib.licenses.free;
       };
     }
@@ -903,7 +855,6 @@
   devhelp = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -915,9 +866,9 @@
         url = "https://elpa.nongnu.org/nongnu/devhelp-1.0.tar";
         sha256 = "14x1990yr3qqzv9dqn7xg69hqgpmgjsi68f2fg07v670lk7hs8xb";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/devhelp.html";
+        homepage = "https://elpa.nongnu.org/nongnu/devhelp.html";
         license = lib.licenses.free;
       };
     }
@@ -925,7 +876,6 @@
   devil = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -937,9 +887,9 @@
         url = "https://elpa.nongnu.org/nongnu/devil-0.6.0.tar";
         sha256 = "01n552pvr598igmd2q6w9kgjrwgzrgrb4w59mxpsylcv6wy2v2h5";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/devil.html";
+        homepage = "https://elpa.nongnu.org/nongnu/devil.html";
         license = lib.licenses.free;
       };
     }
@@ -947,7 +897,6 @@
   diff-ansi = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -959,9 +908,9 @@
         url = "https://elpa.nongnu.org/nongnu/diff-ansi-0.2.tar";
         sha256 = "0i1216mw0zgy3jdhhxsn5wpjqgxv5als1lljb1ddqjl21y6z74nw";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/diff-ansi.html";
+        homepage = "https://elpa.nongnu.org/nongnu/diff-ansi.html";
         license = lib.licenses.free;
       };
     }
@@ -969,7 +918,6 @@
   doc-show-inline = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -981,9 +929,9 @@
         url = "https://elpa.nongnu.org/nongnu/doc-show-inline-0.1.tar";
         sha256 = "13y7k4zp8x8fcyidw0jy6zf92af660zwb7qpps91l2dh7zwjsl2v";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/doc-show-inline.html";
+        homepage = "https://elpa.nongnu.org/nongnu/doc-show-inline.html";
         license = lib.licenses.free;
       };
     }
@@ -991,7 +939,6 @@
   dockerfile-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1003,9 +950,9 @@
         url = "https://elpa.nongnu.org/nongnu/dockerfile-mode-1.7.tar";
         sha256 = "1rpgjhbb2vzz6fqcqksvx27a1mj8p3bgmjh00433qd8g7hghc9v7";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/dockerfile-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/dockerfile-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -1013,7 +960,6 @@
   dracula-theme = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1025,9 +971,9 @@
         url = "https://elpa.nongnu.org/nongnu/dracula-theme-1.8.2.tar";
         sha256 = "04r7cn4n8n4fiwblmfsa23d1qh11mqfz0cghq6ss72flp5awj46g";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/dracula-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/dracula-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -1042,14 +988,14 @@
     elpaBuild {
       pname = "drupal-mode";
       ename = "drupal-mode";
-      version = "0.7.4";
+      version = "0.8.1";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/drupal-mode-0.7.4.tar";
-        sha256 = "1wr05pi5sm994cdzj329gr1lwxvq4w9wmc806izxq3fjifx0m609";
+        url = "https://elpa.nongnu.org/nongnu/drupal-mode-0.8.1.tar";
+        sha256 = "0f3dd2647g964grzq95d73iznhpmrr9w7fmkifjk3ivz0rgdgjsq";
       };
       packageRequires = [ php-mode ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/drupal-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/drupal-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -1057,7 +1003,6 @@
   dslide = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1069,9 +1014,9 @@
         url = "https://elpa.nongnu.org/nongnu/dslide-0.5.3.tar";
         sha256 = "11q807jp90y37s1njmr6qlnqi9pk371gj8mwg57kgjvc55qdyas5";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/dslide.html";
+        homepage = "https://elpa.nongnu.org/nongnu/dslide.html";
         license = lib.licenses.free;
       };
     }
@@ -1080,7 +1025,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1092,12 +1036,9 @@
         url = "https://elpa.nongnu.org/nongnu/eat-0.9.4.tar";
         sha256 = "0jn5rzyg1abjsb18brr1ha4vmhvxpkp8pxvaxfa0g0phcb2iz5ql";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/eat.html";
+        homepage = "https://elpa.nongnu.org/nongnu/eat.html";
         license = lib.licenses.free;
       };
     }
@@ -1105,7 +1046,6 @@
   edit-indirect = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1117,9 +1057,9 @@
         url = "https://elpa.nongnu.org/nongnu/edit-indirect-0.1.13.tar";
         sha256 = "10zshywbp0f00k2d4f5bc44ynvw3f0626vl35lbah1kwmgzrrjdd";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/edit-indirect.html";
+        homepage = "https://elpa.nongnu.org/nongnu/edit-indirect.html";
         license = lib.licenses.free;
       };
     }
@@ -1127,7 +1067,6 @@
   editorconfig = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       nadvice,
@@ -1140,12 +1079,9 @@
         url = "https://elpa.nongnu.org/nongnu/editorconfig-0.11.0.tar";
         sha256 = "0adzm6fhx5vgg20qy9f7cqpnx938mp1ls91y5cw71pjm9ihs2cyv";
       };
-      packageRequires = [
-        emacs
-        nadvice
-      ];
+      packageRequires = [ nadvice ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/editorconfig.html";
+        homepage = "https://elpa.nongnu.org/nongnu/editorconfig.html";
         license = lib.licenses.free;
       };
     }
@@ -1153,7 +1089,6 @@
   elixir-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1165,9 +1100,9 @@
         url = "https://elpa.nongnu.org/nongnu/elixir-mode-2.5.0.tar";
         sha256 = "1x6aral441mv9443h21lnaymbpazwii22wcqvk2jfqjmyl1xj1yz";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/elixir-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/elixir-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -1175,7 +1110,6 @@
   elpher = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1187,9 +1121,30 @@
         url = "https://elpa.nongnu.org/nongnu/elpher-3.6.2.tar";
         sha256 = "168cyhkp2q57k26r961c3g521qf8gj2b5rl8k1fg4z60y63s1rpk";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/elpher.html";
+        homepage = "https://elpa.nongnu.org/nongnu/elpher.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  emacsql = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "emacsql";
+      ename = "emacsql";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/emacsql-4.0.1.tar";
+        sha256 = "0098ixlx70vx4mxlcyddkij9aj4sgcf7p699cii0pz51lg9bymc0";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu/emacsql.html";
         license = lib.licenses.free;
       };
     }
@@ -1211,7 +1166,7 @@
       };
       packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/engine-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/engine-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -1232,7 +1187,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/evil.html";
+        homepage = "https://elpa.nongnu.org/nongnu/evil.html";
         license = lib.licenses.free;
       };
     }
@@ -1258,7 +1213,7 @@
         evil
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/evil-anzu.html";
+        homepage = "https://elpa.nongnu.org/nongnu/evil-anzu.html";
         license = lib.licenses.free;
       };
     }
@@ -1280,7 +1235,7 @@
       };
       packageRequires = [ evil ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/evil-args.html";
+        homepage = "https://elpa.nongnu.org/nongnu/evil-args.html";
         license = lib.licenses.free;
       };
     }
@@ -1289,7 +1244,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       evil,
       fetchurl,
       lib,
@@ -1304,11 +1258,10 @@
       };
       packageRequires = [
         cl-lib
-        emacs
         evil
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/evil-escape.html";
+        homepage = "https://elpa.nongnu.org/nongnu/evil-escape.html";
         license = lib.licenses.free;
       };
     }
@@ -1334,7 +1287,7 @@
         evil
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/evil-exchange.html";
+        homepage = "https://elpa.nongnu.org/nongnu/evil-exchange.html";
         license = lib.licenses.free;
       };
     }
@@ -1342,7 +1295,6 @@
   evil-goggles = callPackage (
     {
       elpaBuild,
-      emacs,
       evil,
       fetchurl,
       lib,
@@ -1355,12 +1307,9 @@
         url = "https://elpa.nongnu.org/nongnu/evil-goggles-0.0.2.tar";
         sha256 = "0nipk8r7l5c50n9zry5264cfilx730l68ssldw3hyj14ybdf6dch";
       };
-      packageRequires = [
-        emacs
-        evil
-      ];
+      packageRequires = [ evil ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/evil-goggles.html";
+        homepage = "https://elpa.nongnu.org/nongnu/evil-goggles.html";
         license = lib.licenses.free;
       };
     }
@@ -1386,7 +1335,7 @@
         iedit
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/evil-iedit-state.html";
+        homepage = "https://elpa.nongnu.org/nongnu/evil-iedit-state.html";
         license = lib.licenses.free;
       };
     }
@@ -1412,7 +1361,7 @@
         evil
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/evil-indent-plus.html";
+        homepage = "https://elpa.nongnu.org/nongnu/evil-indent-plus.html";
         license = lib.licenses.free;
       };
     }
@@ -1440,7 +1389,7 @@
         smartparens
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/evil-lisp-state.html";
+        homepage = "https://elpa.nongnu.org/nongnu/evil-lisp-state.html";
         license = lib.licenses.free;
       };
     }
@@ -1448,7 +1397,6 @@
   evil-matchit = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1460,9 +1408,9 @@
         url = "https://elpa.nongnu.org/nongnu/evil-matchit-3.0.4.tar";
         sha256 = "1ib2xlz7ciaszw2j5184mf6560jmap93vh515sk8dmkkahdwsjgz";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/evil-matchit.html";
+        homepage = "https://elpa.nongnu.org/nongnu/evil-matchit.html";
         license = lib.licenses.free;
       };
     }
@@ -1470,7 +1418,6 @@
   evil-nerd-commenter = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1482,9 +1429,9 @@
         url = "https://elpa.nongnu.org/nongnu/evil-nerd-commenter-3.6.1.tar";
         sha256 = "1nzqwqp2gq3wka2x782yqz5d8bw3wglra42907kylkqwqbxryh0w";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/evil-nerd-commenter.html";
+        homepage = "https://elpa.nongnu.org/nongnu/evil-nerd-commenter.html";
         license = lib.licenses.free;
       };
     }
@@ -1492,7 +1439,6 @@
   evil-numbers = callPackage (
     {
       elpaBuild,
-      emacs,
       evil,
       fetchurl,
       lib,
@@ -1505,12 +1451,9 @@
         url = "https://elpa.nongnu.org/nongnu/evil-numbers-0.7.tar";
         sha256 = "1k5vrh8bj9kldqq8kxn1qi3k82i7k4v4h6nkk9hng8p90zhac02i";
       };
-      packageRequires = [
-        emacs
-        evil
-      ];
+      packageRequires = [ evil ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/evil-numbers.html";
+        homepage = "https://elpa.nongnu.org/nongnu/evil-numbers.html";
         license = lib.licenses.free;
       };
     }
@@ -1532,7 +1475,7 @@
       };
       packageRequires = [ evil ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/evil-surround.html";
+        homepage = "https://elpa.nongnu.org/nongnu/evil-surround.html";
         license = lib.licenses.free;
       };
     }
@@ -1558,7 +1501,7 @@
         evil
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/evil-visual-mark-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/evil-visual-mark-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -1580,7 +1523,7 @@
       };
       packageRequires = [ evil ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/evil-visualstar.html";
+        homepage = "https://elpa.nongnu.org/nongnu/evil-visualstar.html";
         license = lib.licenses.free;
       };
     }
@@ -1588,7 +1531,6 @@
   exec-path-from-shell = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1600,9 +1542,9 @@
         url = "https://elpa.nongnu.org/nongnu/exec-path-from-shell-2.2.tar";
         sha256 = "14nzk04aypqminpqs181nh3di23nnw64z0ir940ajs9bx5pv9s1w";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/exec-path-from-shell.html";
+        homepage = "https://elpa.nongnu.org/nongnu/exec-path-from-shell.html";
         license = lib.licenses.free;
       };
     }
@@ -1624,7 +1566,7 @@
       };
       packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/flx.html";
+        homepage = "https://elpa.nongnu.org/nongnu/flx.html";
         license = lib.licenses.free;
       };
     }
@@ -1650,7 +1592,7 @@
         flx
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/flx-ido.html";
+        homepage = "https://elpa.nongnu.org/nongnu/flx-ido.html";
         license = lib.licenses.free;
       };
     }
@@ -1658,7 +1600,6 @@
   flycheck = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1670,9 +1611,9 @@
         url = "https://elpa.nongnu.org/nongnu/flycheck-34.1.tar";
         sha256 = "1jj1c4gq39ik8fihsz13wp4c26fm2m6kyr7ir22ql0d007zm3173";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/flycheck.html";
+        homepage = "https://elpa.nongnu.org/nongnu/flycheck.html";
         license = lib.licenses.free;
       };
     }
@@ -1680,7 +1621,6 @@
   flymake-guile = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       flymake ? null,
       lib,
@@ -1693,12 +1633,9 @@
         url = "https://elpa.nongnu.org/nongnu/flymake-guile-0.5.tar";
         sha256 = "0gfblb49l52j7iq3y6fxx1jpr72z61pwxsxfknvfi4y05znxnf0k";
       };
-      packageRequires = [
-        emacs
-        flymake
-      ];
+      packageRequires = [ flymake ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/flymake-guile.html";
+        homepage = "https://elpa.nongnu.org/nongnu/flymake-guile.html";
         license = lib.licenses.free;
       };
     }
@@ -1706,7 +1643,6 @@
   flymake-kondor = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1718,9 +1654,9 @@
         url = "https://elpa.nongnu.org/nongnu/flymake-kondor-0.1.3.tar";
         sha256 = "0y5qnlk3q0fjch12d4vwni7v6rk0h5056s5lzjgns71x36xd1i21";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/flymake-kondor.html";
+        homepage = "https://elpa.nongnu.org/nongnu/flymake-kondor.html";
         license = lib.licenses.free;
       };
     }
@@ -1728,7 +1664,6 @@
   flymake-popon = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       flymake ? null,
       lib,
@@ -1744,13 +1679,12 @@
         sha256 = "0a9p0mnp1n4znb9xgi5ldjv8x1khhdr5idb8vcd444nd03q0lj6s";
       };
       packageRequires = [
-        emacs
         flymake
         popon
         posframe
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/flymake-popon.html";
+        homepage = "https://elpa.nongnu.org/nongnu/flymake-popon.html";
         license = lib.licenses.free;
       };
     }
@@ -1759,7 +1693,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1771,12 +1704,9 @@
         url = "https://elpa.nongnu.org/nongnu/focus-1.0.1.tar";
         sha256 = "164xlxc5x2i955rfjdhlxp5ch55bh79gr7mzfychkjx0x088hcaa";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/focus.html";
+        homepage = "https://elpa.nongnu.org/nongnu/focus.html";
         license = lib.licenses.free;
       };
     }
@@ -1797,7 +1727,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/forth-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/forth-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -1819,7 +1749,7 @@
       };
       packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/free-keys.html";
+        homepage = "https://elpa.nongnu.org/nongnu/free-keys.html";
         license = lib.licenses.free;
       };
     }
@@ -1827,7 +1757,6 @@
   gc-buffers = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1839,9 +1768,9 @@
         url = "https://elpa.nongnu.org/nongnu/gc-buffers-1.0.tar";
         sha256 = "00204vanfabyf6cgbn64xgqhqz8mlppizsgi31xg6id1qgrj37p3";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/gc-buffers.html";
+        homepage = "https://elpa.nongnu.org/nongnu/gc-buffers.html";
         license = lib.licenses.free;
       };
     }
@@ -1849,7 +1778,6 @@
   geiser = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       project,
@@ -1862,12 +1790,9 @@
         url = "https://elpa.nongnu.org/nongnu/geiser-0.31.tar";
         sha256 = "0szyasza76ak4qny9v9i3sk1m3mahlxcvvsk078q8rp9cms5lzkv";
       };
-      packageRequires = [
-        emacs
-        project
-      ];
+      packageRequires = [ project ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/geiser.html";
+        homepage = "https://elpa.nongnu.org/nongnu/geiser.html";
         license = lib.licenses.free;
       };
     }
@@ -1875,7 +1800,6 @@
   geiser-chez = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       geiser,
       lib,
@@ -1888,12 +1812,9 @@
         url = "https://elpa.nongnu.org/nongnu/geiser-chez-0.18.tar";
         sha256 = "14l2a7njx3bzxj1qpc1m5mx4prm3ixgsiii3k484brbn4vim4j58";
       };
-      packageRequires = [
-        emacs
-        geiser
-      ];
+      packageRequires = [ geiser ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/geiser-chez.html";
+        homepage = "https://elpa.nongnu.org/nongnu/geiser-chez.html";
         license = lib.licenses.free;
       };
     }
@@ -1901,7 +1822,6 @@
   geiser-chibi = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       geiser,
       lib,
@@ -1914,12 +1834,9 @@
         url = "https://elpa.nongnu.org/nongnu/geiser-chibi-0.17.tar";
         sha256 = "17kkgs0z2xwbbwn7s49lnha6pmri1h7jnnhh5qvxif5xyvyy8bih";
       };
-      packageRequires = [
-        emacs
-        geiser
-      ];
+      packageRequires = [ geiser ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/geiser-chibi.html";
+        homepage = "https://elpa.nongnu.org/nongnu/geiser-chibi.html";
         license = lib.licenses.free;
       };
     }
@@ -1927,7 +1844,6 @@
   geiser-chicken = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       geiser,
       lib,
@@ -1940,12 +1856,9 @@
         url = "https://elpa.nongnu.org/nongnu/geiser-chicken-0.17.tar";
         sha256 = "1l0x0b5gcmc6v2gd2jhrz4zz2630rggq8w7ffzhsf8b8hr4d1ixy";
       };
-      packageRequires = [
-        emacs
-        geiser
-      ];
+      packageRequires = [ geiser ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/geiser-chicken.html";
+        homepage = "https://elpa.nongnu.org/nongnu/geiser-chicken.html";
         license = lib.licenses.free;
       };
     }
@@ -1953,7 +1866,6 @@
   geiser-gambit = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       geiser,
       lib,
@@ -1966,12 +1878,9 @@
         url = "https://elpa.nongnu.org/nongnu/geiser-gambit-0.18.1.tar";
         sha256 = "1pqify8vqxzpm202zz9q92hp65yhs624z6qc2hgp9c1zms56jkqs";
       };
-      packageRequires = [
-        emacs
-        geiser
-      ];
+      packageRequires = [ geiser ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/geiser-gambit.html";
+        homepage = "https://elpa.nongnu.org/nongnu/geiser-gambit.html";
         license = lib.licenses.free;
       };
     }
@@ -1979,7 +1888,6 @@
   geiser-gauche = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       geiser,
       lib,
@@ -1992,12 +1900,9 @@
         url = "https://elpa.nongnu.org/nongnu/geiser-gauche-0.0.2.tar";
         sha256 = "189addy5xvx62j91ihi23i8dh5msm0wlwxyi8n07f4m2garrn14l";
       };
-      packageRequires = [
-        emacs
-        geiser
-      ];
+      packageRequires = [ geiser ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/geiser-gauche.html";
+        homepage = "https://elpa.nongnu.org/nongnu/geiser-gauche.html";
         license = lib.licenses.free;
       };
     }
@@ -2005,7 +1910,6 @@
   geiser-guile = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       geiser,
       lib,
@@ -2014,18 +1918,17 @@
     elpaBuild {
       pname = "geiser-guile";
       ename = "geiser-guile";
-      version = "0.28.1";
+      version = "0.28.2";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.28.1.tar";
-        sha256 = "148bvwcppv0qk7yh38c0m36hldw58cqhbyniyzwffagmlg0yqzsb";
+        url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.28.2.tar";
+        sha256 = "02s44dj6cr6fmiby6yljil7cgp00h31h3fs1a428lr3v51z1i38m";
       };
       packageRequires = [
-        emacs
         geiser
         transient
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/geiser-guile.html";
+        homepage = "https://elpa.nongnu.org/nongnu/geiser-guile.html";
         license = lib.licenses.free;
       };
     }
@@ -2033,7 +1936,6 @@
   geiser-kawa = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       geiser,
       lib,
@@ -2046,12 +1948,9 @@
         url = "https://elpa.nongnu.org/nongnu/geiser-kawa-0.0.1.tar";
         sha256 = "1qh4qr406ahk4k8g46nzkiic1fidhni0a5zv4i84cdypv1c4473p";
       };
-      packageRequires = [
-        emacs
-        geiser
-      ];
+      packageRequires = [ geiser ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/geiser-kawa.html";
+        homepage = "https://elpa.nongnu.org/nongnu/geiser-kawa.html";
         license = lib.licenses.free;
       };
     }
@@ -2059,7 +1958,6 @@
   geiser-mit = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       geiser,
       lib,
@@ -2072,12 +1970,9 @@
         url = "https://elpa.nongnu.org/nongnu/geiser-mit-0.15.tar";
         sha256 = "12wimv5x2k64ww9x147dlx2gfygmgz96hqcdhkbidi1smhfz11gk";
       };
-      packageRequires = [
-        emacs
-        geiser
-      ];
+      packageRequires = [ geiser ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/geiser-mit.html";
+        homepage = "https://elpa.nongnu.org/nongnu/geiser-mit.html";
         license = lib.licenses.free;
       };
     }
@@ -2085,7 +1980,6 @@
   geiser-racket = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       geiser,
       lib,
@@ -2098,12 +1992,9 @@
         url = "https://elpa.nongnu.org/nongnu/geiser-racket-0.16.tar";
         sha256 = "08sn32ams88ism6k24kq7s54vrdblkn15x9lldyqg4zapbllr1ny";
       };
-      packageRequires = [
-        emacs
-        geiser
-      ];
+      packageRequires = [ geiser ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/geiser-racket.html";
+        homepage = "https://elpa.nongnu.org/nongnu/geiser-racket.html";
         license = lib.licenses.free;
       };
     }
@@ -2111,7 +2002,6 @@
   geiser-stklos = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       geiser,
       lib,
@@ -2124,42 +2014,39 @@
         url = "https://elpa.nongnu.org/nongnu/geiser-stklos-1.8.tar";
         sha256 = "1525n49igcnwr2wsjv4a74yk1gbjvv1l9rmkcpafyxyykvi94j6s";
       };
-      packageRequires = [
-        emacs
-        geiser
-      ];
+      packageRequires = [ geiser ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/geiser-stklos.html";
+        homepage = "https://elpa.nongnu.org/nongnu/geiser-stklos.html";
         license = lib.licenses.free;
       };
     }
   ) { };
   git-commit = callPackage (
     {
-      dash,
+      compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
+      seq,
       transient,
       with-editor,
     }:
     elpaBuild {
       pname = "git-commit";
       ename = "git-commit";
-      version = "3.3.0";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/git-commit-3.3.0.tar";
-        sha256 = "0lp6r4w1k0idvfc2h0chlplap2i4x2slva9cw3iw1rhhxbcvlmdx";
+        url = "https://elpa.nongnu.org/nongnu/git-commit-4.0.0.tar";
+        sha256 = "10fh8i3l07qxsfw23q2mkb7rxgc7n2chirzdjd9bnlqrxybrayli";
       };
       packageRequires = [
-        dash
-        emacs
+        compat
+        seq
         transient
         with-editor
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/git-commit.html";
+        homepage = "https://elpa.nongnu.org/nongnu/git-commit.html";
         license = lib.licenses.free;
       };
     }
@@ -2168,24 +2055,48 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "git-modes";
       ename = "git-modes";
-      version = "1.4.3";
+      version = "1.4.4";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/git-modes-1.4.3.tar";
-        sha256 = "0fhmzx4cmj7g4cbv3h1gjwhwnvfqcgiifhz4hl98r7zzmz8z7kdk";
+        url = "https://elpa.nongnu.org/nongnu/git-modes-1.4.4.tar";
+        sha256 = "161n8anh3i7aj9995nry879kkfvawm1dkzlxdqfwmzl85g8yqx58";
+      };
+      packageRequires = [ compat ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu/git-modes.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gnosis = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacsql,
+      fetchurl,
+      lib,
+      transient,
+    }:
+    elpaBuild {
+      pname = "gnosis";
+      ename = "gnosis";
+      version = "0.4.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/gnosis-0.4.1.tar";
+        sha256 = "1iqpssf3gxv54gig718529y3cfjybvvjcvndzhjsiyw5b33pkbby";
       };
       packageRequires = [
         compat
-        emacs
+        emacsql
+        transient
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/git-modes.html";
+        homepage = "https://elpa.nongnu.org/nongnu/gnosis.html";
         license = lib.licenses.free;
       };
     }
@@ -2206,7 +2117,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/gnu-apl-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/gnu-apl-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -2214,7 +2125,6 @@
   gnu-indent = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2226,9 +2136,9 @@
         url = "https://elpa.nongnu.org/nongnu/gnu-indent-1.0.tar";
         sha256 = "1aj8si93ig1qbdqgq3f4jwnsws63drkfwfzxlq0i3qqfhsni0a15";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/gnu-indent.html";
+        homepage = "https://elpa.nongnu.org/nongnu/gnu-indent.html";
         license = lib.licenses.free;
       };
     }
@@ -2236,7 +2146,6 @@
   gnuplot = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2248,9 +2157,9 @@
         url = "https://elpa.nongnu.org/nongnu/gnuplot-0.8.1.tar";
         sha256 = "1y364j5gr8cnkndxd088kaxd2ah0nd7176gfjligm3ngpgg6ndyx";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/gnuplot.html";
+        homepage = "https://elpa.nongnu.org/nongnu/gnuplot.html";
         license = lib.licenses.free;
       };
     }
@@ -2258,7 +2167,6 @@
   go-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2270,9 +2178,9 @@
         url = "https://elpa.nongnu.org/nongnu/go-mode-1.6.0.tar";
         sha256 = "0ilvkl7iv47v0xyha07gfyv1a4c50ifw57bp7rx8ai77v30f3a2a";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/go-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/go-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -2293,7 +2201,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/golden-ratio.html";
+        homepage = "https://elpa.nongnu.org/nongnu/golden-ratio.html";
         license = lib.licenses.free;
       };
     }
@@ -2301,7 +2209,6 @@
   gotham-theme = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2313,9 +2220,9 @@
         url = "https://elpa.nongnu.org/nongnu/gotham-theme-1.1.9.tar";
         sha256 = "195r8idq2ak6wpmgifpgvx52hljb8i7p9wx6ii1kh0baaqk31qq2";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/gotham-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/gotham-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -2323,7 +2230,6 @@
   goto-chg = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2335,9 +2241,9 @@
         url = "https://elpa.nongnu.org/nongnu/goto-chg-1.7.5.tar";
         sha256 = "1j5vk8vc1v865fc8gdy0p5lpp2kkl0yn9f75npiva3ay6mwvnvay";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/goto-chg.html";
+        homepage = "https://elpa.nongnu.org/nongnu/goto-chg.html";
         license = lib.licenses.free;
       };
     }
@@ -2346,7 +2252,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       transient,
@@ -2361,11 +2266,10 @@
       };
       packageRequires = [
         compat
-        emacs
         transient
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/gptel.html";
+        homepage = "https://elpa.nongnu.org/nongnu/gptel.html";
         license = lib.licenses.free;
       };
     }
@@ -2373,7 +2277,6 @@
   graphql-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2385,9 +2288,9 @@
         url = "https://elpa.nongnu.org/nongnu/graphql-mode-1.0.0.tar";
         sha256 = "0pfyznfndc8g2g3a3pxzcjsh3cah3amhz5124flrja5fqdgdmpjz";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/graphql-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/graphql-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -2408,7 +2311,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/gruber-darker-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/gruber-darker-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -2430,7 +2333,7 @@
       };
       packageRequires = [ autothemer ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/gruvbox-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/gruvbox-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -2451,7 +2354,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/guru-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/guru-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -2460,7 +2363,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2472,12 +2374,9 @@
         url = "https://elpa.nongnu.org/nongnu/haml-mode-3.2.1.tar";
         sha256 = "0hhra7bryk3n649s3byzq6vv5ywd4bqkfppya7bswqkj3bakiyil";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/haml-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/haml-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -2485,7 +2384,6 @@
   haskell-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2497,9 +2395,9 @@
         url = "https://elpa.nongnu.org/nongnu/haskell-mode-17.5.tar";
         sha256 = "1yjy0cvgs5cnq5d9sv24p1p66z83r9rhbgn0nsccc12rn2gm3hyn";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/haskell-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/haskell-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -2507,7 +2405,6 @@
   haskell-tng-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2519,9 +2416,9 @@
         url = "https://elpa.nongnu.org/nongnu/haskell-tng-mode-0.0.1.tar";
         sha256 = "0l6rs93322la2fn8wyvxshl6f967ngamw2m1hnm2j6hvmqph5cpj";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/haskell-tng-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/haskell-tng-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -2547,7 +2444,7 @@
         wfnames
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/helm.html";
+        homepage = "https://elpa.nongnu.org/nongnu/helm.html";
         license = lib.licenses.free;
       };
     }
@@ -2556,7 +2453,6 @@
     {
       async,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2568,12 +2464,9 @@
         url = "https://elpa.nongnu.org/nongnu/helm-core-3.9.9.tar";
         sha256 = "067x4g19w032671545bfah4262xyhgnwxkaw8pdk4fqd5znw0yck";
       };
-      packageRequires = [
-        async
-        emacs
-      ];
+      packageRequires = [ async ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/helm-core.html";
+        homepage = "https://elpa.nongnu.org/nongnu/helm-core.html";
         license = lib.licenses.free;
       };
     }
@@ -2581,7 +2474,6 @@
   hideshowvis = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2593,9 +2485,9 @@
         url = "https://elpa.nongnu.org/nongnu/hideshowvis-0.8.tar";
         sha256 = "0xx2jjv95r1nhlf729y0zplfpjlh46nfnixmd3f5jc3z2pc6zf5b";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/hideshowvis.html";
+        homepage = "https://elpa.nongnu.org/nongnu/hideshowvis.html";
         license = lib.licenses.free;
       };
     }
@@ -2603,7 +2495,6 @@
   highlight-parentheses = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2615,9 +2506,9 @@
         url = "https://elpa.nongnu.org/nongnu/highlight-parentheses-2.2.2.tar";
         sha256 = "13686dkgpn30di3kkc60l3dhrrjdknqkmvgjnl97mrbikxfma7w2";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/highlight-parentheses.html";
+        homepage = "https://elpa.nongnu.org/nongnu/highlight-parentheses.html";
         license = lib.licenses.free;
       };
     }
@@ -2625,7 +2516,6 @@
   hl-block-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2637,9 +2527,9 @@
         url = "https://elpa.nongnu.org/nongnu/hl-block-mode-0.2.tar";
         sha256 = "0anv7bvrwylp504l3g42jcbcfmibv9jzs2kbkny46xd9vfb3kyrl";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/hl-block-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/hl-block-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -2647,7 +2537,6 @@
   hl-column = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2659,9 +2548,9 @@
         url = "https://elpa.nongnu.org/nongnu/hl-column-1.0.tar";
         sha256 = "11d7xplpjx0b6ppcjv4giazrla1qcaaf2i6s5g0j5zxb1m60kkfz";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/hl-column.html";
+        homepage = "https://elpa.nongnu.org/nongnu/hl-column.html";
         license = lib.licenses.free;
       };
     }
@@ -2682,7 +2571,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/htmlize.html";
+        homepage = "https://elpa.nongnu.org/nongnu/htmlize.html";
         license = lib.licenses.free;
       };
     }
@@ -2691,7 +2580,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       map,
@@ -2710,7 +2598,6 @@
       };
       packageRequires = [
         compat
-        emacs
         map
         persist
         plz
@@ -2718,7 +2605,7 @@
         transient
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/hyperdrive.html";
+        homepage = "https://elpa.nongnu.org/nongnu/hyperdrive.html";
         license = lib.licenses.free;
       };
     }
@@ -2726,7 +2613,6 @@
   idle-highlight-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2738,9 +2624,9 @@
         url = "https://elpa.nongnu.org/nongnu/idle-highlight-mode-1.1.4.tar";
         sha256 = "0vp45ww8bxacrwzv0jqzs782symxysmpvawd29pa1yci1qp2pvm5";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/idle-highlight-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/idle-highlight-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -2749,7 +2635,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       prop-menu,
@@ -2764,11 +2649,10 @@
       };
       packageRequires = [
         cl-lib
-        emacs
         prop-menu
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/idris-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/idris-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -2789,7 +2673,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/iedit.html";
+        homepage = "https://elpa.nongnu.org/nongnu/iedit.html";
         license = lib.licenses.free;
       };
     }
@@ -2798,7 +2682,6 @@
     {
       clojure-mode,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2810,12 +2693,9 @@
         url = "https://elpa.nongnu.org/nongnu/inf-clojure-3.2.1.tar";
         sha256 = "1pvngj87hqr0qzc62cgq294rllxbmn7803pnqqr8ah1qxy65a1wb";
       };
-      packageRequires = [
-        clojure-mode
-        emacs
-      ];
+      packageRequires = [ clojure-mode ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/inf-clojure.html";
+        homepage = "https://elpa.nongnu.org/nongnu/inf-clojure.html";
         license = lib.licenses.free;
       };
     }
@@ -2823,7 +2703,6 @@
   inf-ruby = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2835,9 +2714,9 @@
         url = "https://elpa.nongnu.org/nongnu/inf-ruby-2.8.1.tar";
         sha256 = "1iisxgrw7lkrcl86mj3s3578qxnx1cn615swsmnch2ilwjqdrdza";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/inf-ruby.html";
+        homepage = "https://elpa.nongnu.org/nongnu/inf-ruby.html";
         license = lib.licenses.free;
       };
     }
@@ -2845,7 +2724,6 @@
   inkpot-theme = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2857,9 +2735,9 @@
         url = "https://elpa.nongnu.org/nongnu/inkpot-theme-0.1.tar";
         sha256 = "0ik7vkwqlsgxmdckd154kh82zg8jr41vwc0a200x9920l5mnfjq2";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/inkpot-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/inkpot-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -2868,7 +2746,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       seq,
@@ -2883,11 +2760,10 @@
       };
       packageRequires = [
         compat
-        emacs
         seq
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/iwindow.html";
+        homepage = "https://elpa.nongnu.org/nongnu/iwindow.html";
         license = lib.licenses.free;
       };
     }
@@ -2908,7 +2784,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/j-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/j-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -2929,7 +2805,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/jade-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/jade-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -2950,7 +2826,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/jinja2-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/jinja2-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -2971,7 +2847,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/julia-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/julia-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -2980,24 +2856,20 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "keycast";
       ename = "keycast";
-      version = "1.4.0";
+      version = "1.4.1";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/keycast-1.4.0.tar";
-        sha256 = "0az8jixzncbz042il45hq1hwj6qvcm53f2fns19bspf1k4v4dphk";
+        url = "https://elpa.nongnu.org/nongnu/keycast-1.4.1.tar";
+        sha256 = "0xpdz6fqvmx6ha20c957r4psz393r0ag7ml971x21v035r3gfx8r";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/keycast.html";
+        homepage = "https://elpa.nongnu.org/nongnu/keycast.html";
         license = lib.licenses.free;
       };
     }
@@ -3005,7 +2877,6 @@
   kotlin-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3017,9 +2888,9 @@
         url = "https://elpa.nongnu.org/nongnu/kotlin-mode-2.0.0.tar";
         sha256 = "0d247kxbrhkbmgldmalywmx6fqiz35ifvjbv20lyrmnbyhx1zr97";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/kotlin-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/kotlin-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -3040,7 +2911,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/lorem-ipsum.html";
+        homepage = "https://elpa.nongnu.org/nongnu/lorem-ipsum.html";
         license = lib.licenses.free;
       };
     }
@@ -3048,7 +2919,6 @@
   lua-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3060,9 +2930,9 @@
         url = "https://elpa.nongnu.org/nongnu/lua-mode-20221027.tar";
         sha256 = "0mg4fjprrcwqfrzxh6wpl92r3ywpj3586444c6yvq1rs56z5wvj5";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/lua-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/lua-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -3088,67 +2958,71 @@
         compat
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/macrostep.html";
+        homepage = "https://elpa.nongnu.org/nongnu/macrostep.html";
         license = lib.licenses.free;
       };
     }
   ) { };
   magit = callPackage (
     {
+      compat,
       dash,
       elpaBuild,
-      emacs,
       fetchurl,
       git-commit,
       lib,
       magit-section,
+      seq,
       transient,
       with-editor,
     }:
     elpaBuild {
       pname = "magit";
       ename = "magit";
-      version = "3.3.0";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/magit-3.3.0.tar";
-        sha256 = "0ihrds45z12z155c1y7haz1mxc95w6v4rynh0izm159xhz44121z";
+        url = "https://elpa.nongnu.org/nongnu/magit-4.0.0.tar";
+        sha256 = "0sii8gr69j29fzvcdyabnabldkvi6r5dpiamfs3bsmh66vf8wvjh";
       };
       packageRequires = [
+        compat
         dash
-        emacs
         git-commit
         magit-section
+        seq
         transient
         with-editor
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/magit.html";
+        homepage = "https://elpa.nongnu.org/nongnu/magit.html";
         license = lib.licenses.free;
       };
     }
   ) { };
   magit-section = callPackage (
     {
+      compat,
       dash,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
+      seq,
     }:
     elpaBuild {
       pname = "magit-section";
       ename = "magit-section";
-      version = "3.3.0";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/magit-section-3.3.0.tar";
-        sha256 = "08ac10vips6f2gy4x4w2wkz2ki3q0d6dhynkmlpdinsdmgagziny";
+        url = "https://elpa.nongnu.org/nongnu/magit-section-4.0.0.tar";
+        sha256 = "1dyw275qfnpz7fs1s952b9fl9vgfzfk8aiclznfhhl43nvxxglb7";
       };
       packageRequires = [
+        compat
         dash
-        emacs
+        seq
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/magit-section.html";
+        homepage = "https://elpa.nongnu.org/nongnu/magit-section.html";
         license = lib.licenses.free;
       };
     }
@@ -3156,7 +3030,6 @@
   markdown-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3168,9 +3041,9 @@
         url = "https://elpa.nongnu.org/nongnu/markdown-mode-2.6.tar";
         sha256 = "15s8snzfvzzfk7wfizz5r8aksywq7s9h6xbb2y5dqjkpqg951va2";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/markdown-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/markdown-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -3178,7 +3051,6 @@
   mastodon = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       persist,
@@ -3187,18 +3059,17 @@
     elpaBuild {
       pname = "mastodon";
       ename = "mastodon";
-      version = "1.0.24";
+      version = "1.0.26";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/mastodon-1.0.24.tar";
-        sha256 = "05jj62klf7cf44nlkjxdzg63xi4z30n5c4806xd5i2yw19nfw023";
+        url = "https://elpa.nongnu.org/nongnu/mastodon-1.0.26.tar";
+        sha256 = "1p4nzgw8rf7zx4z17nn7bdh106qdhb54m20dkkz43wr4dgqp61bn";
       };
       packageRequires = [
-        emacs
         persist
         request
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/mastodon.html";
+        homepage = "https://elpa.nongnu.org/nongnu/mastodon.html";
         license = lib.licenses.free;
       };
     }
@@ -3206,7 +3077,6 @@
   material-theme = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3218,9 +3088,9 @@
         url = "https://elpa.nongnu.org/nongnu/material-theme-2015.tar";
         sha256 = "117ismd3p577cr59b6995byyq90zn4nd81dlf4pm8p0iiziryyji";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/material-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/material-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -3229,7 +3099,6 @@
     {
       async,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       seq,
@@ -3246,13 +3115,12 @@
       };
       packageRequires = [
         async
-        emacs
         seq
         url-scgi
         xml-rpc
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/mentor.html";
+        homepage = "https://elpa.nongnu.org/nongnu/mentor.html";
         license = lib.licenses.free;
       };
     }
@@ -3260,7 +3128,6 @@
   meow = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3272,9 +3139,9 @@
         url = "https://elpa.nongnu.org/nongnu/meow-1.4.5.tar";
         sha256 = "1d63mw88vq97rq3a7qhkxid2xaag5dp21ijisw9s3fk972kcks3s";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/meow.html";
+        homepage = "https://elpa.nongnu.org/nongnu/meow.html";
         license = lib.licenses.free;
       };
     }
@@ -3282,7 +3149,6 @@
   minibar = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3294,9 +3160,9 @@
         url = "https://elpa.nongnu.org/nongnu/minibar-0.3.tar";
         sha256 = "0vxjw485bja8h3gmqmvg9541f21ricwcw6ydlhv9174as5cmwx5j";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/minibar.html";
+        homepage = "https://elpa.nongnu.org/nongnu/minibar.html";
         license = lib.licenses.free;
       };
     }
@@ -3317,7 +3183,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/moe-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/moe-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -3338,7 +3204,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/monokai-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/monokai-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -3347,7 +3213,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       json ? null,
       lib,
@@ -3363,12 +3228,11 @@
       };
       packageRequires = [
         cl-lib
-        emacs
         json
         org
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/mpv.html";
+        homepage = "https://elpa.nongnu.org/nongnu/mpv.html";
         license = lib.licenses.free;
       };
     }
@@ -3389,7 +3253,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/multiple-cursors.html";
+        homepage = "https://elpa.nongnu.org/nongnu/multiple-cursors.html";
         license = lib.licenses.free;
       };
     }
@@ -3397,7 +3261,6 @@
   nasm-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3409,9 +3272,9 @@
         url = "https://elpa.nongnu.org/nongnu/nasm-mode-1.1.1.tar";
         sha256 = "19k0gwwx2fz779yli6pcl0a7grhsbhwyisq76lmnnclw0gkf686l";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/nasm-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/nasm-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -3432,7 +3295,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/nginx-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/nginx-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -3440,7 +3303,6 @@
   nix-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       magit-section,
@@ -3455,12 +3317,11 @@
         sha256 = "0hansrsyzx8j31rk45y8zs9hbfjgbv9sf3r37s2a2adz48n9k86g";
       };
       packageRequires = [
-        emacs
         magit-section
         transient
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/nix-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/nix-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -3468,7 +3329,6 @@
   oblivion-theme = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3480,9 +3340,9 @@
         url = "https://elpa.nongnu.org/nongnu/oblivion-theme-0.1.tar";
         sha256 = "0njm7znh84drqwkp4jjsr8by6q9xd65r8l7xaqahzhk78167q6s4";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/oblivion-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/oblivion-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -3490,7 +3350,6 @@
   opam-switch-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3502,9 +3361,9 @@
         url = "https://elpa.nongnu.org/nongnu/opam-switch-mode-1.7.tar";
         sha256 = "1gpc1syb51am2gkb3cgfb28rhh6ik41c1gx9gjf1h8m6zxb75433";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/opam-switch-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/opam-switch-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -3513,7 +3372,6 @@
     {
       async,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3525,12 +3383,9 @@
         url = "https://elpa.nongnu.org/nongnu/org-auto-tangle-0.6.0.tar";
         sha256 = "1vh3k283h90v3qilyx1n30k4ny5rkry6x9s6778s0sm6f6hwdggd";
       };
-      packageRequires = [
-        async
-        emacs
-      ];
+      packageRequires = [ async ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/org-auto-tangle.html";
+        homepage = "https://elpa.nongnu.org/nongnu/org-auto-tangle.html";
         license = lib.licenses.free;
       };
     }
@@ -3538,7 +3393,6 @@
   org-contrib = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       org,
@@ -3551,12 +3405,9 @@
         url = "https://elpa.nongnu.org/nongnu/org-contrib-0.4.2.tar";
         sha256 = "1v1g359dqyq8h4y5rjhllc93dq1vysnfk23lqn3smdvdi3ba9zlr";
       };
-      packageRequires = [
-        emacs
-        org
-      ];
+      packageRequires = [ org ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/org-contrib.html";
+        homepage = "https://elpa.nongnu.org/nongnu/org-contrib.html";
         license = lib.licenses.free;
       };
     }
@@ -3564,7 +3415,6 @@
   org-drill = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       org,
@@ -3580,13 +3430,12 @@
         sha256 = "0118vdd0gv2ipgfljkda4388gdly45c5vg0yfn3z4p0p8mjd15lg";
       };
       packageRequires = [
-        emacs
         org
         persist
         seq
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/org-drill.html";
+        homepage = "https://elpa.nongnu.org/nongnu/org-drill.html";
         license = lib.licenses.free;
       };
     }
@@ -3594,7 +3443,6 @@
   org-journal = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       org,
@@ -3607,12 +3455,9 @@
         url = "https://elpa.nongnu.org/nongnu/org-journal-2.2.0.tar";
         sha256 = "12mvi8x8rsm93s55z8ns1an00l2p545swc0gzmx38ff57m7jb1mj";
       };
-      packageRequires = [
-        emacs
-        org
-      ];
+      packageRequires = [ org ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/org-journal.html";
+        homepage = "https://elpa.nongnu.org/nongnu/org-journal.html";
         license = lib.licenses.free;
       };
     }
@@ -3620,21 +3465,20 @@
   org-mime = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "org-mime";
       ename = "org-mime";
-      version = "0.3.2";
+      version = "0.3.3";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/org-mime-0.3.2.tar";
-        sha256 = "1r24inqadhlsqc896vlm10bhr76aj6hnm6q5snhzpz4kk9j0gybd";
+        url = "https://elpa.nongnu.org/nongnu/org-mime-0.3.3.tar";
+        sha256 = "1ylsdfifa4ykrf5vncnnj6v2bgc3ixlskgxb1v7qggmkb5mzy2yv";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/org-mime.html";
+        homepage = "https://elpa.nongnu.org/nongnu/org-mime.html";
         license = lib.licenses.free;
       };
     }
@@ -3656,7 +3500,7 @@
       };
       packageRequires = [ org ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/org-present.html";
+        homepage = "https://elpa.nongnu.org/nongnu/org-present.html";
         license = lib.licenses.free;
       };
     }
@@ -3664,7 +3508,6 @@
   org-superstar = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       org,
@@ -3677,12 +3520,9 @@
         url = "https://elpa.nongnu.org/nongnu/org-superstar-1.5.1.tar";
         sha256 = "1v6v7a0frgxlywfq6g4mdl6sz448k2ql7j4j4f1wrll33mr7gx8g";
       };
-      packageRequires = [
-        emacs
-        org
-      ];
+      packageRequires = [ org ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/org-superstar.html";
+        homepage = "https://elpa.nongnu.org/nongnu/org-superstar.html";
         license = lib.licenses.free;
       };
     }
@@ -3690,7 +3530,6 @@
   org-transclusion-http = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       org-transclusion,
@@ -3705,12 +3544,11 @@
         sha256 = "1k57672w0dcw63dp1a6m5fc0pkm8p5la9811m16r440i7wqq0kmr";
       };
       packageRequires = [
-        emacs
         org-transclusion
         plz
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/org-transclusion-http.html";
+        homepage = "https://elpa.nongnu.org/nongnu/org-transclusion-http.html";
         license = lib.licenses.free;
       };
     }
@@ -3718,7 +3556,6 @@
   org-tree-slide = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3730,9 +3567,9 @@
         url = "https://elpa.nongnu.org/nongnu/org-tree-slide-2.8.22.tar";
         sha256 = "1wqc5d2nxs4s6p2ap6sdalxnyigpxini8ck6jikaarmfqcghnx2m";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/org-tree-slide.html";
+        homepage = "https://elpa.nongnu.org/nongnu/org-tree-slide.html";
         license = lib.licenses.free;
       };
     }
@@ -3741,7 +3578,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       magit,
@@ -3750,19 +3586,18 @@
     elpaBuild {
       pname = "orgit";
       ename = "orgit";
-      version = "1.9.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/orgit-1.9.0.tar";
-        sha256 = "0g0nr284lgmd6jmk0w412gcildl6fzxv9kskgzr7ksk09qk9qfll";
+        url = "https://elpa.nongnu.org/nongnu/orgit-2.0.0.tar";
+        sha256 = "16i702ziy5z9zrmgz55bky0nar2hy55mkllswf7pgk8x4aihlda0";
       };
       packageRequires = [
         compat
-        emacs
         magit
         org
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/orgit.html";
+        homepage = "https://elpa.nongnu.org/nongnu/orgit.html";
         license = lib.licenses.free;
       };
     }
@@ -3783,7 +3618,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/p4-16-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/p4-16-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -3791,7 +3626,6 @@
   package-lint = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       let-alist,
       lib,
@@ -3804,12 +3638,9 @@
         url = "https://elpa.nongnu.org/nongnu/package-lint-0.23.tar";
         sha256 = "116kc7j0g2r8fzyb07b7xb767wzjqnigi504r0rb7cc93b44c4gg";
       };
-      packageRequires = [
-        emacs
-        let-alist
-      ];
+      packageRequires = [ let-alist ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/package-lint.html";
+        homepage = "https://elpa.nongnu.org/nongnu/package-lint.html";
         license = lib.licenses.free;
       };
     }
@@ -3818,7 +3649,6 @@
     {
       dash,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3830,12 +3660,9 @@
         url = "https://elpa.nongnu.org/nongnu/pacmacs-0.1.1.tar";
         sha256 = "02ahl0608xmmlkb014gqvv6f45l5lrkm3s4l6m5p5r98rwmlj3q9";
       };
-      packageRequires = [
-        dash
-        emacs
-      ];
+      packageRequires = [ dash ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/pacmacs.html";
+        homepage = "https://elpa.nongnu.org/nongnu/pacmacs.html";
         license = lib.licenses.free;
       };
     }
@@ -3843,7 +3670,6 @@
   page-break-lines = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3855,9 +3681,9 @@
         url = "https://elpa.nongnu.org/nongnu/page-break-lines-0.15.tar";
         sha256 = "018mn6h6nmkkgv1hsk0k8fjyg38wpg2f0cvqlv9p392sapca59ay";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/page-break-lines.html";
+        homepage = "https://elpa.nongnu.org/nongnu/page-break-lines.html";
         license = lib.licenses.free;
       };
     }
@@ -3878,7 +3704,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/paredit.html";
+        homepage = "https://elpa.nongnu.org/nongnu/paredit.html";
         license = lib.licenses.free;
       };
     }
@@ -3886,7 +3712,6 @@
   parseclj = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3898,9 +3723,9 @@
         url = "https://elpa.nongnu.org/nongnu/parseclj-1.1.1.tar";
         sha256 = "0kkg5fdjbf2dm8jmirm86sjbqnzyhy72iml4qwwnshxjfhz1f0yi";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/parseclj.html";
+        homepage = "https://elpa.nongnu.org/nongnu/parseclj.html";
         license = lib.licenses.free;
       };
     }
@@ -3908,7 +3733,6 @@
   parseedn = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       map,
@@ -3923,12 +3747,11 @@
         sha256 = "0q6wkcjxwqf81pvrcjbga91lr4ml6adbhmc7j71f53awrpc980ak";
       };
       packageRequires = [
-        emacs
         map
         parseclj
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/parseedn.html";
+        homepage = "https://elpa.nongnu.org/nongnu/parseedn.html";
         license = lib.licenses.free;
       };
     }
@@ -3936,7 +3759,6 @@
   pcmpl-args = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3948,9 +3770,9 @@
         url = "https://elpa.nongnu.org/nongnu/pcmpl-args-0.1.3.tar";
         sha256 = "1lycckmwhp9l0pcrzx6c11iqwaw94h00334pzagkcfay7lz3hcgd";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/pcmpl-args.html";
+        homepage = "https://elpa.nongnu.org/nongnu/pcmpl-args.html";
         license = lib.licenses.free;
       };
     }
@@ -3958,7 +3780,6 @@
   pcre2el = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3970,9 +3791,9 @@
         url = "https://elpa.nongnu.org/nongnu/pcre2el-1.12.tar";
         sha256 = "1p0fgqm5342698gadnvziwbvv2kxj953975sp92cx7ddcyv2xr3c";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/pcre2el.html";
+        homepage = "https://elpa.nongnu.org/nongnu/pcre2el.html";
         license = lib.licenses.free;
       };
     }
@@ -3980,7 +3801,6 @@
   pdf-tools = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       let-alist,
       lib,
@@ -3995,12 +3815,11 @@
         sha256 = "0shlpdy07pk9qj5a7d7yivpvgp5bh65psm0g9wkrvyhpkc93aylc";
       };
       packageRequires = [
-        emacs
         let-alist
         tablist
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/pdf-tools.html";
+        homepage = "https://elpa.nongnu.org/nongnu/pdf-tools.html";
         license = lib.licenses.free;
       };
     }
@@ -4008,7 +3827,6 @@
   php-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4020,9 +3838,9 @@
         url = "https://elpa.nongnu.org/nongnu/php-mode-1.25.1.tar";
         sha256 = "1cfk7nq5x2p4adcf6q9igsh2jm0sdmsaf5l2sqx4idda28vp3gwc";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/php-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/php-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -4030,7 +3848,6 @@
   popon = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4042,9 +3859,9 @@
         url = "https://elpa.nongnu.org/nongnu/popon-0.13.tar";
         sha256 = "0z0m7j30pdfw58cxxkmw5pkfpy8y1ax00wm4820rkqxz1f5sbkdb";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/popon.html";
+        homepage = "https://elpa.nongnu.org/nongnu/popon.html";
         license = lib.licenses.free;
       };
     }
@@ -4052,7 +3869,6 @@
   popup = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4064,9 +3880,9 @@
         url = "https://elpa.nongnu.org/nongnu/popup-0.5.9.tar";
         sha256 = "06q31bv6nsdkdgyg6x0zzjnlq007zhqw2ssjmj44izl6h6fkr26m";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/popup.html";
+        homepage = "https://elpa.nongnu.org/nongnu/popup.html";
         license = lib.licenses.free;
       };
     }
@@ -4074,7 +3890,6 @@
   projectile = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4086,9 +3901,9 @@
         url = "https://elpa.nongnu.org/nongnu/projectile-2.8.0.tar";
         sha256 = "05llvm3xw3dbjdnfhy2kk6z3pysrsc9f6i7dm4glw5j1k7vig306";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/projectile.html";
+        homepage = "https://elpa.nongnu.org/nongnu/projectile.html";
         license = lib.licenses.free;
       };
     }
@@ -4096,7 +3911,6 @@
   proof-general = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4108,9 +3922,9 @@
         url = "https://elpa.nongnu.org/nongnu/proof-general-4.5.tar";
         sha256 = "0mlmh7z93f7ypjlh6mxrxgcn47ysvi8qg8869qfxjgmskbfdvx2w";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/proof-general.html";
+        homepage = "https://elpa.nongnu.org/nongnu/proof-general.html";
         license = lib.licenses.free;
       };
     }
@@ -4119,7 +3933,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4131,12 +3944,9 @@
         url = "https://elpa.nongnu.org/nongnu/prop-menu-0.1.2.tar";
         sha256 = "1cbps617k2nfi5jcv7y1zip4v64mi17r3rhw9w3n4r5hbl4sjwmw";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/prop-menu.html";
+        homepage = "https://elpa.nongnu.org/nongnu/prop-menu.html";
         license = lib.licenses.free;
       };
     }
@@ -4144,21 +3954,20 @@
   racket-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "racket-mode";
       ename = "racket-mode";
-      version = "1.0.20240621.124732";
+      version = "1.0.20240813.124142";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20240621.124732.tar";
-        sha256 = "1b5kq8r2skssqzqg9iah8h9jmxgzhzlzi0spbk3wkiadqyw6flbs";
+        url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20240813.124142.tar";
+        sha256 = "0arsrq5lp8a6s6gh2dwc4m43f7gmhrwlpgxn6xsglscpvhlrair8";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/racket-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/racket-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -4179,7 +3988,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/rainbow-delimiters.html";
+        homepage = "https://elpa.nongnu.org/nongnu/rainbow-delimiters.html";
         license = lib.licenses.free;
       };
     }
@@ -4187,7 +3996,6 @@
   raku-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4199,9 +4007,9 @@
         url = "https://elpa.nongnu.org/nongnu/raku-mode-0.2.1.tar";
         sha256 = "00iwkp4hwjdiymzbwm41m27avrn3n63hnwd9amyx0nsa0kdhrfyx";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/raku-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/raku-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -4209,7 +4017,6 @@
   recomplete = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4221,9 +4028,9 @@
         url = "https://elpa.nongnu.org/nongnu/recomplete-0.2.tar";
         sha256 = "1jhyqgww8wawrxxd2zjb7scpamkbcp98hak9qmbn6ckgzdadks64";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/recomplete.html";
+        homepage = "https://elpa.nongnu.org/nongnu/recomplete.html";
         license = lib.licenses.free;
       };
     }
@@ -4231,7 +4038,6 @@
   reformatter = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4243,9 +4049,9 @@
         url = "https://elpa.nongnu.org/nongnu/reformatter-0.8.tar";
         sha256 = "0bv0fbw3ach6jgnv67xjzxdzaghqa1rhgkmfsmkkbyz8ncbybj87";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/reformatter.html";
+        homepage = "https://elpa.nongnu.org/nongnu/reformatter.html";
         license = lib.licenses.free;
       };
     }
@@ -4253,7 +4059,6 @@
   request = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4265,9 +4070,9 @@
         url = "https://elpa.nongnu.org/nongnu/request-0.3.3.tar";
         sha256 = "02j24v8jdjsvi3v3asydb1zfiarzaxrpsshvgf62nhgk6x08845z";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/request.html";
+        homepage = "https://elpa.nongnu.org/nongnu/request.html";
         license = lib.licenses.free;
       };
     }
@@ -4275,7 +4080,6 @@
   rfc-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4287,9 +4091,9 @@
         url = "https://elpa.nongnu.org/nongnu/rfc-mode-1.4.2.tar";
         sha256 = "0lhs8wa4sr387xyibqqskkqgyhhhy48qp5wbjs8r5p68j1s1q86m";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/rfc-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/rfc-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -4297,7 +4101,6 @@
   rubocop = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4309,9 +4112,9 @@
         url = "https://elpa.nongnu.org/nongnu/rubocop-0.6.0.tar";
         sha256 = "026cna402hg9lsrf88kmb2as667fgaianj2qd3ik9y89ps4xyzxf";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/rubocop.html";
+        homepage = "https://elpa.nongnu.org/nongnu/rubocop.html";
         license = lib.licenses.free;
       };
     }
@@ -4319,7 +4122,6 @@
   rust-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4331,9 +4133,9 @@
         url = "https://elpa.nongnu.org/nongnu/rust-mode-1.0.5.tar";
         sha256 = "1cilbf4yw4723bn1vh9ww79875fxh0r1j2c7wxjqfjk5xnx4s6q4";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/rust-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/rust-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -4355,7 +4157,7 @@
       };
       packageRequires = [ haml-mode ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/sass-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/sass-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -4364,7 +4166,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4376,12 +4177,9 @@
         url = "https://elpa.nongnu.org/nongnu/scad-mode-94.0.tar";
         sha256 = "1cqai7qb9m17rf7llkn9vbxddgn0ixcf3dbnsjk1aflvj8mq9nr3";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/scad-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/scad-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -4395,14 +4193,14 @@
     elpaBuild {
       pname = "scala-mode";
       ename = "scala-mode";
-      version = "0.23";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/scala-mode-0.23.tar";
-        sha256 = "1zwd9cajw90v25rwdlylhdrc1xwvnf74c2rckz3cs096xsxc1qx2";
+        url = "https://elpa.nongnu.org/nongnu/scala-mode-1.1.0.tar";
+        sha256 = "1x3vw4fzy1z6gavnbsm4lnwzkp47zd8gasvxxvfk57qn09hpwixh";
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/scala-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/scala-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -4410,7 +4208,6 @@
   scroll-on-drag = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4422,9 +4219,9 @@
         url = "https://elpa.nongnu.org/nongnu/scroll-on-drag-0.1.tar";
         sha256 = "0ga8w9px2x9a2ams0lm7ganbixylgpx8g2m3jrwfih0ib3z26kqc";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/scroll-on-drag.html";
+        homepage = "https://elpa.nongnu.org/nongnu/scroll-on-drag.html";
         license = lib.licenses.free;
       };
     }
@@ -4432,7 +4229,6 @@
   scroll-on-jump = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4444,9 +4240,9 @@
         url = "https://elpa.nongnu.org/nongnu/scroll-on-jump-0.2.tar";
         sha256 = "1gg5lpr21v9bjzjy33j8ziyhh5a1sad509c7rjkdlqda2z3xfrhr";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/scroll-on-jump.html";
+        homepage = "https://elpa.nongnu.org/nongnu/scroll-on-jump.html";
         license = lib.licenses.free;
       };
     }
@@ -4454,7 +4250,6 @@
   sesman = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4466,9 +4261,9 @@
         url = "https://elpa.nongnu.org/nongnu/sesman-0.3.2.tar";
         sha256 = "1mrv32cp87dhzpcv55v4zv4nq37lrsprsdhhjb2q0msqab3b0r31";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/sesman.html";
+        homepage = "https://elpa.nongnu.org/nongnu/sesman.html";
         license = lib.licenses.free;
       };
     }
@@ -4476,7 +4271,6 @@
   shellcop = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4488,9 +4282,9 @@
         url = "https://elpa.nongnu.org/nongnu/shellcop-0.1.0.tar";
         sha256 = "1gj178fm0jj8dbfy0crwcjidih4r6g9dl9lprzpxzgswvma32g0w";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/shellcop.html";
+        homepage = "https://elpa.nongnu.org/nongnu/shellcop.html";
         license = lib.licenses.free;
       };
     }
@@ -4498,7 +4292,6 @@
   slime = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       macrostep,
@@ -4511,12 +4304,9 @@
         url = "https://elpa.nongnu.org/nongnu/slime-2.30.tar";
         sha256 = "0gzgwrx6llj35kga21m3m4vp0g7f7dypim7pdnhy9sxrvl0k8v5f";
       };
-      packageRequires = [
-        emacs
-        macrostep
-      ];
+      packageRequires = [ macrostep ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/slime.html";
+        homepage = "https://elpa.nongnu.org/nongnu/slime.html";
         license = lib.licenses.free;
       };
     }
@@ -4524,7 +4314,6 @@
   sly = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4536,9 +4325,9 @@
         url = "https://elpa.nongnu.org/nongnu/sly-1.0.43.tar";
         sha256 = "1c7kzbpcrij4z09bxfa1rq5w23jw9h8v4s6fa6ihr13x67gsif84";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/sly.html";
+        homepage = "https://elpa.nongnu.org/nongnu/sly.html";
         license = lib.licenses.free;
       };
     }
@@ -4559,7 +4348,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/smartparens.html";
+        homepage = "https://elpa.nongnu.org/nongnu/smartparens.html";
         license = lib.licenses.free;
       };
     }
@@ -4567,7 +4356,6 @@
   solarized-theme = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4579,9 +4367,9 @@
         url = "https://elpa.nongnu.org/nongnu/solarized-theme-2.0.1.tar";
         sha256 = "1lk1g8v2chjrbbxplw3pd7yn3syjgywxkbdc7dbd76x168qz54qx";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/solarized-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/solarized-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -4589,7 +4377,6 @@
   spacemacs-theme = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4601,9 +4388,9 @@
         url = "https://elpa.nongnu.org/nongnu/spacemacs-theme-0.2.tar";
         sha256 = "07lkaj6gm5iz503p5l6sm1y62mc5wk13nrwzv81f899jw99jcgml";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/spacemacs-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/spacemacs-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -4611,7 +4398,6 @@
   spell-fu = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4623,9 +4409,9 @@
         url = "https://elpa.nongnu.org/nongnu/spell-fu-0.3.tar";
         sha256 = "11a5361xjap02s0mm2sylhxqqrv64v72d70cg1vzch7iwfi18l9c";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/spell-fu.html";
+        homepage = "https://elpa.nongnu.org/nongnu/spell-fu.html";
         license = lib.licenses.free;
       };
     }
@@ -4633,7 +4419,6 @@
   sqlite3 = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4645,9 +4430,9 @@
         url = "https://elpa.nongnu.org/nongnu/sqlite3-0.17.tar";
         sha256 = "17fx2bnzajqjzd9jgwvn6pjwshgirign975rrsc1m47cwniz0bnq";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/sqlite3.html";
+        homepage = "https://elpa.nongnu.org/nongnu/sqlite3.html";
         license = lib.licenses.free;
       };
     }
@@ -4668,7 +4453,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/stylus-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/stylus-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -4689,7 +4474,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/subatomic-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/subatomic-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -4697,7 +4482,6 @@
   subed = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4709,9 +4493,9 @@
         url = "https://elpa.nongnu.org/nongnu/subed-1.2.14.tar";
         sha256 = "0kzb054radxq9hqviadmbr4cln39yp7yz4inq4ip52rd3qdm8vy4";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/subed.html";
+        homepage = "https://elpa.nongnu.org/nongnu/subed.html";
         license = lib.licenses.free;
       };
     }
@@ -4720,7 +4504,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4732,12 +4515,9 @@
         url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.27.5.tar";
         sha256 = "0mw8fddzcbn9h5l55v12n4nmickqdxc3y7y0xfzm6m42cvqkzdzf";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/sweeprolog.html";
+        homepage = "https://elpa.nongnu.org/nongnu/sweeprolog.html";
         license = lib.licenses.free;
       };
     }
@@ -4745,7 +4525,6 @@
   swift-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       seq,
@@ -4758,12 +4537,9 @@
         url = "https://elpa.nongnu.org/nongnu/swift-mode-9.1.0.tar";
         sha256 = "1h7fbrgp2jsn0nk6c84vzvipm86macxf2975l0av8gxv0kpzcaiv";
       };
-      packageRequires = [
-        emacs
-        seq
-      ];
+      packageRequires = [ seq ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/swift-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/swift-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -4793,7 +4569,6 @@
   symbol-overlay = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4805,9 +4580,9 @@
         url = "https://elpa.nongnu.org/nongnu/symbol-overlay-4.1.tar";
         sha256 = "0l877zm8fbf6qqcg7zx26w32x885axcj01l4y1m98jzryjhszfgn";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/symbol-overlay.html";
+        homepage = "https://elpa.nongnu.org/nongnu/symbol-overlay.html";
         license = lib.licenses.free;
       };
     }
@@ -4815,7 +4590,6 @@
   systemd = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4827,9 +4601,9 @@
         url = "https://elpa.nongnu.org/nongnu/systemd-1.6.1.tar";
         sha256 = "0b0l70271kalicaix4p1ipr5vrj401cj8zvsi3243q1hp04k1m2g";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/systemd.html";
+        homepage = "https://elpa.nongnu.org/nongnu/systemd.html";
         license = lib.licenses.free;
       };
     }
@@ -4837,7 +4611,6 @@
   tablist = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4849,9 +4622,9 @@
         url = "https://elpa.nongnu.org/nongnu/tablist-1.0.tar";
         sha256 = "0z05va5fq054xysvhnpblxk5x0v6k4ian0hby6vryfxg9828gy57";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/tablist.html";
+        homepage = "https://elpa.nongnu.org/nongnu/tablist.html";
         license = lib.licenses.free;
       };
     }
@@ -4872,7 +4645,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/tangotango-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/tangotango-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -4882,7 +4655,6 @@
       cl-generic,
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       seq,
@@ -4898,11 +4670,10 @@
       packageRequires = [
         cl-generic
         cl-lib
-        emacs
         seq
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/telephone-line.html";
+        homepage = "https://elpa.nongnu.org/nongnu/telephone-line.html";
         license = lib.licenses.free;
       };
     }
@@ -4910,7 +4681,6 @@
   testcover-mark-line = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4922,9 +4692,9 @@
         url = "https://elpa.nongnu.org/nongnu/testcover-mark-line-0.3.tar";
         sha256 = "1p1dmxqdyk82qbcmggmzn15nz4jm98j5bjivy56vimgncqfbaf4h";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/testcover-mark-line.html";
+        homepage = "https://elpa.nongnu.org/nongnu/testcover-mark-line.html";
         license = lib.licenses.free;
       };
     }
@@ -4945,7 +4715,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/textile-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/textile-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -4966,7 +4736,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/toc-org.html";
+        homepage = "https://elpa.nongnu.org/nongnu/toc-org.html";
         license = lib.licenses.free;
       };
     }
@@ -4975,7 +4745,6 @@
     {
       base32,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4987,12 +4756,9 @@
         url = "https://elpa.nongnu.org/nongnu/totp-auth-1.0.tar";
         sha256 = "0hzj0p1r18q8vkhkbxbfakvmgld9y8n5hzza5zir0cpalv5590r5";
       };
-      packageRequires = [
-        base32
-        emacs
-      ];
+      packageRequires = [ base32 ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/totp-auth.html";
+        homepage = "https://elpa.nongnu.org/nongnu/totp-auth.html";
         license = lib.licenses.free;
       };
     }
@@ -5000,7 +4766,6 @@
   treeview = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5012,9 +4777,9 @@
         url = "https://elpa.nongnu.org/nongnu/treeview-1.2.0.tar";
         sha256 = "1dmix7hn5yl69r987f0g2m00p866ln8412dm7fj399pmn1kdfsvy";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/treeview.html";
+        homepage = "https://elpa.nongnu.org/nongnu/treeview.html";
         license = lib.licenses.free;
       };
     }
@@ -5023,7 +4788,6 @@
     {
       caml,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5035,12 +4799,9 @@
         url = "https://elpa.nongnu.org/nongnu/tuareg-3.0.1.tar";
         sha256 = "04lb71cafg4bqicx3q3rb9jpxbq6hmdrzw88f52sjqxq5c4cqdkj";
       };
-      packageRequires = [
-        caml
-        emacs
-      ];
+      packageRequires = [ caml ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/tuareg.html";
+        homepage = "https://elpa.nongnu.org/nongnu/tuareg.html";
         license = lib.licenses.free;
       };
     }
@@ -5048,7 +4809,6 @@
   typescript-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5060,9 +4820,9 @@
         url = "https://elpa.nongnu.org/nongnu/typescript-mode-0.4.tar";
         sha256 = "1fs369h8ysrx1d8qzvz75izmlx4gzl619g7yjp9ck2wjv50wx95q";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/typescript-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/typescript-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -5083,7 +4843,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ujelly-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/ujelly-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -5091,7 +4851,6 @@
   undo-fu = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5103,9 +4862,9 @@
         url = "https://elpa.nongnu.org/nongnu/undo-fu-0.5.tar";
         sha256 = "00pgvmks1nvdimsac534qny5vpq8sgcfgybiz3ck3mgfklj4kshj";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/undo-fu.html";
+        homepage = "https://elpa.nongnu.org/nongnu/undo-fu.html";
         license = lib.licenses.free;
       };
     }
@@ -5113,7 +4872,6 @@
   undo-fu-session = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5125,9 +4883,9 @@
         url = "https://elpa.nongnu.org/nongnu/undo-fu-session-0.7.tar";
         sha256 = "1gly9fl8kvfssh2h90j9qcqvxvmnckn0x1wfm4qbz9ax57xvms23";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/undo-fu-session.html";
+        homepage = "https://elpa.nongnu.org/nongnu/undo-fu-session.html";
         license = lib.licenses.free;
       };
     }
@@ -5148,7 +4906,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/vc-fossil.html";
+        homepage = "https://elpa.nongnu.org/nongnu/vc-fossil.html";
         license = lib.licenses.free;
       };
     }
@@ -5156,7 +4914,6 @@
   vcomplete = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5168,9 +4925,9 @@
         url = "https://elpa.nongnu.org/nongnu/vcomplete-2.0.tar";
         sha256 = "03f60ncrf994pc4q15m0p2admmy4gpg5c51nbr3xycqp16pq8dz1";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/vcomplete.html";
+        homepage = "https://elpa.nongnu.org/nongnu/vcomplete.html";
         license = lib.licenses.free;
       };
     }
@@ -5178,7 +4935,6 @@
   visual-fill-column = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5190,9 +4946,9 @@
         url = "https://elpa.nongnu.org/nongnu/visual-fill-column-2.6.3.tar";
         sha256 = "0agxixxlv3lnsng8jk7y6x1kzzvx3sw5m3mhl8gr4i1didgxc37n";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/visual-fill-column.html";
+        homepage = "https://elpa.nongnu.org/nongnu/visual-fill-column.html";
         license = lib.licenses.free;
       };
     }
@@ -5200,21 +4956,20 @@
   web-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "web-mode";
       ename = "web-mode";
-      version = "17.3.19";
+      version = "17.3.20";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.19.tar";
-        sha256 = "0gmi0p118kd2xvlbp6y5mz2f0sgdm8qwna76lrmbnsxw4c9g5c6p";
+        url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.20.tar";
+        sha256 = "1l4bmvc53ma2n3y143k86ip0w4am65zwxnl36lzqavs1hr55qvb2";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/web-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/web-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -5223,7 +4978,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       request,
@@ -5238,11 +4992,10 @@
       };
       packageRequires = [
         cl-lib
-        emacs
         request
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/webpaste.html";
+        homepage = "https://elpa.nongnu.org/nongnu/webpaste.html";
         license = lib.licenses.free;
       };
     }
@@ -5250,7 +5003,6 @@
   wfnames = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5262,9 +5014,9 @@
         url = "https://elpa.nongnu.org/nongnu/wfnames-1.2.tar";
         sha256 = "1yy034fx86wn6yv4671fybc4zn5g619zcnnfvryq6zpwibj6fikz";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/wfnames.html";
+        homepage = "https://elpa.nongnu.org/nongnu/wfnames.html";
         license = lib.licenses.free;
       };
     }
@@ -5272,7 +5024,6 @@
   wgrep = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5284,9 +5035,9 @@
         url = "https://elpa.nongnu.org/nongnu/wgrep-3.0.0.tar";
         sha256 = "18j94y6xrjdmy5sk83mh5zaz4vqpi97pcjila387c0d84j1v2wzz";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/wgrep.html";
+        homepage = "https://elpa.nongnu.org/nongnu/wgrep.html";
         license = lib.licenses.free;
       };
     }
@@ -5294,7 +5045,6 @@
   why-this = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5306,9 +5056,9 @@
         url = "https://elpa.nongnu.org/nongnu/why-this-2.0.4.tar";
         sha256 = "1swidi6z6rhhy2zvas84vmkj41zaqpdxfssg6x6lvzzq34cgq0ph";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/why-this.html";
+        homepage = "https://elpa.nongnu.org/nongnu/why-this.html";
         license = lib.licenses.free;
       };
     }
@@ -5317,24 +5067,20 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "with-editor";
       ename = "with-editor";
-      version = "3.3.4";
+      version = "3.4.1";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/with-editor-3.3.4.tar";
-        sha256 = "1q9h181r1192zz5ff95rb3j2j69w9ha00qrap5df8cs73z8kh2vc";
+        url = "https://elpa.nongnu.org/nongnu/with-editor-3.4.1.tar";
+        sha256 = "0nhlr2qjn351p0vd8vdnrwsb6wi2klh5ny84k90m8kzwcmvglhfd";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/with-editor.html";
+        homepage = "https://elpa.nongnu.org/nongnu/with-editor.html";
         license = lib.licenses.free;
       };
     }
@@ -5342,7 +5088,6 @@
   with-simulated-input = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5354,9 +5099,9 @@
         url = "https://elpa.nongnu.org/nongnu/with-simulated-input-3.0.tar";
         sha256 = "0a2kqrv3q399n1y21v7m4c9ivm56j28kasb466rq704jccvzblfr";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/with-simulated-input.html";
+        homepage = "https://elpa.nongnu.org/nongnu/with-simulated-input.html";
         license = lib.licenses.free;
       };
     }
@@ -5365,7 +5110,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       project,
@@ -5380,11 +5124,10 @@
       };
       packageRequires = [
         compat
-        emacs
         project
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/workroom.html";
+        homepage = "https://elpa.nongnu.org/nongnu/workroom.html";
         license = lib.licenses.free;
       };
     }
@@ -5405,7 +5148,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/writegood-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/writegood-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -5426,7 +5169,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ws-butler.html";
+        homepage = "https://elpa.nongnu.org/nongnu/ws-butler.html";
         license = lib.licenses.free;
       };
     }
@@ -5434,21 +5177,20 @@
   xah-fly-keys = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "xah-fly-keys";
       ename = "xah-fly-keys";
-      version = "25.9.20240703220947";
+      version = "25.9.20240725161125";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-25.9.20240703220947.tar";
-        sha256 = "1kg8qhr1wnbcm44bmvan62k68603pjickaaj68q7g78vkzlzwpya";
+        url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-25.9.20240725161125.tar";
+        sha256 = "1kkis9qrfks40dlibkn4f75al0h61ixdw30a45ql09nsg4n5rzky";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/xah-fly-keys.html";
+        homepage = "https://elpa.nongnu.org/nongnu/xah-fly-keys.html";
         license = lib.licenses.free;
       };
     }
@@ -5470,7 +5212,7 @@
       };
       packageRequires = [ json ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/xkcd.html";
+        homepage = "https://elpa.nongnu.org/nongnu/xkcd.html";
         license = lib.licenses.free;
       };
     }
@@ -5478,7 +5220,6 @@
   xml-rpc = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5490,9 +5231,9 @@
         url = "https://elpa.nongnu.org/nongnu/xml-rpc-1.6.17.tar";
         sha256 = "1r8j87xddv80dx6lxzr2kq6czwk2l22bfxmplnma9fc2bsf1k2wy";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/xml-rpc.html";
+        homepage = "https://elpa.nongnu.org/nongnu/xml-rpc.html";
         license = lib.licenses.free;
       };
     }
@@ -5500,7 +5241,6 @@
   yaml-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5512,9 +5252,9 @@
         url = "https://elpa.nongnu.org/nongnu/yaml-mode-0.0.16.tar";
         sha256 = "0bhflv50z379p6ysdq89bdszkxp8zdmlb8plj1bm2nqsgc39hdm7";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/yaml-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/yaml-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -5536,7 +5276,7 @@
       };
       packageRequires = [ yasnippet ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/yasnippet-snippets.html";
+        homepage = "https://elpa.nongnu.org/nongnu/yasnippet-snippets.html";
         license = lib.licenses.free;
       };
     }
@@ -5557,7 +5297,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/zenburn-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/zenburn-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -5565,7 +5305,6 @@
   zig-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       reformatter,
@@ -5578,12 +5317,9 @@
         url = "https://elpa.nongnu.org/nongnu/zig-mode-0.0.8.tar";
         sha256 = "1085lxm6k7b91c0q8jmmir59hzaqi8jgspbs89bvia2vq5x9xd87";
       };
-      packageRequires = [
-        emacs
-        reformatter
-      ];
+      packageRequires = [ reformatter ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/zig-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/zig-mode.html";
         license = lib.licenses.free;
       };
     }