From a6329647be7d68aa5525cdec42c3f5a0e4a11a39 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Tue, 4 Oct 2022 22:13:26 +0800
Subject: Move default.nix into overlays dir

This is to prepare for splitting the overlay into two seperated ones.
---
 overlays/default.nix | 205 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 205 insertions(+)
 create mode 100644 overlays/default.nix

(limited to 'overlays')

diff --git a/overlays/default.nix b/overlays/default.nix
new file mode 100644
index 000000000000..70d10f8346de
--- /dev/null
+++ b/overlays/default.nix
@@ -0,0 +1,205 @@
+self: super:
+let
+  mkExDrv = emacsPackages: name: args:
+    let
+      repoMeta = super.lib.importJSON (./repos/exwm/. + "/${name}.json");
+    in
+    emacsPackages.melpaBuild (
+      args // {
+        pname = name;
+        ename = name;
+        version = repoMeta.version;
+        commit = repoMeta.rev;
+
+        recipe = builtins.toFile "recipe" ''
+          (${name} :fetcher github
+          :repo "ch11ng/${name}")
+        '';
+
+        src = super.fetchFromGitHub {
+          owner = "ch11ng";
+          repo = name;
+          inherit (repoMeta) rev sha256;
+        };
+      }
+    );
+
+  mkGitEmacs = namePrefix: jsonFile: { ... }@args:
+    let
+      repoMeta = super.lib.importJSON jsonFile;
+      fetcher =
+        if repoMeta.type == "savannah" then
+          super.fetchFromSavannah
+        else if repoMeta.type == "github" then
+          super.fetchFromGitHub
+        else
+          throw "Unknown repository type ${repoMeta.type}!";
+    in
+    builtins.foldl'
+      (drv: fn: fn drv)
+      super.emacs
+      [
+
+        (drv: drv.override ({ srcRepo = true; } // args))
+
+        (
+          drv: drv.overrideAttrs (
+            old: {
+              name = "${namePrefix}-${repoMeta.version}";
+              inherit (repoMeta) version;
+              src = fetcher (builtins.removeAttrs repoMeta [ "type" "version" ]);
+
+              patches = [ ];
+
+              postPatch = old.postPatch + ''
+                substituteInPlace lisp/loadup.el \
+                --replace '(emacs-repository-get-version)' '"${repoMeta.rev}"' \
+                --replace '(emacs-repository-get-branch)' '"master"'
+              '' +
+              # XXX: remove when https://github.com/NixOS/nixpkgs/pull/193621 is merged
+                (super.lib.optionalString (old ? NATIVE_FULL_AOT)
+                    (let backendPath = (super.lib.concatStringsSep " "
+                      (builtins.map (x: ''\"-B${x}\"'') [
+                        # Paths necessary so the JIT compiler finds its libraries:
+                        "${super.lib.getLib self.libgccjit}/lib"
+                        "${super.lib.getLib self.libgccjit}/lib/gcc"
+                        "${super.lib.getLib self.stdenv.cc.libc}/lib"
+
+                        # Executable paths necessary for compilation (ld, as):
+                        "${super.lib.getBin self.stdenv.cc.cc}/bin"
+                        "${super.lib.getBin self.stdenv.cc.bintools}/bin"
+                        "${super.lib.getBin self.stdenv.cc.bintools.bintools}/bin"
+                      ]));
+                     in ''
+                        substituteInPlace lisp/emacs-lisp/comp.el --replace \
+                            "(defcustom comp-libgccjit-reproducer nil" \
+                            "(setq native-comp-driver-options '(${backendPath}))
+(defcustom comp-libgccjit-reproducer nil"
+                    ''));
+            }
+          )
+        )
+
+        # reconnect pkgs to the built emacs
+        (
+          drv:
+          let
+            result = drv.overrideAttrs (old: {
+              passthru = old.passthru // {
+                pkgs = self.emacsPackagesFor result;
+              };
+            });
+          in
+          result
+        )
+      ];
+
+  mkPgtkEmacs = namePrefix: jsonFile: { ... }@args: (mkGitEmacs namePrefix jsonFile args).overrideAttrs (
+    old: {
+      configureFlags = (super.lib.remove "--with-xft" old.configureFlags)
+        ++ super.lib.singleton "--with-pgtk";
+    }
+  );
+
+  emacsGit = mkGitEmacs "emacs-git" ./repos/emacs/emacs-master.json { withSQLite3 = true; withWebP = true; };
+
+  emacsNativeComp = super.emacsNativeComp or (mkGitEmacs "emacs-native-comp" ./repos/emacs/emacs-unstable.json { nativeComp = true; });
+
+  emacsGitNativeComp = mkGitEmacs "emacs-git-native-comp" ./repos/emacs/emacs-master.json {
+    withSQLite3 = true;
+    withWebP = true;
+    nativeComp = true;
+  };
+
+  emacsPgtk = mkPgtkEmacs "emacs-pgtk" ./repos/emacs/emacs-master.json { withSQLite3 = true; withGTK3 = true; };
+
+  emacsPgtkNativeComp = mkPgtkEmacs "emacs-pgtk-native-comp" ./repos/emacs/emacs-master.json { nativeComp = true; withSQLite3 = true; withGTK3 = true; };
+
+  emacsUnstable = (mkGitEmacs "emacs-unstable" ./repos/emacs/emacs-unstable.json { });
+
+in
+{
+  inherit emacsGit emacsUnstable;
+
+  inherit emacsNativeComp emacsGitNativeComp;
+
+  inherit emacsPgtk emacsPgtkNativeComp;
+
+  emacsGit-nox = (
+    (
+      emacsGit.override {
+        withNS = false;
+        withX = false;
+        withGTK2 = false;
+        withGTK3 = false;
+        withWebP = false;
+      }
+    ).overrideAttrs (
+      oa: {
+        name = "${oa.name}-nox";
+      }
+    )
+  );
+
+  emacsUnstable-nox = (
+    (
+      emacsUnstable.override {
+        withNS = false;
+        withX = false;
+        withGTK2 = false;
+        withGTK3 = false;
+        withWebP = false;
+      }
+    ).overrideAttrs (
+      oa: {
+        name = "${oa.name}-nox";
+      }
+    )
+  );
+
+  emacsWithPackagesFromUsePackage = import ./elisp.nix { pkgs = self; };
+
+  emacsWithPackagesFromPackageRequires = import ./packreq.nix { pkgs = self; };
+
+  emacsPackagesFor = emacs: (
+    (super.emacsPackagesFor emacs).overrideScope' (
+      eself: esuper:
+        let
+          melpaStablePackages = esuper.melpaStablePackages.override {
+            archiveJson = ./repos/melpa/recipes-archive-melpa.json;
+          };
+
+          melpaPackages = esuper.melpaPackages.override {
+            archiveJson = ./repos/melpa/recipes-archive-melpa.json;
+          };
+
+          elpaPackages = esuper.elpaPackages.override {
+            generated = ./repos/elpa/elpa-generated.nix;
+          };
+
+          epkgs = esuper.override {
+            inherit melpaStablePackages melpaPackages elpaPackages;
+          };
+
+        in
+        epkgs
+        // super.lib.optionalAttrs (super.lib.hasAttr "nongnuPackages" esuper) {
+          nongnuPackages = esuper.nongnuPackages.override {
+            generated = ./repos/nongnu/nongnu-generated.nix;
+          };
+        } // {
+          xelb = mkExDrv eself "xelb" {
+            packageRequires = [ eself.cl-generic eself.emacs ];
+          };
+
+          exwm = mkExDrv eself "exwm" {
+            packageRequires = [ eself.xelb ];
+          };
+        }
+    )
+  );
+
+} // super.lib.optionalAttrs (super.config.allowAliases or true) {
+  emacsGcc = builtins.trace "emacsGcc has been renamed to emacsNativeComp, please update your expression." emacsNativeComp;
+  emacsPgtkGcc = builtins.trace "emacsPgtkGcc has been renamed to emacsPgtkNativeComp, please update your expression." emacsPgtkNativeComp;
+}
-- 
cgit 1.4.1


From c91c353b5dcc077c4ea60d7104ed784330109fe7 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Tue, 4 Oct 2022 22:57:02 +0800
Subject: Split into two overlays: one for emacs and one for emacs packages

Emacs packages in nixpkgs have binary cache since [1]. It is useful to
split the whole overlay into two seperated ones so that users can use
emacs packages in nixpkgs with emacsWithPackagesFromUsePackage or
emacsWithPackagesFromPackageRequires in this overlay.

[1]: https://github.com/NixOS/nixpkgs/pull/188110
---
 README.org           |  18 +++--
 flake.nix            |  11 ++-
 overlays/default.nix | 209 ++-------------------------------------------------
 overlays/emacs.nix   | 143 +++++++++++++++++++++++++++++++++++
 overlays/package.nix |  67 +++++++++++++++++
 5 files changed, 238 insertions(+), 210 deletions(-)
 create mode 100644 overlays/emacs.nix
 create mode 100644 overlays/package.nix

(limited to 'overlays')

diff --git a/README.org b/README.org
index 432b8bca55be..676dc0e1665e 100644
--- a/README.org
+++ b/README.org
@@ -36,17 +36,25 @@ It is recommended you read Nixpkgs and NixOS documentation on package overlays a
 
 ** Contents of the overlay
 
-*** Elpa
+This overlay consists of two overlays: =emacs= and =package=.
+
+You can use both of them as a whole overlay or only one of them.
+
+*** =package= overlay
+
+**** Elpa
 Daily generations of Elpa.
 
-*** Melpa / Melpa stable
+**** Melpa / Melpa stable
 Daily generations of Melpa & Melpa stable attribute sets.
 
-*** EXWM & needed dependencies
+**** EXWM & needed dependencies
 This overlay provides fresh versions of EXWM and dependencies. This is
 updated daily.
 
-*** Emacs from Git and latest (including pre-releases)
+*** =emacs= overlay
+
+**** Emacs from Git and latest (including pre-releases)
 This overlay also provides two versions (latest from git) for Emacs. These
 are updated daily.
 
@@ -63,7 +71,7 @@ We also provide two attributes named =emacsGit-nox= and =emacsUnstable-nox=
 if you wish to have Emacs built without X dependencies.
 =emacsPgtk= and =emacsPgtkNativeComp= use the experimental pgtk feature which supports Wayland natively.
 
-** Extra library functionality
+**** Extra library functionality
 This overlay comes with extra functions to generate an Emacs closure
 from various types of dependency declaration. (These are abstractions
 on top of =emacsWithPackages=.)
diff --git a/flake.nix b/flake.nix
index 85668a85dd3d..9be11c905f3c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,14 +9,19 @@
     , flake-utils
     }: {
       # self: super: must be named final: prev: for `nix flake check` to be happy
-      overlay = final: prev:
-        import ./overlays final prev;
+      overlays = {
+        default = final: prev: import ./overlays final prev;
+        emacs = final: prev: import ./overlays/emacs.nix final prev;
+        package = final: prev: import ./overlays/package.nix final prev;
+      };
+      # for backward compatibility, is safe to delete, not referenced anywhere
+      overlay = self.overlays.default;
     } // flake-utils.lib.eachDefaultSystem (system: (
       let
         pkgs = import nixpkgs {
           inherit system;
           config.allowAliases = false;
-          overlays = [ self.overlay ];
+          overlays = [ self.overlays.default ];
         };
         inherit (pkgs) lib;
         overlayAttrs = builtins.attrNames (import ./. pkgs pkgs);
diff --git a/overlays/default.nix b/overlays/default.nix
index 70d10f8346de..089b5494dca9 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,205 +1,10 @@
 self: super:
 let
-  mkExDrv = emacsPackages: name: args:
-    let
-      repoMeta = super.lib.importJSON (./repos/exwm/. + "/${name}.json");
-    in
-    emacsPackages.melpaBuild (
-      args // {
-        pname = name;
-        ename = name;
-        version = repoMeta.version;
-        commit = repoMeta.rev;
-
-        recipe = builtins.toFile "recipe" ''
-          (${name} :fetcher github
-          :repo "ch11ng/${name}")
-        '';
-
-        src = super.fetchFromGitHub {
-          owner = "ch11ng";
-          repo = name;
-          inherit (repoMeta) rev sha256;
-        };
-      }
-    );
-
-  mkGitEmacs = namePrefix: jsonFile: { ... }@args:
-    let
-      repoMeta = super.lib.importJSON jsonFile;
-      fetcher =
-        if repoMeta.type == "savannah" then
-          super.fetchFromSavannah
-        else if repoMeta.type == "github" then
-          super.fetchFromGitHub
-        else
-          throw "Unknown repository type ${repoMeta.type}!";
-    in
-    builtins.foldl'
-      (drv: fn: fn drv)
-      super.emacs
-      [
-
-        (drv: drv.override ({ srcRepo = true; } // args))
-
-        (
-          drv: drv.overrideAttrs (
-            old: {
-              name = "${namePrefix}-${repoMeta.version}";
-              inherit (repoMeta) version;
-              src = fetcher (builtins.removeAttrs repoMeta [ "type" "version" ]);
-
-              patches = [ ];
-
-              postPatch = old.postPatch + ''
-                substituteInPlace lisp/loadup.el \
-                --replace '(emacs-repository-get-version)' '"${repoMeta.rev}"' \
-                --replace '(emacs-repository-get-branch)' '"master"'
-              '' +
-              # XXX: remove when https://github.com/NixOS/nixpkgs/pull/193621 is merged
-                (super.lib.optionalString (old ? NATIVE_FULL_AOT)
-                    (let backendPath = (super.lib.concatStringsSep " "
-                      (builtins.map (x: ''\"-B${x}\"'') [
-                        # Paths necessary so the JIT compiler finds its libraries:
-                        "${super.lib.getLib self.libgccjit}/lib"
-                        "${super.lib.getLib self.libgccjit}/lib/gcc"
-                        "${super.lib.getLib self.stdenv.cc.libc}/lib"
-
-                        # Executable paths necessary for compilation (ld, as):
-                        "${super.lib.getBin self.stdenv.cc.cc}/bin"
-                        "${super.lib.getBin self.stdenv.cc.bintools}/bin"
-                        "${super.lib.getBin self.stdenv.cc.bintools.bintools}/bin"
-                      ]));
-                     in ''
-                        substituteInPlace lisp/emacs-lisp/comp.el --replace \
-                            "(defcustom comp-libgccjit-reproducer nil" \
-                            "(setq native-comp-driver-options '(${backendPath}))
-(defcustom comp-libgccjit-reproducer nil"
-                    ''));
-            }
-          )
-        )
-
-        # reconnect pkgs to the built emacs
-        (
-          drv:
-          let
-            result = drv.overrideAttrs (old: {
-              passthru = old.passthru // {
-                pkgs = self.emacsPackagesFor result;
-              };
-            });
-          in
-          result
-        )
-      ];
-
-  mkPgtkEmacs = namePrefix: jsonFile: { ... }@args: (mkGitEmacs namePrefix jsonFile args).overrideAttrs (
-    old: {
-      configureFlags = (super.lib.remove "--with-xft" old.configureFlags)
-        ++ super.lib.singleton "--with-pgtk";
-    }
-  );
-
-  emacsGit = mkGitEmacs "emacs-git" ./repos/emacs/emacs-master.json { withSQLite3 = true; withWebP = true; };
-
-  emacsNativeComp = super.emacsNativeComp or (mkGitEmacs "emacs-native-comp" ./repos/emacs/emacs-unstable.json { nativeComp = true; });
-
-  emacsGitNativeComp = mkGitEmacs "emacs-git-native-comp" ./repos/emacs/emacs-master.json {
-    withSQLite3 = true;
-    withWebP = true;
-    nativeComp = true;
-  };
-
-  emacsPgtk = mkPgtkEmacs "emacs-pgtk" ./repos/emacs/emacs-master.json { withSQLite3 = true; withGTK3 = true; };
-
-  emacsPgtkNativeComp = mkPgtkEmacs "emacs-pgtk-native-comp" ./repos/emacs/emacs-master.json { nativeComp = true; withSQLite3 = true; withGTK3 = true; };
-
-  emacsUnstable = (mkGitEmacs "emacs-unstable" ./repos/emacs/emacs-unstable.json { });
-
+  inherit (super.lib) foldl' flip extends;
+  overlays = [
+    # package overlay must be applied before emacs overlay
+    (import ./package.nix)
+    (import ./emacs.nix)
+  ];
 in
-{
-  inherit emacsGit emacsUnstable;
-
-  inherit emacsNativeComp emacsGitNativeComp;
-
-  inherit emacsPgtk emacsPgtkNativeComp;
-
-  emacsGit-nox = (
-    (
-      emacsGit.override {
-        withNS = false;
-        withX = false;
-        withGTK2 = false;
-        withGTK3 = false;
-        withWebP = false;
-      }
-    ).overrideAttrs (
-      oa: {
-        name = "${oa.name}-nox";
-      }
-    )
-  );
-
-  emacsUnstable-nox = (
-    (
-      emacsUnstable.override {
-        withNS = false;
-        withX = false;
-        withGTK2 = false;
-        withGTK3 = false;
-        withWebP = false;
-      }
-    ).overrideAttrs (
-      oa: {
-        name = "${oa.name}-nox";
-      }
-    )
-  );
-
-  emacsWithPackagesFromUsePackage = import ./elisp.nix { pkgs = self; };
-
-  emacsWithPackagesFromPackageRequires = import ./packreq.nix { pkgs = self; };
-
-  emacsPackagesFor = emacs: (
-    (super.emacsPackagesFor emacs).overrideScope' (
-      eself: esuper:
-        let
-          melpaStablePackages = esuper.melpaStablePackages.override {
-            archiveJson = ./repos/melpa/recipes-archive-melpa.json;
-          };
-
-          melpaPackages = esuper.melpaPackages.override {
-            archiveJson = ./repos/melpa/recipes-archive-melpa.json;
-          };
-
-          elpaPackages = esuper.elpaPackages.override {
-            generated = ./repos/elpa/elpa-generated.nix;
-          };
-
-          epkgs = esuper.override {
-            inherit melpaStablePackages melpaPackages elpaPackages;
-          };
-
-        in
-        epkgs
-        // super.lib.optionalAttrs (super.lib.hasAttr "nongnuPackages" esuper) {
-          nongnuPackages = esuper.nongnuPackages.override {
-            generated = ./repos/nongnu/nongnu-generated.nix;
-          };
-        } // {
-          xelb = mkExDrv eself "xelb" {
-            packageRequires = [ eself.cl-generic eself.emacs ];
-          };
-
-          exwm = mkExDrv eself "exwm" {
-            packageRequires = [ eself.xelb ];
-          };
-        }
-    )
-  );
-
-} // super.lib.optionalAttrs (super.config.allowAliases or true) {
-  emacsGcc = builtins.trace "emacsGcc has been renamed to emacsNativeComp, please update your expression." emacsNativeComp;
-  emacsPgtkGcc = builtins.trace "emacsPgtkGcc has been renamed to emacsPgtkNativeComp, please update your expression." emacsPgtkNativeComp;
-}
+foldl' (flip extends) (_: super) overlays self
diff --git a/overlays/emacs.nix b/overlays/emacs.nix
new file mode 100644
index 000000000000..1b93d4473ec0
--- /dev/null
+++ b/overlays/emacs.nix
@@ -0,0 +1,143 @@
+self: super:
+let
+  mkGitEmacs = namePrefix: jsonFile: { ... }@args:
+    let
+      repoMeta = super.lib.importJSON jsonFile;
+      fetcher =
+        if repoMeta.type == "savannah" then
+          super.fetchFromSavannah
+        else if repoMeta.type == "github" then
+          super.fetchFromGitHub
+        else
+          throw "Unknown repository type ${repoMeta.type}!";
+    in
+    builtins.foldl'
+      (drv: fn: fn drv)
+      super.emacs
+      [
+
+        (drv: drv.override ({ srcRepo = true; } // args))
+
+        (
+          drv: drv.overrideAttrs (
+            old: {
+              name = "${namePrefix}-${repoMeta.version}";
+              inherit (repoMeta) version;
+              src = fetcher (builtins.removeAttrs repoMeta [ "type" "version" ]);
+
+              patches = [ ];
+
+              postPatch = old.postPatch + ''
+                substituteInPlace lisp/loadup.el \
+                --replace '(emacs-repository-get-version)' '"${repoMeta.rev}"' \
+                --replace '(emacs-repository-get-branch)' '"master"'
+              '' +
+              # XXX: remove when https://github.com/NixOS/nixpkgs/pull/193621 is merged
+                (super.lib.optionalString (old ? NATIVE_FULL_AOT)
+                    (let backendPath = (super.lib.concatStringsSep " "
+                      (builtins.map (x: ''\"-B${x}\"'') [
+                        # Paths necessary so the JIT compiler finds its libraries:
+                        "${super.lib.getLib self.libgccjit}/lib"
+                        "${super.lib.getLib self.libgccjit}/lib/gcc"
+                        "${super.lib.getLib self.stdenv.cc.libc}/lib"
+
+                        # Executable paths necessary for compilation (ld, as):
+                        "${super.lib.getBin self.stdenv.cc.cc}/bin"
+                        "${super.lib.getBin self.stdenv.cc.bintools}/bin"
+                        "${super.lib.getBin self.stdenv.cc.bintools.bintools}/bin"
+                      ]));
+                     in ''
+                        substituteInPlace lisp/emacs-lisp/comp.el --replace \
+                            "(defcustom comp-libgccjit-reproducer nil" \
+                            "(setq native-comp-driver-options '(${backendPath}))
+(defcustom comp-libgccjit-reproducer nil"
+                    ''));
+            }
+          )
+        )
+
+        # reconnect pkgs to the built emacs
+        (
+          drv:
+          let
+            result = drv.overrideAttrs (old: {
+              passthru = old.passthru // {
+                pkgs = self.emacsPackagesFor result;
+              };
+            });
+          in
+          result
+        )
+      ];
+
+  mkPgtkEmacs = namePrefix: jsonFile: { ... }@args: (mkGitEmacs namePrefix jsonFile args).overrideAttrs (
+    old: {
+      configureFlags = (super.lib.remove "--with-xft" old.configureFlags)
+        ++ super.lib.singleton "--with-pgtk";
+    }
+  );
+
+  emacsGit = mkGitEmacs "emacs-git" ../repos/emacs/emacs-master.json { withSQLite3 = true; withWebP = true; };
+
+  emacsNativeComp = super.emacsNativeComp or (mkGitEmacs "emacs-native-comp" ../repos/emacs/emacs-unstable.json { nativeComp = true; });
+
+  emacsGitNativeComp = mkGitEmacs "emacs-git-native-comp" ../repos/emacs/emacs-master.json {
+    withSQLite3 = true;
+    withWebP = true;
+    nativeComp = true;
+  };
+
+  emacsPgtk = mkPgtkEmacs "emacs-pgtk" ../repos/emacs/emacs-master.json { withSQLite3 = true; withGTK3 = true; };
+
+  emacsPgtkNativeComp = mkPgtkEmacs "emacs-pgtk-native-comp" ../repos/emacs/emacs-master.json { nativeComp = true; withSQLite3 = true; withGTK3 = true; };
+
+  emacsUnstable = (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json { });
+
+in
+{
+  inherit emacsGit emacsUnstable;
+
+  inherit emacsNativeComp emacsGitNativeComp;
+
+  inherit emacsPgtk emacsPgtkNativeComp;
+
+  emacsGit-nox = (
+    (
+      emacsGit.override {
+        withNS = false;
+        withX = false;
+        withGTK2 = false;
+        withGTK3 = false;
+        withWebP = false;
+      }
+    ).overrideAttrs (
+      oa: {
+        name = "${oa.name}-nox";
+      }
+    )
+  );
+
+  emacsUnstable-nox = (
+    (
+      emacsUnstable.override {
+        withNS = false;
+        withX = false;
+        withGTK2 = false;
+        withGTK3 = false;
+        withWebP = false;
+      }
+    ).overrideAttrs (
+      oa: {
+        name = "${oa.name}-nox";
+      }
+    )
+  );
+
+  emacsWithPackagesFromUsePackage = import ../elisp.nix { pkgs = self; };
+
+  emacsWithPackagesFromPackageRequires = import ../packreq.nix { pkgs = self; };
+
+} // super.lib.optionalAttrs (super.config.allowAliases or true) {
+  emacsGcc = builtins.trace "emacsGcc has been renamed to emacsNativeComp, please update your expression." emacsNativeComp;
+  emacsPgtkGcc = builtins.trace "emacsPgtkGcc has been renamed to emacsPgtkNativeComp, please update your expression." emacsPgtkNativeComp;
+}
diff --git a/overlays/package.nix b/overlays/package.nix
new file mode 100644
index 000000000000..f85fd8f14053
--- /dev/null
+++ b/overlays/package.nix
@@ -0,0 +1,67 @@
+self: super:
+let
+  mkExDrv = emacsPackages: name: args:
+    let
+      repoMeta = super.lib.importJSON (../repos/exwm/. + "/${name}.json");
+    in
+    emacsPackages.melpaBuild (
+      args // {
+        pname = name;
+        ename = name;
+        version = repoMeta.version;
+        commit = repoMeta.rev;
+
+        recipe = builtins.toFile "recipe" ''
+          (${name} :fetcher github
+          :repo "ch11ng/${name}")
+        '';
+
+        src = super.fetchFromGitHub {
+          owner = "ch11ng";
+          repo = name;
+          inherit (repoMeta) rev sha256;
+        };
+      }
+    );
+
+in
+{
+  emacsPackagesFor = emacs: (
+    (super.emacsPackagesFor emacs).overrideScope' (
+      eself: esuper:
+        let
+          melpaStablePackages = esuper.melpaStablePackages.override {
+            archiveJson = ../repos/melpa/recipes-archive-melpa.json;
+          };
+
+          melpaPackages = esuper.melpaPackages.override {
+            archiveJson = ../repos/melpa/recipes-archive-melpa.json;
+          };
+
+          elpaPackages = esuper.elpaPackages.override {
+            generated = ../repos/elpa/elpa-generated.nix;
+          };
+
+          epkgs = esuper.override {
+            inherit melpaStablePackages melpaPackages elpaPackages;
+          };
+
+        in
+        epkgs
+        // super.lib.optionalAttrs (super.lib.hasAttr "nongnuPackages" esuper) {
+          nongnuPackages = esuper.nongnuPackages.override {
+            generated = ../repos/nongnu/nongnu-generated.nix;
+          };
+        } // {
+          xelb = mkExDrv eself "xelb" {
+            packageRequires = [ eself.cl-generic eself.emacs ];
+          };
+
+          exwm = mkExDrv eself "exwm" {
+            packageRequires = [ eself.xelb ];
+          };
+        }
+    )
+  );
+
+}
-- 
cgit 1.4.1


From 2142ce3789d2ac230a225eb078d3bf2f85046532 Mon Sep 17 00:00:00 2001
From: Yilin Wei <yilin@kebab-ca.se>
Date: Tue, 11 Oct 2022 15:24:58 +0100
Subject: Add `feature/tree-sitter` derivation to emacs overlay

Adds the branch `feature/tree-sitter` to allow testing of tree-sitter
integration and exposes it as `emacsGitTreeSitter` in the `emacs`
overlay.

Introduces `withTreeSitter` and `withTreeSitterPlugins`.
---
 overlays/emacs.nix                         | 38 ++++++++++++++++++++++++++----
 repos/emacs/emacs-feature_tree-sitter.json |  1 +
 repos/emacs/test.nix                       |  1 +
 repos/emacs/update                         |  1 +
 4 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 repos/emacs/emacs-feature_tree-sitter.json

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 1b93d4473ec0..4e2a6aaed6c1 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -14,9 +14,9 @@ let
     builtins.foldl'
       (drv: fn: fn drv)
       super.emacs
-      [
+      ([
 
-        (drv: drv.override ({ srcRepo = true; } // args))
+        (drv: drv.override ({ srcRepo = true; } // builtins.removeAttrs args [ "withTreeSitterPlugins" "withTreeSitter" ]))
 
         (
           drv: drv.overrideAttrs (
@@ -68,7 +68,26 @@ let
           in
           result
         )
-      ];
+      ]
+      ++ (super.lib.optional (args ? "withTreeSitter") (
+        drv: drv.overrideAttrs (old:
+          let
+            libName = drv: super.lib.removeSuffix "-grammar" drv.pname;
+            lib = drv: ''lib${libName drv}.so'';
+            linkCmd = drv: "ln -s ${drv}/parser $out/lib/${lib drv}";
+            linkerFlag = drv: "-l" + libName drv;
+            plugins = args.withTreeSitterPlugins super.pkgs.tree-sitter-grammars;
+            tree-sitter-grammars = super.runCommand "tree-sitter-grammars" {
+            } (super.lib.concatStringsSep "\n" (["mkdir -p $out/lib"] ++ (map linkCmd plugins)));
+          in {
+            buildInputs = old.buildInputs ++ [ super.pkgs.tree-sitter tree-sitter-grammars ];
+            # before building the `.el` files, we need to allow the `tree-sitter` libraries
+            # bundled in emacs to be dynamically loaded.
+            TREE_SITTER_LIBS = super.lib.concatStringsSep " " ([ "-ltree-sitter" ] ++ (map linkerFlag plugins)); 
+          }
+        )
+      )));
+
 
   mkPgtkEmacs = namePrefix: jsonFile: { ... }@args: (mkGitEmacs namePrefix jsonFile args).overrideAttrs (
     old: {
@@ -86,13 +105,22 @@ let
     withWebP = true;
     nativeComp = true;
   };
-
+  
   emacsPgtk = mkPgtkEmacs "emacs-pgtk" ../repos/emacs/emacs-master.json { withSQLite3 = true; withGTK3 = true; };
 
   emacsPgtkNativeComp = mkPgtkEmacs "emacs-pgtk-native-comp" ../repos/emacs/emacs-master.json { nativeComp = true; withSQLite3 = true; withGTK3 = true; };
 
   emacsUnstable = (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json { });
 
+  emacsGitTreeSitter = mkGitEmacs "emacs-git-tree-sitter" ../repos/emacs/emacs-feature_tree-sitter.json {
+    withTreeSitter = true;
+    withTreeSitterPlugins = (plugins: with plugins; [
+      tree-sitter-python
+      tree-sitter-javascript
+      tree-sitter-json
+    ]);
+  };
+
 in
 {
   inherit emacsGit emacsUnstable;
@@ -133,6 +161,8 @@ in
     )
   );
 
+  inherit emacsGitTreeSitter;
+
   emacsWithPackagesFromUsePackage = import ../elisp.nix { pkgs = self; };
 
   emacsWithPackagesFromPackageRequires = import ../packreq.nix { pkgs = self; };
diff --git a/repos/emacs/emacs-feature_tree-sitter.json b/repos/emacs/emacs-feature_tree-sitter.json
new file mode 100644
index 000000000000..52f67cc64d6a
--- /dev/null
+++ b/repos/emacs/emacs-feature_tree-sitter.json
@@ -0,0 +1 @@
+{"type": "savannah", "repo": "emacs", "rev": "57e37e9128b4f6f9a2aae0bc25de6c208d58e5d0", "sha256": "1h6zicpj6bym4nclcgwvjbdisi1v5psvmpz1lik7ha85jdscpnd2", "version": "20221010.0"}
diff --git a/repos/emacs/test.nix b/repos/emacs/test.nix
index 24ed78a07cc3..fe0aa713d0c9 100644
--- a/repos/emacs/test.nix
+++ b/repos/emacs/test.nix
@@ -7,6 +7,7 @@ let
   in emacsWithPackages(epkgs: [ ]);
 
 in {
+  emacsGitTreeSitter = mkTestBuild pkgs.emacsGitTreeSitter;
   emacsUnstable = mkTestBuild pkgs.emacsUnstable;
   emacsGit = mkTestBuild pkgs.emacsGit;
   emacsGitNativeComp = mkTestBuild pkgs.emacsGitNativeComp;
diff --git a/repos/emacs/update b/repos/emacs/update
index 3de0f5309c5b..12b7daa45f4d 100755
--- a/repos/emacs/update
+++ b/repos/emacs/update
@@ -52,5 +52,6 @@ function update_release() {
 
 update_savannah_branch master
 update_release
+update_savannah_branch feature/tree-sitter
 
 nix-build --no-out-link --show-trace ./test.nix
-- 
cgit 1.4.1


From a828f7f2ea3f79110b26ea40763326cd788e43e3 Mon Sep 17 00:00:00 2001
From: Yilin Wei <yilin@kebab-ca.se>
Date: Wed, 12 Oct 2022 19:53:16 +0100
Subject: Make `withTreeSitterPlugins` overridable.

Allow the tree-sitter plugins to be overridable until the
attributes are upstreamed.
---
 overlays/emacs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 4e2a6aaed6c1..72fa6b0d1487 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -112,7 +112,7 @@ let
 
   emacsUnstable = (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json { });
 
-  emacsGitTreeSitter = mkGitEmacs "emacs-git-tree-sitter" ../repos/emacs/emacs-feature_tree-sitter.json {
+  emacsGitTreeSitter = super.lib.makeOverridable (mkGitEmacs "emacs-git-tree-sitter" ../repos/emacs/emacs-feature_tree-sitter.json) {
     withTreeSitter = true;
     withTreeSitterPlugins = (plugins: with plugins; [
       tree-sitter-python
-- 
cgit 1.4.1


From c1143602cb97fa717bacdf5668ceca1bb487918d Mon Sep 17 00:00:00 2001
From: Yilin Wei <yilin@kebab-ca.se>
Date: Mon, 17 Oct 2022 09:14:42 +0100
Subject: address comments

---
 overlays/emacs.nix                         | 11 ++++++-----
 repos/emacs/emacs-feature_tree-sitter.json |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 72fa6b0d1487..ca745409707d 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -76,11 +76,11 @@ let
             lib = drv: ''lib${libName drv}.so'';
             linkCmd = drv: "ln -s ${drv}/parser $out/lib/${lib drv}";
             linkerFlag = drv: "-l" + libName drv;
-            plugins = args.withTreeSitterPlugins super.pkgs.tree-sitter-grammars;
-            tree-sitter-grammars = super.runCommand "tree-sitter-grammars" {
-            } (super.lib.concatStringsSep "\n" (["mkdir -p $out/lib"] ++ (map linkCmd plugins)));
+            plugins = args.withTreeSitterPlugins self.pkgs.tree-sitter-grammars;
+            tree-sitter-grammars = super.runCommand "tree-sitter-grammars" {}
+              (super.lib.concatStringsSep "\n" (["mkdir -p $out/lib"] ++ (map linkCmd plugins)));
           in {
-            buildInputs = old.buildInputs ++ [ super.pkgs.tree-sitter tree-sitter-grammars ];
+            buildInputs = old.buildInputs ++ [ self.pkgs.tree-sitter tree-sitter-grammars ];
             # before building the `.el` files, we need to allow the `tree-sitter` libraries
             # bundled in emacs to be dynamically loaded.
             TREE_SITTER_LIBS = super.lib.concatStringsSep " " ([ "-ltree-sitter" ] ++ (map linkerFlag plugins)); 
@@ -105,7 +105,7 @@ let
     withWebP = true;
     nativeComp = true;
   };
-  
+
   emacsPgtk = mkPgtkEmacs "emacs-pgtk" ../repos/emacs/emacs-master.json { withSQLite3 = true; withGTK3 = true; };
 
   emacsPgtkNativeComp = mkPgtkEmacs "emacs-pgtk-native-comp" ../repos/emacs/emacs-master.json { nativeComp = true; withSQLite3 = true; withGTK3 = true; };
@@ -118,6 +118,7 @@ let
       tree-sitter-python
       tree-sitter-javascript
       tree-sitter-json
+      tree-sitter-tsx
     ]);
   };
 
diff --git a/repos/emacs/emacs-feature_tree-sitter.json b/repos/emacs/emacs-feature_tree-sitter.json
index 52f67cc64d6a..b42c7343fade 100644
--- a/repos/emacs/emacs-feature_tree-sitter.json
+++ b/repos/emacs/emacs-feature_tree-sitter.json
@@ -1 +1 @@
-{"type": "savannah", "repo": "emacs", "rev": "57e37e9128b4f6f9a2aae0bc25de6c208d58e5d0", "sha256": "1h6zicpj6bym4nclcgwvjbdisi1v5psvmpz1lik7ha85jdscpnd2", "version": "20221010.0"}
+{"type": "savannah", "repo": "emacs", "rev": "260e47e9a3c9b3baecef81e69c218989dc0cd7a4", "sha256": "1j5pbrp1bb5q6vn5ykdim8jvxj466gh1i6brl5baphr3a2cvvja8", "version": "20221017.0"}
-- 
cgit 1.4.1


From a03c0961009f0028c794bd740f2e049f568247d7 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Mon, 17 Oct 2022 21:38:10 +0800
Subject: overlays: use a better and clearer way to compose overlays

The old way of composing overlays addes an unnecessay overlay, which
breaks the packages attribute of the flake. To reduce the impact on
users, I make a workaround[1] for that, which has been merged. Now I
figure out the real fix, which is to change (_: super) to (_: {}).

Additionally, the old way is a bit confusing.

This patch fixes both issues by using a better and clearer way to
compose overlays.

Since the workaround is no longer needed after this patch, I revert
that in the next commit.

[1]: https://github.com/nix-community/emacs-overlay/pull/256
---
 overlays/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'overlays')

diff --git a/overlays/default.nix b/overlays/default.nix
index 089b5494dca9..4819573515a2 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,10 +1,9 @@
 self: super:
 let
-  inherit (super.lib) foldl' flip extends;
   overlays = [
     # package overlay must be applied before emacs overlay
     (import ./package.nix)
     (import ./emacs.nix)
   ];
 in
-foldl' (flip extends) (_: super) overlays self
+super.lib.composeManyExtensions overlays self super
-- 
cgit 1.4.1


From a22d79104426b9442ec3540da7e27864beae564a Mon Sep 17 00:00:00 2001
From: Eric Dallo <ericdallo06@hotmail.com>
Date: Wed, 9 Nov 2022 22:01:30 -0300
Subject: emacs: add emacsLsp

---
 overlays/emacs.nix         | 4 ++++
 repos/emacs/emacs-lsp.json | 1 +
 2 files changed, 5 insertions(+)
 create mode 100644 repos/emacs/emacs-lsp.json

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index ca745409707d..87f39e5288da 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -122,6 +122,8 @@ let
     ]);
   };
 
+  emacsLsp = (mkGitEmacs "emacs-lsp" ../repos/emacs/emacs-lsp.json { nativeComp = true; });
+
 in
 {
   inherit emacsGit emacsUnstable;
@@ -164,6 +166,8 @@ in
 
   inherit emacsGitTreeSitter;
 
+  inherit emacsLsp;
+
   emacsWithPackagesFromUsePackage = import ../elisp.nix { pkgs = self; };
 
   emacsWithPackagesFromPackageRequires = import ../packreq.nix { pkgs = self; };
diff --git a/repos/emacs/emacs-lsp.json b/repos/emacs/emacs-lsp.json
new file mode 100644
index 000000000000..9e0ec3f86270
--- /dev/null
+++ b/repos/emacs/emacs-lsp.json
@@ -0,0 +1 @@
+{"type": "github", "owner": "emacs-lsp", "repo": "emacs", "rev": "955ac73cb3d04f86b2d0514317d58b8d41ac1922", "sha256": "0zh3zjx2bjvzzjqfqcmk1bm6nz5wpb7v3wivy6pyybbgkqarp15r", "version": "20221109.0"}
-- 
cgit 1.4.1


From 69812253cf13702aa0d6e6e0403b6282408561ec Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Sat, 12 Nov 2022 14:08:17 -0800
Subject: Add more tree-sitter plugins

---
 overlays/emacs.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 87f39e5288da..4bc5b86a9037 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -115,6 +115,10 @@ let
   emacsGitTreeSitter = super.lib.makeOverridable (mkGitEmacs "emacs-git-tree-sitter" ../repos/emacs/emacs-feature_tree-sitter.json) {
     withTreeSitter = true;
     withTreeSitterPlugins = (plugins: with plugins; [
+      tree-sitter-c
+      tree-sitter-cpp
+      tree-sitter-css
+      tree-sitter-java
       tree-sitter-python
       tree-sitter-javascript
       tree-sitter-json
-- 
cgit 1.4.1


From 39ecc84bfb684c442ea89f31d513f80ae383470b Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Thu, 17 Nov 2022 12:11:07 -0800
Subject: Add tree-sitter-bash to list of plugins

---
 overlays/emacs.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 4bc5b86a9037..d42bdf266f7c 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -115,6 +115,7 @@ let
   emacsGitTreeSitter = super.lib.makeOverridable (mkGitEmacs "emacs-git-tree-sitter" ../repos/emacs/emacs-feature_tree-sitter.json) {
     withTreeSitter = true;
     withTreeSitterPlugins = (plugins: with plugins; [
+      tree-sitter-bash
       tree-sitter-c
       tree-sitter-cpp
       tree-sitter-css
-- 
cgit 1.4.1


From 35a111eafb2489b044fb0e6edbefd9e5d3ca3365 Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Mon, 21 Nov 2022 16:55:16 -0800
Subject: Build emacsGitTreeSitter from master

---
 overlays/emacs.nix                         | 2 +-
 repos/emacs/emacs-feature_tree-sitter.json | 1 -
 repos/emacs/emacs-master.json              | 2 +-
 repos/emacs/update                         | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)
 delete mode 100644 repos/emacs/emacs-feature_tree-sitter.json

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index d42bdf266f7c..b0bdc0881dde 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -112,7 +112,7 @@ let
 
   emacsUnstable = (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json { });
 
-  emacsGitTreeSitter = super.lib.makeOverridable (mkGitEmacs "emacs-git-tree-sitter" ../repos/emacs/emacs-feature_tree-sitter.json) {
+  emacsGitTreeSitter = super.lib.makeOverridable (mkGitEmacs "emacs-git" ../repos/emacs/emacs-master.json) {
     withTreeSitter = true;
     withTreeSitterPlugins = (plugins: with plugins; [
       tree-sitter-bash
diff --git a/repos/emacs/emacs-feature_tree-sitter.json b/repos/emacs/emacs-feature_tree-sitter.json
deleted file mode 100644
index 1b8c4a89d24f..000000000000
--- a/repos/emacs/emacs-feature_tree-sitter.json
+++ /dev/null
@@ -1 +0,0 @@
-{"type": "savannah", "repo": "emacs", "rev": "24509731652e11bfed4537d7e5ef544014d2970c", "sha256": "06i2cap05dkdspgldkxln4h21ya6zc4b8n52mp7jq27s5vxamd7p", "version": "20221121.0"}
diff --git a/repos/emacs/emacs-master.json b/repos/emacs/emacs-master.json
index 18025b32812b..d51f21f11bd1 100644
--- a/repos/emacs/emacs-master.json
+++ b/repos/emacs/emacs-master.json
@@ -1 +1 @@
-{"type": "savannah", "repo": "emacs", "rev": "f176a36f4629b56c9fd9e3fc15aebd04a168c4f5", "sha256": "0z247fym3xjfc6dy3bbr8278h0kycifxbdird9g2kij30c7gb8zc", "version": "20221121.0"}
+{"type": "savannah", "repo": "emacs", "rev": "aeadba1418d8fc18f17b4ae415cde35e9e272e7a", "sha256": "0bg6p4sz0npq108m16ggh0wwxg7xq3mpwzw8yzb8clb2ihfalycm", "version": "20221121.0"}
diff --git a/repos/emacs/update b/repos/emacs/update
index 12b7daa45f4d..3de0f5309c5b 100755
--- a/repos/emacs/update
+++ b/repos/emacs/update
@@ -52,6 +52,5 @@ function update_release() {
 
 update_savannah_branch master
 update_release
-update_savannah_branch feature/tree-sitter
 
 nix-build --no-out-link --show-trace ./test.nix
-- 
cgit 1.4.1


From d381dcca8193bce5c65aca58832b53b79e31d167 Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Wed, 23 Nov 2022 17:06:08 -0800
Subject: Add C# grammar to list of tree-sitter plugins

---
 overlays/emacs.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index b0bdc0881dde..8e53a0ae70f5 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -117,6 +117,7 @@ let
     withTreeSitterPlugins = (plugins: with plugins; [
       tree-sitter-bash
       tree-sitter-c
+      tree-sitter-c-sharp
       tree-sitter-cpp
       tree-sitter-css
       tree-sitter-java
-- 
cgit 1.4.1


From 57e743882976214a6ca0524b0de3bdba2d30cd8d Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Fri, 2 Dec 2022 02:51:10 -0800
Subject: Add tree-sitter-typescript grammar

---
 overlays/emacs.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 8e53a0ae70f5..634f4c0f2b3a 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -125,6 +125,7 @@ let
       tree-sitter-javascript
       tree-sitter-json
       tree-sitter-tsx
+      tree-sitter-typescript
     ]);
   };
 
-- 
cgit 1.4.1


From 5ead1de8409206364a611aca63f4fbebd88ec656 Mon Sep 17 00:00:00 2001
From: Jason Jackson <jasonjckn@gmail.com>
Date: Fri, 2 Dec 2022 14:35:00 -0800
Subject: TODO: write commit message

---
 overlays/emacs.nix | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 634f4c0f2b3a..d2d67108ca31 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -73,9 +73,16 @@ let
         drv: drv.overrideAttrs (old:
           let
             libName = drv: super.lib.removeSuffix "-grammar" drv.pname;
-            lib = drv: ''lib${libName drv}.so'';
-            linkCmd = drv: "ln -s ${drv}/parser $out/lib/${lib drv}";
+            libSuffix = if super.stdenv.isDarwin then "dylib" else "so";
+            lib = drv: ''lib${libName drv}.${libSuffix}'';
+            # /usr/bin/codesign --deep -s - -f $out/lib/${lib drv}
+            linkCmd = drv:
+              if super.stdenv.isDarwin
+              then ''cp ${drv}/parser $out/lib/${lib drv}
+                     /usr/bin/install_name_tool -id $out/lib/${lib drv} $out/lib/${lib drv}''
+              else ''ln -s ${drv}/parser $out/lib/${lib drv}'';
             linkerFlag = drv: "-l" + libName drv;
+
             plugins = args.withTreeSitterPlugins self.pkgs.tree-sitter-grammars;
             tree-sitter-grammars = super.runCommand "tree-sitter-grammars" {}
               (super.lib.concatStringsSep "\n" (["mkdir -p $out/lib"] ++ (map linkCmd plugins)));
@@ -83,7 +90,14 @@ let
             buildInputs = old.buildInputs ++ [ self.pkgs.tree-sitter tree-sitter-grammars ];
             # before building the `.el` files, we need to allow the `tree-sitter` libraries
             # bundled in emacs to be dynamically loaded.
-            TREE_SITTER_LIBS = super.lib.concatStringsSep " " ([ "-ltree-sitter" ] ++ (map linkerFlag plugins)); 
+            TREE_SITTER_LIBS = super.lib.concatStringsSep " " ([ "-ltree-sitter" ] ++ (map linkerFlag plugins));
+            # Fixes tree sitter error: "Buffer has no parser"
+            # Configure emacs where libraries exist nix store.
+            postPatch = old.postPatch + ''
+                 substituteInPlace src/treesit.c \
+                 --replace "Vtreesit_extra_load_path = Qnil;" \
+                           "Vtreesit_extra_load_path = list1 ( build_string ( \"${tree-sitter-grammars}/lib\" ) );"
+            '';
           }
         )
       )));
@@ -126,6 +140,7 @@ let
       tree-sitter-json
       tree-sitter-tsx
       tree-sitter-typescript
+      tree-sitter-clojure
     ]);
   };
 
-- 
cgit 1.4.1


From f2710ca9fa79bef0f41ee0fc80d26ee07ac98c96 Mon Sep 17 00:00:00 2001
From: Jason Jackson <jasonjckn@gmail.com>
Date: Fri, 2 Dec 2022 14:38:58 -0800
Subject: TODO: write commit message

---
 overlays/emacs.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index d2d67108ca31..a12dc2f3e16d 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -79,7 +79,9 @@ let
             linkCmd = drv:
               if super.stdenv.isDarwin
               then ''cp ${drv}/parser $out/lib/${lib drv}
-                     /usr/bin/install_name_tool -id $out/lib/${lib drv} $out/lib/${lib drv}''
+                     /usr/bin/install_name_tool -id $out/lib/${lib drv} $out/lib/${lib drv}
+                     codesign -s - -f $out/lib/${lib drv}
+                ''
               else ''ln -s ${drv}/parser $out/lib/${lib drv}'';
             linkerFlag = drv: "-l" + libName drv;
 
-- 
cgit 1.4.1


From fd0da6cc6c3bb214363d1c28f73d58c673e6cda6 Mon Sep 17 00:00:00 2001
From: Jason Jackson <jasonjckn@gmail.com>
Date: Fri, 2 Dec 2022 14:45:50 -0800
Subject: TODO: write commit message

---
 overlays/emacs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index a12dc2f3e16d..a2a43bf9ca1a 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -80,7 +80,7 @@ let
               if super.stdenv.isDarwin
               then ''cp ${drv}/parser $out/lib/${lib drv}
                      /usr/bin/install_name_tool -id $out/lib/${lib drv} $out/lib/${lib drv}
-                     codesign -s - -f $out/lib/${lib drv}
+                     /usr/bin/codesign -s - -f $out/lib/${lib drv}
                 ''
               else ''ln -s ${drv}/parser $out/lib/${lib drv}'';
             linkerFlag = drv: "-l" + libName drv;
-- 
cgit 1.4.1


From d4684817168d71cd7167f6cec7d910f1311e1cd0 Mon Sep 17 00:00:00 2001
From: Jason Jackson <jasonjckn@gmail.com>
Date: Fri, 2 Dec 2022 14:47:27 -0800
Subject: TODO: write commit message

---
 overlays/emacs.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index a2a43bf9ca1a..76eed9284aaf 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -75,7 +75,6 @@ let
             libName = drv: super.lib.removeSuffix "-grammar" drv.pname;
             libSuffix = if super.stdenv.isDarwin then "dylib" else "so";
             lib = drv: ''lib${libName drv}.${libSuffix}'';
-            # /usr/bin/codesign --deep -s - -f $out/lib/${lib drv}
             linkCmd = drv:
               if super.stdenv.isDarwin
               then ''cp ${drv}/parser $out/lib/${lib drv}
-- 
cgit 1.4.1


From 7f6e28bdd8958d8446797f201172c3e43dada0de Mon Sep 17 00:00:00 2001
From: Jason Jackson <jasonjckn@gmail.com>
Date: Fri, 2 Dec 2022 14:53:05 -0800
Subject: TODO: write commit message

---
 overlays/emacs.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 76eed9284aaf..6baea1754f68 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -92,8 +92,7 @@ let
             # before building the `.el` files, we need to allow the `tree-sitter` libraries
             # bundled in emacs to be dynamically loaded.
             TREE_SITTER_LIBS = super.lib.concatStringsSep " " ([ "-ltree-sitter" ] ++ (map linkerFlag plugins));
-            # Fixes tree sitter error: "Buffer has no parser"
-            # Configure emacs where libraries exist nix store.
+            # Add to directories that tree-sitter looks in for language definitions / shared object parsers
             postPatch = old.postPatch + ''
                  substituteInPlace src/treesit.c \
                  --replace "Vtreesit_extra_load_path = Qnil;" \
-- 
cgit 1.4.1


From c4eaac8256718db0377d2365c9bc33252b4096c7 Mon Sep 17 00:00:00 2001
From: Jason Jackson <jasonjckn@gmail.com>
Date: Fri, 2 Dec 2022 18:11:28 -0800
Subject: remove newline, remove clojure

---
 overlays/emacs.nix | 2 --
 1 file changed, 2 deletions(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 6baea1754f68..3aeb07c14b99 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -83,7 +83,6 @@ let
                 ''
               else ''ln -s ${drv}/parser $out/lib/${lib drv}'';
             linkerFlag = drv: "-l" + libName drv;
-
             plugins = args.withTreeSitterPlugins self.pkgs.tree-sitter-grammars;
             tree-sitter-grammars = super.runCommand "tree-sitter-grammars" {}
               (super.lib.concatStringsSep "\n" (["mkdir -p $out/lib"] ++ (map linkCmd plugins)));
@@ -140,7 +139,6 @@ let
       tree-sitter-json
       tree-sitter-tsx
       tree-sitter-typescript
-      tree-sitter-clojure
     ]);
   };
 
-- 
cgit 1.4.1


From b816a3e73b48dacffc5c180854462b38bb04a51f Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Fri, 2 Dec 2022 19:00:33 -0800
Subject: Enable tree-sitter by default when applicable

---
 overlays/emacs.nix   | 44 +++++++++++++++++++-------------------------
 repos/emacs/test.nix |  1 -
 2 files changed, 19 insertions(+), 26 deletions(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 3aeb07c14b99..8ff063c3d7b3 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -16,7 +16,7 @@ let
       super.emacs
       ([
 
-        (drv: drv.override ({ srcRepo = true; } // builtins.removeAttrs args [ "withTreeSitterPlugins" "withTreeSitter" ]))
+        (drv: drv.override ({ srcRepo = true; } // builtins.removeAttrs args [ "noTreeSitter" ]))
 
         (
           drv: drv.overrideAttrs (
@@ -69,7 +69,7 @@ let
           result
         )
       ]
-      ++ (super.lib.optional (args ? "withTreeSitter") (
+      ++ (super.lib.optional (! (args ? "noTreeSitter")) (
         drv: drv.overrideAttrs (old:
           let
             libName = drv: super.lib.removeSuffix "-grammar" drv.pname;
@@ -83,7 +83,19 @@ let
                 ''
               else ''ln -s ${drv}/parser $out/lib/${lib drv}'';
             linkerFlag = drv: "-l" + libName drv;
-            plugins = args.withTreeSitterPlugins self.pkgs.tree-sitter-grammars;
+            plugins = with self.pkgs.tree-sitter-grammars; [
+              tree-sitter-bash
+              tree-sitter-c
+              tree-sitter-c-sharp
+              tree-sitter-cpp
+              tree-sitter-css
+              tree-sitter-java
+              tree-sitter-python
+              tree-sitter-javascript
+              tree-sitter-json
+              tree-sitter-tsx
+              tree-sitter-typescript
+            ];
             tree-sitter-grammars = super.runCommand "tree-sitter-grammars" {}
               (super.lib.concatStringsSep "\n" (["mkdir -p $out/lib"] ++ (map linkCmd plugins)));
           in {
@@ -111,7 +123,7 @@ let
 
   emacsGit = mkGitEmacs "emacs-git" ../repos/emacs/emacs-master.json { withSQLite3 = true; withWebP = true; };
 
-  emacsNativeComp = super.emacsNativeComp or (mkGitEmacs "emacs-native-comp" ../repos/emacs/emacs-unstable.json { nativeComp = true; });
+  emacsNativeComp = super.emacsNativeComp or (mkGitEmacs "emacs-native-comp" ../repos/emacs/emacs-unstable.json { nativeComp = true; noTreeSitter = true; });
 
   emacsGitNativeComp = mkGitEmacs "emacs-git-native-comp" ../repos/emacs/emacs-master.json {
     withSQLite3 = true;
@@ -123,26 +135,9 @@ let
 
   emacsPgtkNativeComp = mkPgtkEmacs "emacs-pgtk-native-comp" ../repos/emacs/emacs-master.json { nativeComp = true; withSQLite3 = true; withGTK3 = true; };
 
-  emacsUnstable = (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json { });
-
-  emacsGitTreeSitter = super.lib.makeOverridable (mkGitEmacs "emacs-git" ../repos/emacs/emacs-master.json) {
-    withTreeSitter = true;
-    withTreeSitterPlugins = (plugins: with plugins; [
-      tree-sitter-bash
-      tree-sitter-c
-      tree-sitter-c-sharp
-      tree-sitter-cpp
-      tree-sitter-css
-      tree-sitter-java
-      tree-sitter-python
-      tree-sitter-javascript
-      tree-sitter-json
-      tree-sitter-tsx
-      tree-sitter-typescript
-    ]);
-  };
+  emacsUnstable = (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json { noTreeSitter = true; });
 
-  emacsLsp = (mkGitEmacs "emacs-lsp" ../repos/emacs/emacs-lsp.json { nativeComp = true; });
+  emacsLsp = (mkGitEmacs "emacs-lsp" ../repos/emacs/emacs-lsp.json { nativeComp = true; noTreeSitter = true; });
 
 in
 {
@@ -184,8 +179,6 @@ in
     )
   );
 
-  inherit emacsGitTreeSitter;
-
   inherit emacsLsp;
 
   emacsWithPackagesFromUsePackage = import ../elisp.nix { pkgs = self; };
@@ -194,5 +187,6 @@ in
 
 } // super.lib.optionalAttrs (super.config.allowAliases or true) {
   emacsGcc = builtins.trace "emacsGcc has been renamed to emacsNativeComp, please update your expression." emacsNativeComp;
+  emacsGitTreeSitter = builtins.trace "emacsGitTreeSitter has been renamed to emacsGit, please update your expression." emacsGit;
   emacsPgtkGcc = builtins.trace "emacsPgtkGcc has been renamed to emacsPgtkNativeComp, please update your expression." emacsPgtkNativeComp;
 }
diff --git a/repos/emacs/test.nix b/repos/emacs/test.nix
index fe0aa713d0c9..24ed78a07cc3 100644
--- a/repos/emacs/test.nix
+++ b/repos/emacs/test.nix
@@ -7,7 +7,6 @@ let
   in emacsWithPackages(epkgs: [ ]);
 
 in {
-  emacsGitTreeSitter = mkTestBuild pkgs.emacsGitTreeSitter;
   emacsUnstable = mkTestBuild pkgs.emacsUnstable;
   emacsGit = mkTestBuild pkgs.emacsGit;
   emacsGitNativeComp = mkTestBuild pkgs.emacsGitNativeComp;
-- 
cgit 1.4.1


From e92766297a7ef6b4be7a8b9ebf5fb2dc3bc7989a Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Fri, 2 Dec 2022 19:07:32 -0800
Subject: Alias redundant attributes since in 22.11, nativeComp = true

---
 overlays/emacs.nix   | 23 +++++++----------------
 repos/emacs/test.nix |  2 --
 2 files changed, 7 insertions(+), 18 deletions(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 8ff063c3d7b3..86ed22235991 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -123,29 +123,17 @@ let
 
   emacsGit = mkGitEmacs "emacs-git" ../repos/emacs/emacs-master.json { withSQLite3 = true; withWebP = true; };
 
-  emacsNativeComp = super.emacsNativeComp or (mkGitEmacs "emacs-native-comp" ../repos/emacs/emacs-unstable.json { nativeComp = true; noTreeSitter = true; });
-
-  emacsGitNativeComp = mkGitEmacs "emacs-git-native-comp" ../repos/emacs/emacs-master.json {
-    withSQLite3 = true;
-    withWebP = true;
-    nativeComp = true;
-  };
-
   emacsPgtk = mkPgtkEmacs "emacs-pgtk" ../repos/emacs/emacs-master.json { withSQLite3 = true; withGTK3 = true; };
 
-  emacsPgtkNativeComp = mkPgtkEmacs "emacs-pgtk-native-comp" ../repos/emacs/emacs-master.json { nativeComp = true; withSQLite3 = true; withGTK3 = true; };
-
   emacsUnstable = (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json { noTreeSitter = true; });
 
-  emacsLsp = (mkGitEmacs "emacs-lsp" ../repos/emacs/emacs-lsp.json { nativeComp = true; noTreeSitter = true; });
+  emacsLsp = (mkGitEmacs "emacs-lsp" ../repos/emacs/emacs-lsp.json { noTreeSitter = true; });
 
 in
 {
   inherit emacsGit emacsUnstable;
 
-  inherit emacsNativeComp emacsGitNativeComp;
-
-  inherit emacsPgtk emacsPgtkNativeComp;
+  inherit emacsPgtk;
 
   emacsGit-nox = (
     (
@@ -186,7 +174,10 @@ in
   emacsWithPackagesFromPackageRequires = import ../packreq.nix { pkgs = self; };
 
 } // super.lib.optionalAttrs (super.config.allowAliases or true) {
-  emacsGcc = builtins.trace "emacsGcc has been renamed to emacsNativeComp, please update your expression." emacsNativeComp;
+  emacsGcc = builtins.trace "emacsGcc has been renamed to emacsGit, please update your expression." emacsGit;
+  emacsGitNativeComp = builtins.trace "emacsGitNativeComp has been renamed to emacsGit, please update your expression." emacsGit;
   emacsGitTreeSitter = builtins.trace "emacsGitTreeSitter has been renamed to emacsGit, please update your expression." emacsGit;
-  emacsPgtkGcc = builtins.trace "emacsPgtkGcc has been renamed to emacsPgtkNativeComp, please update your expression." emacsPgtkNativeComp;
+  emacsNativeComp = builtins.trace "emacsNativeComp has been renamed to emacsUnstable, please update your expression." emacsUnstable;
+  emacsPgtkGcc = builtins.trace "emacsPgtkGcc has been renamed to emacsPgtk, please update your expression." emacsPgtk;
+  emacsPgtkNativeComp = builtins.trace "emacsPgtkNativeComp has been renamed to emacsPgtk, please update your expression." emacsPgtk;
 }
diff --git a/repos/emacs/test.nix b/repos/emacs/test.nix
index 24ed78a07cc3..1fc3ac5b0a90 100644
--- a/repos/emacs/test.nix
+++ b/repos/emacs/test.nix
@@ -9,7 +9,5 @@ let
 in {
   emacsUnstable = mkTestBuild pkgs.emacsUnstable;
   emacsGit = mkTestBuild pkgs.emacsGit;
-  emacsGitNativeComp = mkTestBuild pkgs.emacsGitNativeComp;
   emacsPgtk = mkTestBuild pkgs.emacsPgtk;
-  emacsPgtkNativeComp = mkTestBuild pkgs.emacsPgtkNativeComp;
 }
-- 
cgit 1.4.1


From 2b59221ede94cce7db3aef6e2bfb707c1ddc5e70 Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Fri, 2 Dec 2022 19:08:55 -0800
Subject: Enable WebP support for emacsPgtk

---
 overlays/emacs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 86ed22235991..a3f92c64946e 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -123,7 +123,7 @@ let
 
   emacsGit = mkGitEmacs "emacs-git" ../repos/emacs/emacs-master.json { withSQLite3 = true; withWebP = true; };
 
-  emacsPgtk = mkPgtkEmacs "emacs-pgtk" ../repos/emacs/emacs-master.json { withSQLite3 = true; withGTK3 = true; };
+  emacsPgtk = mkPgtkEmacs "emacs-pgtk" ../repos/emacs/emacs-master.json { withSQLite3 = true; withWebP = true; withGTK3 = true; };
 
   emacsUnstable = (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json { noTreeSitter = true; });
 
-- 
cgit 1.4.1


From 0743ae0eb85b4e1087fc20fd0c9bcf8efb1fdc4f Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Fri, 2 Dec 2022 19:23:45 -0800
Subject: Add Darwin notes for tree-sitter

---
 overlays/emacs.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index a3f92c64946e..ab16a7250416 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -78,6 +78,7 @@ let
             linkCmd = drv:
               if super.stdenv.isDarwin
               then ''cp ${drv}/parser $out/lib/${lib drv}
+                     # FIXME: Is this kosher?
                      /usr/bin/install_name_tool -id $out/lib/${lib drv} $out/lib/${lib drv}
                      /usr/bin/codesign -s - -f $out/lib/${lib drv}
                 ''
@@ -104,7 +105,12 @@ let
             # bundled in emacs to be dynamically loaded.
             TREE_SITTER_LIBS = super.lib.concatStringsSep " " ([ "-ltree-sitter" ] ++ (map linkerFlag plugins));
             # Add to directories that tree-sitter looks in for language definitions / shared object parsers
-            postPatch = old.postPatch + ''
+            # FIXME: This was added for macOS, but it shouldn't be necessary on any platform.
+            # https://git.savannah.gnu.org/cgit/emacs.git/tree/src/treesit.c?h=64044f545add60e045ff16a9891b06f429ac935f#n533
+            # appends a bunch of filenames that appear to be incorrectly skipped over
+            # in https://git.savannah.gnu.org/cgit/emacs.git/tree/src/treesit.c?h=64044f545add60e045ff16a9891b06f429ac935f#n567
+            # on macOS, but are handled properly in Linux.
+            postPatch = old.postPatch + super.lib.optionalString super.stdenv.isDarwin ''
                  substituteInPlace src/treesit.c \
                  --replace "Vtreesit_extra_load_path = Qnil;" \
                            "Vtreesit_extra_load_path = list1 ( build_string ( \"${tree-sitter-grammars}/lib\" ) );"
-- 
cgit 1.4.1


From 64b233cc9cfb1239f3725d0c5953581b43148956 Mon Sep 17 00:00:00 2001
From: Jason Jackson <jasonjckn@users.noreply.github.com>
Date: Fri, 2 Dec 2022 23:06:52 -0800
Subject: add tree sitter languages to rpath (#273)

---
 overlays/emacs.nix | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index ab16a7250416..7731175a8bc7 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -83,7 +83,6 @@ let
                      /usr/bin/codesign -s - -f $out/lib/${lib drv}
                 ''
               else ''ln -s ${drv}/parser $out/lib/${lib drv}'';
-            linkerFlag = drv: "-l" + libName drv;
             plugins = with self.pkgs.tree-sitter-grammars; [
               tree-sitter-bash
               tree-sitter-c
@@ -101,20 +100,14 @@ let
               (super.lib.concatStringsSep "\n" (["mkdir -p $out/lib"] ++ (map linkCmd plugins)));
           in {
             buildInputs = old.buildInputs ++ [ self.pkgs.tree-sitter tree-sitter-grammars ];
-            # before building the `.el` files, we need to allow the `tree-sitter` libraries
-            # bundled in emacs to be dynamically loaded.
-            TREE_SITTER_LIBS = super.lib.concatStringsSep " " ([ "-ltree-sitter" ] ++ (map linkerFlag plugins));
-            # Add to directories that tree-sitter looks in for language definitions / shared object parsers
-            # FIXME: This was added for macOS, but it shouldn't be necessary on any platform.
-            # https://git.savannah.gnu.org/cgit/emacs.git/tree/src/treesit.c?h=64044f545add60e045ff16a9891b06f429ac935f#n533
-            # appends a bunch of filenames that appear to be incorrectly skipped over
-            # in https://git.savannah.gnu.org/cgit/emacs.git/tree/src/treesit.c?h=64044f545add60e045ff16a9891b06f429ac935f#n567
-            # on macOS, but are handled properly in Linux.
-            postPatch = old.postPatch + super.lib.optionalString super.stdenv.isDarwin ''
-                 substituteInPlace src/treesit.c \
-                 --replace "Vtreesit_extra_load_path = Qnil;" \
-                           "Vtreesit_extra_load_path = list1 ( build_string ( \"${tree-sitter-grammars}/lib\" ) );"
-            '';
+            TREE_SITTER_LIBS = "-ltree-sitter";
+            # Add to list of directories dlopen/dynlib_open searches for tree sitter languages *.so/*.dylib.
+            postFixup = old.postFixup + super.lib.optionalString self.stdenv.isDarwin ''
+                /usr/bin/install_name_tool -add_rpath ${super.lib.makeLibraryPath [ tree-sitter-grammars ]} $out/bin/emacs
+                /usr/bin/codesign -s - -f $out/bin/emacs
+              '' + super.lib.optionalString self.stdenv.isLinux ''
+                ${self.pkgs.patchelf}/bin/patchelf --add-rpath ${super.lib.makeLibraryPath [ tree-sitter-grammars ]} $out/bin/emacs
+              '';
           }
         )
       )));
-- 
cgit 1.4.1


From 336402eba8c78f6f36fa995549add0b834be994c Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Thu, 1 Dec 2022 13:46:42 -0800
Subject: Remove unnecessary substituteInPlace

It's now taken care of in nixpkgs.
---
 overlays/emacs.nix | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 7731175a8bc7..16ea55dbd7d2 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -31,27 +31,7 @@ let
                 substituteInPlace lisp/loadup.el \
                 --replace '(emacs-repository-get-version)' '"${repoMeta.rev}"' \
                 --replace '(emacs-repository-get-branch)' '"master"'
-              '' +
-              # XXX: remove when https://github.com/NixOS/nixpkgs/pull/193621 is merged
-                (super.lib.optionalString (old ? NATIVE_FULL_AOT)
-                    (let backendPath = (super.lib.concatStringsSep " "
-                      (builtins.map (x: ''\"-B${x}\"'') [
-                        # Paths necessary so the JIT compiler finds its libraries:
-                        "${super.lib.getLib self.libgccjit}/lib"
-                        "${super.lib.getLib self.libgccjit}/lib/gcc"
-                        "${super.lib.getLib self.stdenv.cc.libc}/lib"
-
-                        # Executable paths necessary for compilation (ld, as):
-                        "${super.lib.getBin self.stdenv.cc.cc}/bin"
-                        "${super.lib.getBin self.stdenv.cc.bintools}/bin"
-                        "${super.lib.getBin self.stdenv.cc.bintools.bintools}/bin"
-                      ]));
-                     in ''
-                        substituteInPlace lisp/emacs-lisp/comp.el --replace \
-                            "(defcustom comp-libgccjit-reproducer nil" \
-                            "(setq native-comp-driver-options '(${backendPath}))
-(defcustom comp-libgccjit-reproducer nil"
-                    ''));
+              '';
             }
           )
         )
-- 
cgit 1.4.1


From c9fb613635a8420cac9419ead7d0cd69126c4d26 Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Sat, 3 Dec 2022 10:56:06 -0800
Subject: Don't wipe patches

---
 overlays/emacs.nix | 2 --
 1 file changed, 2 deletions(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 16ea55dbd7d2..2339061411c3 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -25,8 +25,6 @@ let
               inherit (repoMeta) version;
               src = fetcher (builtins.removeAttrs repoMeta [ "type" "version" ]);
 
-              patches = [ ];
-
               postPatch = old.postPatch + ''
                 substituteInPlace lisp/loadup.el \
                 --replace '(emacs-repository-get-version)' '"${repoMeta.rev}"' \
-- 
cgit 1.4.1


From 543a3b394f6822ea5d52666ca063c85bec2d1ca0 Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Sat, 3 Dec 2022 10:57:45 -0800
Subject: Revert "Don't wipe patches"

This reverts commit c9fb613635a8420cac9419ead7d0cd69126c4d26.
---
 overlays/emacs.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 2339061411c3..16ea55dbd7d2 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -25,6 +25,8 @@ let
               inherit (repoMeta) version;
               src = fetcher (builtins.removeAttrs repoMeta [ "type" "version" ]);
 
+              patches = [ ];
+
               postPatch = old.postPatch + ''
                 substituteInPlace lisp/loadup.el \
                 --replace '(emacs-repository-get-version)' '"${repoMeta.rev}"' \
-- 
cgit 1.4.1


From 2ce014a48bf6845b9bbeca6eabbff9ba5783c30d Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Sat, 3 Dec 2022 10:57:51 -0800
Subject: Revert "Remove unnecessary substituteInPlace"

This reverts commit 336402eba8c78f6f36fa995549add0b834be994c.
---
 overlays/emacs.nix | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 16ea55dbd7d2..7731175a8bc7 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -31,7 +31,27 @@ let
                 substituteInPlace lisp/loadup.el \
                 --replace '(emacs-repository-get-version)' '"${repoMeta.rev}"' \
                 --replace '(emacs-repository-get-branch)' '"master"'
-              '';
+              '' +
+              # XXX: remove when https://github.com/NixOS/nixpkgs/pull/193621 is merged
+                (super.lib.optionalString (old ? NATIVE_FULL_AOT)
+                    (let backendPath = (super.lib.concatStringsSep " "
+                      (builtins.map (x: ''\"-B${x}\"'') [
+                        # Paths necessary so the JIT compiler finds its libraries:
+                        "${super.lib.getLib self.libgccjit}/lib"
+                        "${super.lib.getLib self.libgccjit}/lib/gcc"
+                        "${super.lib.getLib self.stdenv.cc.libc}/lib"
+
+                        # Executable paths necessary for compilation (ld, as):
+                        "${super.lib.getBin self.stdenv.cc.cc}/bin"
+                        "${super.lib.getBin self.stdenv.cc.bintools}/bin"
+                        "${super.lib.getBin self.stdenv.cc.bintools.bintools}/bin"
+                      ]));
+                     in ''
+                        substituteInPlace lisp/emacs-lisp/comp.el --replace \
+                            "(defcustom comp-libgccjit-reproducer nil" \
+                            "(setq native-comp-driver-options '(${backendPath}))
+(defcustom comp-libgccjit-reproducer nil"
+                    ''));
             }
           )
         )
-- 
cgit 1.4.1


From 1e4763dd90ad8712b459d1f5e53cbbc047b75dd0 Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Sun, 4 Dec 2022 12:37:26 -0800
Subject: Revert "add tree sitter languages to rpath (#273)"

This reverts commit 64b233cc9cfb1239f3725d0c5953581b43148956.
---
 overlays/emacs.nix | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 7731175a8bc7..ab16a7250416 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -83,6 +83,7 @@ let
                      /usr/bin/codesign -s - -f $out/lib/${lib drv}
                 ''
               else ''ln -s ${drv}/parser $out/lib/${lib drv}'';
+            linkerFlag = drv: "-l" + libName drv;
             plugins = with self.pkgs.tree-sitter-grammars; [
               tree-sitter-bash
               tree-sitter-c
@@ -100,14 +101,20 @@ let
               (super.lib.concatStringsSep "\n" (["mkdir -p $out/lib"] ++ (map linkCmd plugins)));
           in {
             buildInputs = old.buildInputs ++ [ self.pkgs.tree-sitter tree-sitter-grammars ];
-            TREE_SITTER_LIBS = "-ltree-sitter";
-            # Add to list of directories dlopen/dynlib_open searches for tree sitter languages *.so/*.dylib.
-            postFixup = old.postFixup + super.lib.optionalString self.stdenv.isDarwin ''
-                /usr/bin/install_name_tool -add_rpath ${super.lib.makeLibraryPath [ tree-sitter-grammars ]} $out/bin/emacs
-                /usr/bin/codesign -s - -f $out/bin/emacs
-              '' + super.lib.optionalString self.stdenv.isLinux ''
-                ${self.pkgs.patchelf}/bin/patchelf --add-rpath ${super.lib.makeLibraryPath [ tree-sitter-grammars ]} $out/bin/emacs
-              '';
+            # before building the `.el` files, we need to allow the `tree-sitter` libraries
+            # bundled in emacs to be dynamically loaded.
+            TREE_SITTER_LIBS = super.lib.concatStringsSep " " ([ "-ltree-sitter" ] ++ (map linkerFlag plugins));
+            # Add to directories that tree-sitter looks in for language definitions / shared object parsers
+            # FIXME: This was added for macOS, but it shouldn't be necessary on any platform.
+            # https://git.savannah.gnu.org/cgit/emacs.git/tree/src/treesit.c?h=64044f545add60e045ff16a9891b06f429ac935f#n533
+            # appends a bunch of filenames that appear to be incorrectly skipped over
+            # in https://git.savannah.gnu.org/cgit/emacs.git/tree/src/treesit.c?h=64044f545add60e045ff16a9891b06f429ac935f#n567
+            # on macOS, but are handled properly in Linux.
+            postPatch = old.postPatch + super.lib.optionalString super.stdenv.isDarwin ''
+                 substituteInPlace src/treesit.c \
+                 --replace "Vtreesit_extra_load_path = Qnil;" \
+                           "Vtreesit_extra_load_path = list1 ( build_string ( \"${tree-sitter-grammars}/lib\" ) );"
+            '';
           }
         )
       )));
-- 
cgit 1.4.1


From b57c104d0b4bcea51426271b32f18776d7667a72 Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Tue, 6 Dec 2022 17:12:24 -0800
Subject: Revert "Revert "add tree sitter languages to rpath (#273)""

This reverts commit 1e4763dd90ad8712b459d1f5e53cbbc047b75dd0.
---
 overlays/emacs.nix | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index ab16a7250416..7731175a8bc7 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -83,7 +83,6 @@ let
                      /usr/bin/codesign -s - -f $out/lib/${lib drv}
                 ''
               else ''ln -s ${drv}/parser $out/lib/${lib drv}'';
-            linkerFlag = drv: "-l" + libName drv;
             plugins = with self.pkgs.tree-sitter-grammars; [
               tree-sitter-bash
               tree-sitter-c
@@ -101,20 +100,14 @@ let
               (super.lib.concatStringsSep "\n" (["mkdir -p $out/lib"] ++ (map linkCmd plugins)));
           in {
             buildInputs = old.buildInputs ++ [ self.pkgs.tree-sitter tree-sitter-grammars ];
-            # before building the `.el` files, we need to allow the `tree-sitter` libraries
-            # bundled in emacs to be dynamically loaded.
-            TREE_SITTER_LIBS = super.lib.concatStringsSep " " ([ "-ltree-sitter" ] ++ (map linkerFlag plugins));
-            # Add to directories that tree-sitter looks in for language definitions / shared object parsers
-            # FIXME: This was added for macOS, but it shouldn't be necessary on any platform.
-            # https://git.savannah.gnu.org/cgit/emacs.git/tree/src/treesit.c?h=64044f545add60e045ff16a9891b06f429ac935f#n533
-            # appends a bunch of filenames that appear to be incorrectly skipped over
-            # in https://git.savannah.gnu.org/cgit/emacs.git/tree/src/treesit.c?h=64044f545add60e045ff16a9891b06f429ac935f#n567
-            # on macOS, but are handled properly in Linux.
-            postPatch = old.postPatch + super.lib.optionalString super.stdenv.isDarwin ''
-                 substituteInPlace src/treesit.c \
-                 --replace "Vtreesit_extra_load_path = Qnil;" \
-                           "Vtreesit_extra_load_path = list1 ( build_string ( \"${tree-sitter-grammars}/lib\" ) );"
-            '';
+            TREE_SITTER_LIBS = "-ltree-sitter";
+            # Add to list of directories dlopen/dynlib_open searches for tree sitter languages *.so/*.dylib.
+            postFixup = old.postFixup + super.lib.optionalString self.stdenv.isDarwin ''
+                /usr/bin/install_name_tool -add_rpath ${super.lib.makeLibraryPath [ tree-sitter-grammars ]} $out/bin/emacs
+                /usr/bin/codesign -s - -f $out/bin/emacs
+              '' + super.lib.optionalString self.stdenv.isLinux ''
+                ${self.pkgs.patchelf}/bin/patchelf --add-rpath ${super.lib.makeLibraryPath [ tree-sitter-grammars ]} $out/bin/emacs
+              '';
           }
         )
       )));
-- 
cgit 1.4.1


From 7279dc6f75d0983a552eeacef992246c53473aea Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Thu, 8 Dec 2022 19:28:31 -0800
Subject: Add tree-sitter-dockerfile

---
 overlays/emacs.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 7731175a8bc7..02e41715650b 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -89,6 +89,7 @@ let
               tree-sitter-c-sharp
               tree-sitter-cpp
               tree-sitter-css
+              tree-sitter-dockerfile
               tree-sitter-java
               tree-sitter-python
               tree-sitter-javascript
-- 
cgit 1.4.1


From 6fad8d32db4b3225e72ec8ca4bfc0de249f9c1be Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Sun, 11 Dec 2022 16:49:21 -0800
Subject: Add tree-sitter-cmake

---
 overlays/emacs.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 02e41715650b..65273f407e4f 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -87,6 +87,7 @@ let
               tree-sitter-bash
               tree-sitter-c
               tree-sitter-c-sharp
+              tree-sitter-cmake
               tree-sitter-cpp
               tree-sitter-css
               tree-sitter-dockerfile
-- 
cgit 1.4.1


From 766e5a23610edee0666b4a1a570543167e127d68 Mon Sep 17 00:00:00 2001
From: Fredrik Bergroth <fbergroth@gmail.com>
Date: Wed, 14 Dec 2022 08:09:27 +0100
Subject: Use withPgtk = true in emacsPgtk

---
 overlays/emacs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 65273f407e4f..ef4967b3a9a0 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -124,7 +124,7 @@ let
 
   emacsGit = mkGitEmacs "emacs-git" ../repos/emacs/emacs-master.json { withSQLite3 = true; withWebP = true; };
 
-  emacsPgtk = mkPgtkEmacs "emacs-pgtk" ../repos/emacs/emacs-master.json { withSQLite3 = true; withWebP = true; withGTK3 = true; };
+  emacsPgtk = mkPgtkEmacs "emacs-pgtk" ../repos/emacs/emacs-master.json { withSQLite3 = true; withWebP = true; withPgtk = true; };
 
   emacsUnstable = (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json { noTreeSitter = true; });
 
-- 
cgit 1.4.1


From ea098ae4c4e43ae76f2c5a39ab614749fe28e99f Mon Sep 17 00:00:00 2001
From: Fredrik Bergroth <fbergroth@gmail.com>
Date: Wed, 14 Dec 2022 09:45:27 +0100
Subject: Drop mkPgtkEmacs function

---
 overlays/emacs.nix | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index ef4967b3a9a0..bd7625883688 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -114,17 +114,9 @@ let
         )
       )));
 
-
-  mkPgtkEmacs = namePrefix: jsonFile: { ... }@args: (mkGitEmacs namePrefix jsonFile args).overrideAttrs (
-    old: {
-      configureFlags = (super.lib.remove "--with-xft" old.configureFlags)
-        ++ super.lib.singleton "--with-pgtk";
-    }
-  );
-
   emacsGit = mkGitEmacs "emacs-git" ../repos/emacs/emacs-master.json { withSQLite3 = true; withWebP = true; };
 
-  emacsPgtk = mkPgtkEmacs "emacs-pgtk" ../repos/emacs/emacs-master.json { withSQLite3 = true; withWebP = true; withPgtk = true; };
+  emacsPgtk = mkGitEmacs "emacs-pgtk" ../repos/emacs/emacs-master.json { withSQLite3 = true; withWebP = true; withPgtk = true; };
 
   emacsUnstable = (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json { noTreeSitter = true; });
 
-- 
cgit 1.4.1


From b0c95db59fef979eb72a29f5ad7e9f3c866c8ffd Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Fri, 16 Dec 2022 14:47:37 -0800
Subject: Add more tree-sitter grammars

---
 overlays/emacs.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 65273f407e4f..3db8f027921a 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -91,12 +91,16 @@ let
               tree-sitter-cpp
               tree-sitter-css
               tree-sitter-dockerfile
+              tree-sitter-go
+              tree-sitter-gomod
               tree-sitter-java
               tree-sitter-python
               tree-sitter-javascript
               tree-sitter-json
+              tree-sitter-toml
               tree-sitter-tsx
               tree-sitter-typescript
+              tree-sitter-yaml
             ];
             tree-sitter-grammars = super.runCommand "tree-sitter-grammars" {}
               (super.lib.concatStringsSep "\n" (["mkdir -p $out/lib"] ++ (map linkCmd plugins)));
-- 
cgit 1.4.1


From e38a4d0ac4cfb473da82859b4494aea1f993517c Mon Sep 17 00:00:00 2001
From: Jason Jackson <jasonjckn@gmail.com>
Date: Sat, 17 Dec 2022 12:11:39 -0800
Subject: fixes segfaults that only occur on aarch64-linux (issue #264)

---
 overlays/emacs.nix | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 3db8f027921a..4c4b12f360de 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -27,6 +27,11 @@ let
 
               patches = [ ];
 
+              # fixes segfaults that only occur on aarch64-linux (issue#264)
+              configureFlags = old.configureFlags ++
+                               super.lib.optionals (super.stdenv.isLinux && super.stdenv.isAarch64)
+                                 [ "--enable-check-lisp-object-type" ];
+
               postPatch = old.postPatch + ''
                 substituteInPlace lisp/loadup.el \
                 --replace '(emacs-repository-get-version)' '"${repoMeta.rev}"' \
-- 
cgit 1.4.1


From 355e3328075735ea93d5dd1d29884d251e45529e Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Sat, 17 Dec 2022 22:54:44 -0800
Subject: Add tree-sitter-rust

---
 overlays/emacs.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 3db8f027921a..c376bff2eec6 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -97,6 +97,7 @@ let
               tree-sitter-python
               tree-sitter-javascript
               tree-sitter-json
+              tree-sitter-rust
               tree-sitter-toml
               tree-sitter-tsx
               tree-sitter-typescript
-- 
cgit 1.4.1


From 7535e2c08b91b471e10c09e5c5d6658f815df83c Mon Sep 17 00:00:00 2001
From: "Ross A. Baker" <ross@rossabaker.com>
Date: Thu, 22 Dec 2022 01:03:59 -0500
Subject: Build emacsGit without Xcode

---
 overlays/emacs.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 60d41957ee7c..9bf46eff2e2e 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -82,9 +82,10 @@ let
             lib = drv: ''lib${libName drv}.${libSuffix}'';
             linkCmd = drv:
               if super.stdenv.isDarwin
-              then ''cp ${drv}/parser $out/lib/${lib drv}
-                     # FIXME: Is this kosher?
-                     /usr/bin/install_name_tool -id $out/lib/${lib drv} $out/lib/${lib drv}
+              then ''cp ${drv}/parser .
+                     chmod +w ./parser
+                     install_name_tool -id $out/lib/${lib drv} ./parser
+                     cp ./parser $out/lib/${lib drv}
                      /usr/bin/codesign -s - -f $out/lib/${lib drv}
                 ''
               else ''ln -s ${drv}/parser $out/lib/${lib drv}'';
@@ -108,14 +109,14 @@ let
               tree-sitter-typescript
               tree-sitter-yaml
             ];
-            tree-sitter-grammars = super.runCommand "tree-sitter-grammars" {}
+            tree-sitter-grammars = super.runCommandCC "tree-sitter-grammars" {}
               (super.lib.concatStringsSep "\n" (["mkdir -p $out/lib"] ++ (map linkCmd plugins)));
           in {
             buildInputs = old.buildInputs ++ [ self.pkgs.tree-sitter tree-sitter-grammars ];
             TREE_SITTER_LIBS = "-ltree-sitter";
             # Add to list of directories dlopen/dynlib_open searches for tree sitter languages *.so/*.dylib.
             postFixup = old.postFixup + super.lib.optionalString self.stdenv.isDarwin ''
-                /usr/bin/install_name_tool -add_rpath ${super.lib.makeLibraryPath [ tree-sitter-grammars ]} $out/bin/emacs
+                install_name_tool -add_rpath ${super.lib.makeLibraryPath [ tree-sitter-grammars ]} $out/bin/emacs
                 /usr/bin/codesign -s - -f $out/bin/emacs
               '' + super.lib.optionalString self.stdenv.isLinux ''
                 ${self.pkgs.patchelf}/bin/patchelf --add-rpath ${super.lib.makeLibraryPath [ tree-sitter-grammars ]} $out/bin/emacs
-- 
cgit 1.4.1


From e465178187fd62eaed9c7637e7315e0800e02209 Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Sun, 1 Jan 2023 17:48:20 -0800
Subject: Add tree-sitter-ruby

---
 overlays/emacs.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 9bf46eff2e2e..03cdef23611b 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -103,6 +103,7 @@ let
               tree-sitter-python
               tree-sitter-javascript
               tree-sitter-json
+              tree-sitter-ruby
               tree-sitter-rust
               tree-sitter-toml
               tree-sitter-tsx
-- 
cgit 1.4.1


From b281ef3306bd37ac1c8ed7e83fcb241f6757a61c Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Sun, 1 Jan 2023 17:57:19 -0800
Subject: Alphabetize tree-sitter grammars

---
 overlays/emacs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 03cdef23611b..00ec16624109 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -100,9 +100,9 @@ let
               tree-sitter-go
               tree-sitter-gomod
               tree-sitter-java
-              tree-sitter-python
               tree-sitter-javascript
               tree-sitter-json
+              tree-sitter-python
               tree-sitter-ruby
               tree-sitter-rust
               tree-sitter-toml
-- 
cgit 1.4.1


From 2430837315cfb9d2d0cbc7002ee9a1e8e9b63417 Mon Sep 17 00:00:00 2001
From: Andreas Fuchs <asf@boinkor.net>
Date: Sun, 1 Jan 2023 19:52:38 -0500
Subject: Use build flags to add tree-sitter-grammars to RPATH on Darwin

It seems that on Darwin, adding the second rpath entry after build
doesn't cause dlopen to search in that rpath entry: It might be
because the code signature block is in the way. At any rate, this way
works on Darwin.
---
 overlays/emacs.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 9bf46eff2e2e..2e3a12d3cf5c 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -113,12 +113,11 @@ let
               (super.lib.concatStringsSep "\n" (["mkdir -p $out/lib"] ++ (map linkCmd plugins)));
           in {
             buildInputs = old.buildInputs ++ [ self.pkgs.tree-sitter tree-sitter-grammars ];
+            buildFlags = super.lib.optionalString self.stdenv.isDarwin
+              "LDFLAGS=-Wl,-rpath,${super.lib.makeLibraryPath [tree-sitter-grammars]}";
             TREE_SITTER_LIBS = "-ltree-sitter";
-            # Add to list of directories dlopen/dynlib_open searches for tree sitter languages *.so/*.dylib.
-            postFixup = old.postFixup + super.lib.optionalString self.stdenv.isDarwin ''
-                install_name_tool -add_rpath ${super.lib.makeLibraryPath [ tree-sitter-grammars ]} $out/bin/emacs
-                /usr/bin/codesign -s - -f $out/bin/emacs
-              '' + super.lib.optionalString self.stdenv.isLinux ''
+            # Add to list of directories dlopen/dynlib_open searches for tree sitter languages *.so
+            postFixup = old.postFixup + super.lib.optionalString self.stdenv.isLinux ''
                 ${self.pkgs.patchelf}/bin/patchelf --add-rpath ${super.lib.makeLibraryPath [ tree-sitter-grammars ]} $out/bin/emacs
               '';
           }
-- 
cgit 1.4.1


From 699dd6e9999e3977490eb75490f1fa155fa5c319 Mon Sep 17 00:00:00 2001
From: Archit Gupta <archit@accelbread.com>
Date: Thu, 12 Jan 2023 22:32:45 -0800
Subject: Remove special casing for nongnuPackages

---
 overlays/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'overlays')

diff --git a/overlays/package.nix b/overlays/package.nix
index f85fd8f14053..0a07cf99a239 100644
--- a/overlays/package.nix
+++ b/overlays/package.nix
@@ -42,17 +42,17 @@ in
             generated = ../repos/elpa/elpa-generated.nix;
           };
 
+          nongnuPackages = esuper.nongnuPackages.override {
+            generated = ../repos/nongnu/nongnu-generated.nix;
+          };
+
           epkgs = esuper.override {
-            inherit melpaStablePackages melpaPackages elpaPackages;
+            inherit melpaStablePackages melpaPackages elpaPackages
+              nongnuPackages;
           };
 
         in
-        epkgs
-        // super.lib.optionalAttrs (super.lib.hasAttr "nongnuPackages" esuper) {
-          nongnuPackages = esuper.nongnuPackages.override {
-            generated = ../repos/nongnu/nongnu-generated.nix;
-          };
-        } // {
+        epkgs // {
           xelb = mkExDrv eself "xelb" {
             packageRequires = [ eself.cl-generic eself.emacs ];
           };
-- 
cgit 1.4.1


From 5bd6b435915e95101a2400fa552e4f6f282e74b6 Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Fri, 20 Jan 2023 19:03:32 -0800
Subject: Add tree-sitter-html

---
 overlays/emacs.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 180bd7a4bee1..06814f5d7a25 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -99,6 +99,7 @@ let
               tree-sitter-dockerfile
               tree-sitter-go
               tree-sitter-gomod
+              tree-sitter-html
               tree-sitter-java
               tree-sitter-javascript
               tree-sitter-json
-- 
cgit 1.4.1


From 215394062b3fc38d131fdf78725c1704e110ae19 Mon Sep 17 00:00:00 2001
From: Cullan Springstead <cullan@springstead.me>
Date: Sun, 5 Feb 2023 10:14:45 -0600
Subject: allow tree-sitter grammars to be overridden

---
 overlays/emacs.nix | 53 +++++++++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 06814f5d7a25..36a6335025b8 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -16,7 +16,7 @@ let
       super.emacs
       ([
 
-        (drv: drv.override ({ srcRepo = true; } // builtins.removeAttrs args [ "noTreeSitter" ]))
+        (drv: drv.override ({ srcRepo = true; } // builtins.removeAttrs args [ "noTreeSitter" "treeSitterPlugins" ]))
 
         (
           drv: drv.overrideAttrs (
@@ -89,28 +89,7 @@ let
                      /usr/bin/codesign -s - -f $out/lib/${lib drv}
                 ''
               else ''ln -s ${drv}/parser $out/lib/${lib drv}'';
-            plugins = with self.pkgs.tree-sitter-grammars; [
-              tree-sitter-bash
-              tree-sitter-c
-              tree-sitter-c-sharp
-              tree-sitter-cmake
-              tree-sitter-cpp
-              tree-sitter-css
-              tree-sitter-dockerfile
-              tree-sitter-go
-              tree-sitter-gomod
-              tree-sitter-html
-              tree-sitter-java
-              tree-sitter-javascript
-              tree-sitter-json
-              tree-sitter-python
-              tree-sitter-ruby
-              tree-sitter-rust
-              tree-sitter-toml
-              tree-sitter-tsx
-              tree-sitter-typescript
-              tree-sitter-yaml
-            ];
+            plugins = args.treeSitterPlugins;
             tree-sitter-grammars = super.runCommandCC "tree-sitter-grammars" {}
               (super.lib.concatStringsSep "\n" (["mkdir -p $out/lib"] ++ (map linkCmd plugins)));
           in {
@@ -126,9 +105,31 @@ let
         )
       )));
 
-  emacsGit = mkGitEmacs "emacs-git" ../repos/emacs/emacs-master.json { withSQLite3 = true; withWebP = true; };
-
-  emacsPgtk = mkGitEmacs "emacs-pgtk" ../repos/emacs/emacs-master.json { withSQLite3 = true; withWebP = true; withPgtk = true; };
+  defaultTreeSitterPlugins = with self.pkgs.tree-sitter-grammars; [
+    tree-sitter-bash
+    tree-sitter-c
+    tree-sitter-c-sharp
+    tree-sitter-cmake
+    tree-sitter-cpp
+    tree-sitter-css
+    tree-sitter-dockerfile
+    tree-sitter-go
+    tree-sitter-gomod
+    tree-sitter-java
+    tree-sitter-javascript
+    tree-sitter-json
+    tree-sitter-python
+    tree-sitter-ruby
+    tree-sitter-rust
+    tree-sitter-toml
+    tree-sitter-tsx
+    tree-sitter-typescript
+    tree-sitter-yaml
+  ];
+
+  emacsGit = super.lib.makeOverridable (mkGitEmacs "emacs-git" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; treeSitterPlugins = defaultTreeSitterPlugins; };
+
+  emacsPgtk = super.lib.makeOverridable (mkGitEmacs "emacs-pgtk" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; withPgtk = true; treeSitterPlugins = defaultTreeSitterPlugins; };
 
   emacsUnstable = (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json { noTreeSitter = true; });
 
-- 
cgit 1.4.1


From b6f629b2ed81e67855334a42323e39eee45eb19e Mon Sep 17 00:00:00 2001
From: "Ross A. Baker" <ross@rossabaker.com>
Date: Mon, 6 Mar 2023 09:59:05 -0500
Subject: Codesign with pkgs.darwin.sigtool

---
 overlays/emacs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 36a6335025b8..3f30bd2e1452 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -86,7 +86,7 @@ let
                      chmod +w ./parser
                      install_name_tool -id $out/lib/${lib drv} ./parser
                      cp ./parser $out/lib/${lib drv}
-                     /usr/bin/codesign -s - -f $out/lib/${lib drv}
+                     ${self.pkgs.darwin.sigtool}/bin/codesign -s - -f $out/lib/${lib drv}
                 ''
               else ''ln -s ${drv}/parser $out/lib/${lib drv}'';
             plugins = args.treeSitterPlugins;
-- 
cgit 1.4.1


From 80a8537cea678fe7f9e8e6c8ece67c1aec7bd65a Mon Sep 17 00:00:00 2001
From: Yuu Yin <yuu@anche.no>
Date: Wed, 15 Mar 2023 12:03:29 +0000
Subject: add tree-sitter-html

html-ts-mode is built-in in GNU Emacs. Thus, add html grammar.
---
 overlays/emacs.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 3f30bd2e1452..675795de909d 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -115,6 +115,7 @@ let
     tree-sitter-dockerfile
     tree-sitter-go
     tree-sitter-gomod
+    tree-sitter-html
     tree-sitter-java
     tree-sitter-javascript
     tree-sitter-json
-- 
cgit 1.4.1


From e28c8932e5023d19dfb4ce260c88b9557f40e89b Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Mon, 10 Apr 2023 13:20:55 -0700
Subject: Enable Emacs 29 features for emacsUnstable

---
 overlays/emacs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 675795de909d..76e2dc6a4c0c 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -132,7 +132,7 @@ let
 
   emacsPgtk = super.lib.makeOverridable (mkGitEmacs "emacs-pgtk" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; withPgtk = true; treeSitterPlugins = defaultTreeSitterPlugins; };
 
-  emacsUnstable = (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json { noTreeSitter = true; });
+  emacsUnstable = super.lib.makeOverridable (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = true; treeSitterPlugins = defaultTreeSitterPlugins; };
 
   emacsLsp = (mkGitEmacs "emacs-lsp" ../repos/emacs/emacs-lsp.json { noTreeSitter = true; });
 
-- 
cgit 1.4.1


From c1f6d037d039fb3b5ff4a8a62342d8ac5238b504 Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Mon, 10 Apr 2023 13:49:27 -0700
Subject: Update comment

---
 overlays/emacs.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 76e2dc6a4c0c..2929ac9233ac 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -37,7 +37,11 @@ let
                 --replace '(emacs-repository-get-version)' '"${repoMeta.rev}"' \
                 --replace '(emacs-repository-get-branch)' '"master"'
               '' +
-              # XXX: remove when https://github.com/NixOS/nixpkgs/pull/193621 is merged
+              # XXX: Remove when emacsLsp updates to use Emacs 29.  We
+              # already have logic in upstream Nixpkgs to use a
+              # different patch for earlier major versions of Emacs,
+              # but the major version for emacsLsp follows the format
+              # of version YYYYMMDD, as opposed to version (say) 29
                 (super.lib.optionalString (old ? NATIVE_FULL_AOT)
                     (let backendPath = (super.lib.concatStringsSep " "
                       (builtins.map (x: ''\"-B${x}\"'') [
-- 
cgit 1.4.1


From f73f92e01b6477dd56a628e251d265ee999f1afe Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Mon, 10 Apr 2023 15:14:30 -0700
Subject: Fix issue link for bug-reference-prog-mode

---
 overlays/emacs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 2929ac9233ac..0f3f0a02cfa6 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -27,7 +27,7 @@ let
 
               patches = [ ];
 
-              # fixes segfaults that only occur on aarch64-linux (issue#264)
+              # fixes segfaults that only occur on aarch64-linux (#264)
               configureFlags = old.configureFlags ++
                                super.lib.optionals (super.stdenv.isLinux && super.stdenv.isAarch64)
                                  [ "--enable-check-lisp-object-type" ];
-- 
cgit 1.4.1


From 644ae3ce05ae9d42232bba9642d4eaa63bb062d3 Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Mon, 10 Apr 2023 15:18:46 -0700
Subject: Fix comment

---
 overlays/emacs.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 0f3f0a02cfa6..fbbd32aef619 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -37,11 +37,17 @@ let
                 --replace '(emacs-repository-get-version)' '"${repoMeta.rev}"' \
                 --replace '(emacs-repository-get-branch)' '"master"'
               '' +
-              # XXX: Remove when emacsLsp updates to use Emacs 29.  We
-              # already have logic in upstream Nixpkgs to use a
-              # different patch for earlier major versions of Emacs,
+              # XXX: Maybe remove when emacsLsp updates to use Emacs
+              # 29.  We already have logic in upstream Nixpkgs to use
+              # a different patch for earlier major versions of Emacs,
               # but the major version for emacsLsp follows the format
-              # of version YYYYMMDD, as opposed to version (say) 29
+              # of version YYYYMMDD, as opposed to version (say) 29.
+              # Removing this here would also require that we don't
+              # overwrite the patches attribute in the overlay to an
+              # empty list since we would then expect the Nixpkgs
+              # patch to be used. Not sure if it's better to rely on
+              # upstream Nixpkgs since it's cumbersome to wait for
+              # things to get merged into master.
                 (super.lib.optionalString (old ? NATIVE_FULL_AOT)
                     (let backendPath = (super.lib.concatStringsSep " "
                       (builtins.map (x: ''\"-B${x}\"'') [
-- 
cgit 1.4.1


From b1b45ec1178f862c3b5d69b50821f0c5c11d582c Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Wed, 12 Apr 2023 14:45:32 -0700
Subject: Add emacsUnstablePgtk

Now that emacsUnstable is Emacs 29.0.90, we can add the pgtk variant.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 overlays/emacs.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index fbbd32aef619..89a59729b819 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -144,13 +144,15 @@ let
 
   emacsUnstable = super.lib.makeOverridable (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = true; treeSitterPlugins = defaultTreeSitterPlugins; };
 
+  emacsUnstablePgtk = super.lib.makeOverridable (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = true; withPgtk = true; treeSitterPlugins = defaultTreeSitterPlugins; };
+
   emacsLsp = (mkGitEmacs "emacs-lsp" ../repos/emacs/emacs-lsp.json { noTreeSitter = true; });
 
 in
 {
   inherit emacsGit emacsUnstable;
 
-  inherit emacsPgtk;
+  inherit emacsPgtk emacsUnstablePgtk;
 
   emacsGit-nox = (
     (
-- 
cgit 1.4.1


From 87d3eb48b7cdc4fa82b7bdc2b1e7964c82518c61 Mon Sep 17 00:00:00 2001
From: Marius Claian <unkn2000@gmail.com>
Date: Sat, 15 Apr 2023 13:06:31 +0300
Subject: Path fixes resulting from libgccjit changes

https://github.com/NixOS/nixpkgs/commit/6c209e862e18d6a9d103a80d5fa2443f4e47163e
---
 overlays/emacs.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 89a59729b819..e7addc80c354 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -50,17 +50,20 @@ let
               # things to get merged into master.
                 (super.lib.optionalString (old ? NATIVE_FULL_AOT)
                     (let backendPath = (super.lib.concatStringsSep " "
-                      (builtins.map (x: ''\"-B${x}\"'') [
+                      (builtins.map (x: ''\"-B${x}\"'') ([
                         # Paths necessary so the JIT compiler finds its libraries:
                         "${super.lib.getLib self.libgccjit}/lib"
                         "${super.lib.getLib self.libgccjit}/lib/gcc"
                         "${super.lib.getLib self.stdenv.cc.libc}/lib"
+		      ] ++ super.lib.optionals (self.stdenv.cc?cc.libgcc) [
+			"${super.lib.getLib self.stdenv.cc.cc.libgcc}/lib"
+		      ] ++ [
 
                         # Executable paths necessary for compilation (ld, as):
                         "${super.lib.getBin self.stdenv.cc.cc}/bin"
                         "${super.lib.getBin self.stdenv.cc.bintools}/bin"
                         "${super.lib.getBin self.stdenv.cc.bintools.bintools}/bin"
-                      ]));
+                      ])));
                      in ''
                         substituteInPlace lisp/emacs-lisp/comp.el --replace \
                             "(defcustom comp-libgccjit-reproducer nil" \
-- 
cgit 1.4.1


From 9a691c7088459182b7dd37b7acdb21f805c81a7e Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Thu, 25 May 2023 04:57:53 -0700
Subject: Work around #318

---
 overlays/bytecomp-revert.patch | 30 ++++++++++++++++++++++++++++++
 overlays/emacs.nix             | 16 ++++++++++++++--
 2 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 overlays/bytecomp-revert.patch

(limited to 'overlays')

diff --git a/overlays/bytecomp-revert.patch b/overlays/bytecomp-revert.patch
new file mode 100644
index 000000000000..eee74107a80d
--- /dev/null
+++ b/overlays/bytecomp-revert.patch
@@ -0,0 +1,30 @@
+diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
+index ac040799a22..42b733b0830 100644
+--- a/lisp/emacs-lisp/bytecomp.el
++++ b/lisp/emacs-lisp/bytecomp.el
+@@ -3521,8 +3521,6 @@ byte-compile-form
+               (setq form (cons 'progn (cdr form)))
+               (setq handler #'byte-compile-progn))
+              ((and (or sef (function-get (car form) 'important-return-value))
+-                   ;; Don't warn for arguments to `ignore'.
+-                   (not (eq byte-compile--for-effect 'for-effect-no-warn))
+                    (byte-compile-warning-enabled-p
+                     'ignored-return-value (car form)))
+               (byte-compile-warn-x
+@@ -4464,8 +4462,11 @@ byte-compile-goto-if
+ 
+ (defun byte-compile-ignore (form)
+   (dolist (arg (cdr form))
+-    ;; Compile each argument for-effect but suppress unused-value warnings.
+-    (byte-compile-form arg 'for-effect-no-warn))
++    ;; Compile args for value (to avoid warnings about unused values),
++    ;; emit a discard after each, and trust the LAP peephole optimiser
++    ;; to annihilate useless ops.
++    (byte-compile-form arg)
++    (byte-compile-discard))
+   (byte-compile-form nil))
+ 
+ ;; Return the list of items in CONDITION-PARAM that match PRED-LIST.
+-- 
+2.40.1
+
diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index e7addc80c354..79353f1776ad 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -141,9 +141,21 @@ let
     tree-sitter-yaml
   ];
 
-  emacsGit = super.lib.makeOverridable (mkGitEmacs "emacs-git" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; treeSitterPlugins = defaultTreeSitterPlugins; };
+  emacsGit = (super.lib.makeOverridable (mkGitEmacs "emacs-git" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; treeSitterPlugins = defaultTreeSitterPlugins; }).overrideAttrs (
+    oa: {
+      patches = oa.patches ++ [
+        # XXX: #318
+        ./bytecomp-revert.patch
+      ]; }
+  );
 
-  emacsPgtk = super.lib.makeOverridable (mkGitEmacs "emacs-pgtk" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; withPgtk = true; treeSitterPlugins = defaultTreeSitterPlugins; };
+  emacsPgtk = (super.lib.makeOverridable (mkGitEmacs "emacs-pgtk" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; withPgtk = true; treeSitterPlugins = defaultTreeSitterPlugins; }).overrideAttrs (
+    oa: {
+      patches = oa.patches ++ [
+        # XXX: #318
+        ./bytecomp-revert.patch
+      ]; }
+  );
 
   emacsUnstable = super.lib.makeOverridable (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = true; treeSitterPlugins = defaultTreeSitterPlugins; };
 
-- 
cgit 1.4.1


From e7cd4e4053af9872840f04e7a36c5f11aa81648b Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Thu, 25 May 2023 05:01:39 -0700
Subject: Work around
 https://lists.gnu.org/archive/html/bug-gnu-emacs/2023-05/msg01512.html

---
 overlays/emacs.nix               |   4 +
 overlays/nativecomp-revert.patch | 294 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 298 insertions(+)
 create mode 100644 overlays/nativecomp-revert.patch

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 79353f1776ad..6bcc92f66289 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -146,6 +146,8 @@ let
       patches = oa.patches ++ [
         # XXX: #318
         ./bytecomp-revert.patch
+        # XXX: https://lists.gnu.org/archive/html/bug-gnu-emacs/2023-05/msg01512.html
+        ./nativecomp-revert.patch
       ]; }
   );
 
@@ -154,6 +156,8 @@ let
       patches = oa.patches ++ [
         # XXX: #318
         ./bytecomp-revert.patch
+        # XXX: https://lists.gnu.org/archive/html/bug-gnu-emacs/2023-05/msg01512.html
+        ./nativecomp-revert.patch
       ]; }
   );
 
diff --git a/overlays/nativecomp-revert.patch b/overlays/nativecomp-revert.patch
new file mode 100644
index 000000000000..087f73547a4f
--- /dev/null
+++ b/overlays/nativecomp-revert.patch
@@ -0,0 +1,294 @@
+diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
+index 0b09cd7d225..8fdafe18c50 100644
+--- a/lisp/emacs-lisp/cl-macs.el
++++ b/lisp/emacs-lisp/cl-macs.el
+@@ -3093,16 +3093,13 @@ cl-defstruct
+                               (cons 'and (cdddr pred-form))
+                             `(,predicate cl-x))))
+     (when pred-form
+-      (push `(eval-and-compile
+-               ;; Define the predicate to be effective at compile time
+-               ;; as native comp relies on `cl-typep' that relies on
+-               ;; predicates to be defined as they are registered in
+-               ;; cl-deftype-satisfies.
+-               (,defsym ,predicate (cl-x)
++      (push `(,defsym ,predicate (cl-x)
+                (declare (side-effect-free error-free) (pure t))
+                ,(if (eq (car pred-form) 'and)
+                     (append pred-form '(t))
+                   `(and ,pred-form t)))
++            forms)
++      (push `(eval-and-compile
+                (define-symbol-prop ',name 'cl-deftype-satisfies ',predicate))
+             forms))
+     (let ((pos 0) (descp descs))
+@@ -3252,7 +3249,6 @@ cl-defstruct
+ 
+ ;;; Add cl-struct support to pcase
+ 
+-;;In use by comp.el
+ (defun cl--struct-all-parents (class)
+   (when (cl--struct-class-p class)
+     (let ((res ())
+diff --git a/lisp/emacs-lisp/cl-preloaded.el b/lisp/emacs-lisp/cl-preloaded.el
+index f410270d340..5235be52996 100644
+--- a/lisp/emacs-lisp/cl-preloaded.el
++++ b/lisp/emacs-lisp/cl-preloaded.el
+@@ -113,7 +113,6 @@ cl-struct-cl-structure-object-tags
+         (record 'cl-slot-descriptor
+                 name initform type props)))
+ 
+-;; In use by comp.el
+ (defun cl--struct-get-class (name)
+   (or (if (not (symbolp name)) name)
+       (cl--find-class name)
+diff --git a/lisp/emacs-lisp/comp-cstr.el b/lisp/emacs-lisp/comp-cstr.el
+index e9132552506..d4200c16c19 100644
+--- a/lisp/emacs-lisp/comp-cstr.el
++++ b/lisp/emacs-lisp/comp-cstr.el
+@@ -86,35 +86,7 @@ comp-cstr-f
+   (ret nil :type (or comp-cstr comp-cstr-f)
+        :documentation "Returned value."))
+ 
+-(defun comp--cl-class-hierarchy (x)
+-  "Given a class name `x' return its hierarchy."
+-  `(,@(mapcar #'cl--struct-class-name (cl--struct-all-parents
+-                                       (cl--struct-get-class x)))
+-    atom
+-    t))
+-
+-(defun comp--all-classes ()
+-  "Return all non built-in type names currently defined."
+-  (let (res)
+-    (mapatoms (lambda (x)
+-                (when (cl-find-class x)
+-                  (push x res)))
+-              obarray)
+-    res))
+-
+ (cl-defstruct comp-cstr-ctxt
+-  (typeof-types (append comp--typeof-builtin-types
+-                        (mapcar #'comp--cl-class-hierarchy (comp--all-classes)))
+-                :type list
+-                :documentation "Type hierarchy.")
+-  (pred-type-h (cl-loop with h = (make-hash-table :test #'eq)
+-	                for class-name in (comp--all-classes)
+-                        for pred = (get class-name 'cl-deftype-satisfies)
+-                        when pred
+-                          do (puthash pred class-name h)
+-	                finally return h)
+-               :type hash-table
+-               :documentation "Hash pred -> type.")
+   (union-typesets-mem (make-hash-table :test #'equal) :type hash-table
+                       :documentation "Serve memoization for
+ `comp-union-typesets'.")
+@@ -258,7 +230,7 @@ comp-supertypes
+   (cl-loop
+    named outer
+    with found = nil
+-   for l in (comp-cstr-ctxt-typeof-types comp-ctxt)
++   for l in comp--typeof-builtin-types
+    do (cl-loop
+        for x in l
+        for i from (length l) downto 0
+@@ -301,7 +273,7 @@ comp-union-typesets
+                (cl-loop
+                 with types = (apply #'append typesets)
+                 with res = '()
+-                for lane in (comp-cstr-ctxt-typeof-types comp-ctxt)
++                for lane in comp--typeof-builtin-types
+                 do (cl-loop
+                     with last = nil
+                     for x in lane
+@@ -895,23 +867,6 @@ comp-cstr-cons-p
+          (null (neg cstr))
+          (equal (typeset cstr) '(cons)))))
+ 
+-;; Move to comp.el?
+-(defsubst comp-cstr-cl-tag-p (cstr)
+-  "Return non-nil if CSTR is a CL tag."
+-  (with-comp-cstr-accessors
+-    (and (null (range cstr))
+-         (null (neg cstr))
+-         (null (typeset cstr))
+-         (length= (valset cstr) 1)
+-         (string-match (rx "cl-struct-" (group-n 1 (1+ not-newline)) "-tags")
+-                       (symbol-name (car (valset cstr)))))))
+-
+-(defsubst comp-cstr-cl-tag (cstr)
+-  "If CSTR is a CL tag return its tag name."
+-  (with-comp-cstr-accessors
+-    (and (comp-cstr-cl-tag-p cstr)
+-         (intern (match-string 1 (symbol-name (car (valset cstr))))))))
+-
+ (defun comp-cstr-= (dst op1 op2)
+   "Constraint OP1 being = OP2 setting the result into DST."
+   (with-comp-cstr-accessors
+diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
+index 8e59c06d40e..2e07b0b0e60 100644
+--- a/lisp/emacs-lisp/comp.el
++++ b/lisp/emacs-lisp/comp.el
+@@ -641,14 +641,11 @@ comp-known-predicates-h
+ 
+ (defun comp-known-predicate-p (predicate)
+   "Return t if PREDICATE is known."
+-  (when (or (gethash predicate comp-known-predicates-h)
+-            (gethash predicate (comp-cstr-ctxt-pred-type-h comp-ctxt)))
+-    t))
++  (when (gethash predicate comp-known-predicates-h) t))
+ 
+ (defun comp-pred-to-cstr (predicate)
+   "Given PREDICATE, return the corresponding constraint."
+-  (or (gethash predicate comp-known-predicates-h)
+-      (gethash predicate (comp-cstr-ctxt-pred-type-h comp-ctxt))))
++  (gethash predicate comp-known-predicates-h))
+ 
+ (defconst comp-symbol-values-optimizable '(most-positive-fixnum
+                                            most-negative-fixnum)
+@@ -1543,7 +1540,7 @@ comp-callref
+                              for sp from stack-off
+                              collect (comp-slot-n sp))))
+ 
+-(cl-defun make-comp-mvar (&key slot (constant nil const-vld) type neg)
++(cl-defun make-comp-mvar (&key slot (constant nil const-vld) type)
+   "`comp-mvar' initializer."
+   (let ((mvar (make--comp-mvar :slot slot)))
+     (when const-vld
+@@ -1551,8 +1548,6 @@ make-comp-mvar
+       (setf (comp-cstr-imm mvar) constant))
+     (when type
+       (setf (comp-mvar-typeset mvar) (list type)))
+-    (when neg
+-      (setf (comp-mvar-neg mvar) t))
+     mvar))
+ 
+ (defun comp-new-frame (size vsize &optional ssa)
+@@ -2548,19 +2543,6 @@ comp-add-cond-cstrs
+     for insns-seq on (comp-block-insns b)
+     do
+     (pcase insns-seq
+-      (`((set ,(and (pred comp-mvar-p) mvar-tested-copy)
+-              ,(and (pred comp-mvar-p) mvar-tested))
+-         (set ,(and (pred comp-mvar-p) mvar-1)
+-              (call type-of ,(and (pred comp-mvar-p) mvar-tested-copy)))
+-         (set ,(and (pred comp-mvar-p) mvar-2)
+-              (call symbol-value ,(and (pred comp-cstr-cl-tag-p) mvar-tag)))
+-         (set ,(and (pred comp-mvar-p) mvar-3)
+-              (call memq ,(and (pred comp-mvar-p) mvar-1) ,(and (pred comp-mvar-p) mvar-2)))
+-         (cond-jump ,(and (pred comp-mvar-p) mvar-3) ,(pred comp-mvar-p) ,bb1 ,bb2))
+-       (push  `(assume ,mvar-tested ,(make-comp-mvar :type (comp-cstr-cl-tag mvar-tag)))
+-              (comp-block-insns (comp-add-cond-cstrs-target-block b bb2)))
+-       (push  `(assume ,mvar-tested ,(make-comp-mvar :type (comp-cstr-cl-tag mvar-tag) :neg t))
+-              (comp-block-insns (comp-add-cond-cstrs-target-block b bb1))))
+       (`((set ,(and (pred comp-mvar-p) cmp-res)
+               (,(pred comp-call-op-p)
+                ,(and (or (pred comp-equality-fun-p)
+@@ -3216,11 +3198,7 @@ comp-fwprop-call
+       (+ (comp-cstr-add lval args))
+       (- (comp-cstr-sub lval args))
+       (1+ (comp-cstr-add lval `(,(car args) ,comp-cstr-one)))
+-      (1- (comp-cstr-sub lval `(,(car args) ,comp-cstr-one)))
+-      (record (when (comp-cstr-imm-vld-p (car args))
+-                (comp-cstr-shallow-copy lval
+-                                        (comp-type-spec-to-cstr
+-                                         (comp-cstr-imm (car args)))))))))
++      (1- (comp-cstr-sub lval `(,(car args) ,comp-cstr-one))))))
+ 
+ (defun comp-fwprop-insn (insn)
+   "Propagate within INSN."
+diff --git a/lisp/loadup.el b/lisp/loadup.el
+index 532d2ca176d..1cc70348267 100644
+--- a/lisp/loadup.el
++++ b/lisp/loadup.el
+@@ -103,7 +103,7 @@
+       ;; During bootstrapping the byte-compiler is run interpreted
+       ;; when compiling itself, which uses a lot more stack
+       ;; than usual.
+-      (setq max-lisp-eval-depth (max max-lisp-eval-depth 3400))))
++      (setq max-lisp-eval-depth 2200)))
+ 
+ (if (eq t purify-flag)
+     ;; Hash consing saved around 11% of pure space in my tests.
+diff --git a/test/src/comp-resources/comp-test-funcs.el b/test/src/comp-resources/comp-test-funcs.el
+index d8c72c1a920..73da7182a54 100644
+--- a/test/src/comp-resources/comp-test-funcs.el
++++ b/test/src/comp-resources/comp-test-funcs.el
+@@ -23,8 +23,6 @@
+ 
+ ;;; Code:
+ 
+-(require 'cl-lib)
+-
+ (defvar comp-tests-var1 3)
+ 
+ (defun comp-tests-varref-f ()
+@@ -532,12 +530,6 @@ comp-test-62537-2-f
+     (comp-test-62537-1-f))
+   t)
+ 
+-(cl-defstruct comp-test-struct)
+-
+-(defun comp-test-63674-1-f (x)
+-  (or
+-   (if (comp-test-struct-p pkg) x)
+-   t))
+ 
+ 
+ ;;;;;;;;;;;;;;;;;;;;
+diff --git a/test/src/comp-tests.el b/test/src/comp-tests.el
+index 673a9342f1f..4682cac450e 100644
+--- a/test/src/comp-tests.el
++++ b/test/src/comp-tests.el
+@@ -875,8 +875,6 @@ comp-tests-check-ret-type-spec
+                    ret-type))))
+ 
+ (cl-eval-when (compile eval load)
+-  (cl-defstruct comp-foo a b)
+-  (cl-defstruct (comp-bar (:include comp-foo)) c)
+   (defconst comp-tests-type-spec-tests
+     ;; Why we quote everything here, you ask?  So that values of
+     ;; `most-positive-fixnum' and `most-negative-fixnum', which can be
+@@ -1406,39 +1404,7 @@ comp-tests-check-ret-type-spec
+          (if (eq x 0)
+ 	     (error "")
+ 	   (1+ x)))
+-       'number)
+-
+-      ;; 75
+-      ((defun comp-tests-ret-type-spec-f ()
+-         (make-comp-foo))
+-       'comp-foo)
+-
+-      ;; 76
+-      ((defun comp-tests-ret-type-spec-f ()
+-         (make-comp-bar))
+-       'comp-bar)
+-
+-      ;; 77
+-      ((defun comp-tests-ret-type-spec-f (x)
+-          (setf (comp-foo-a x) 2)
+-          x)
+-       'comp-foo)
+-
+-      ;; 78
+-      ((defun comp-tests-ret-type-spec-f (x)
+-          (if x
+-              (if (> x 11)
+-	          x
+-	        (make-comp-foo))
+-            (make-comp-bar)))
+-       '(or comp-foo float (integer 12 *)))
+-
+-      ;; 79
+-      ((defun comp-tests-ret-type-spec-f (x)
+-         (if (comp-foo-p x)
+-             x
+-           (error "")))
+-       'comp-foo)))
++       'number)))
+ 
+   (defun comp-tests-define-type-spec-test (number x)
+     `(comp-deftest ,(intern (format "ret-type-spec-%d" number)) ()
+-- 
+2.40.1
+
-- 
cgit 1.4.1


From f6f7f8ef79ab84f6585a7d6ee7b8cb65719f4f1f Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Mon, 29 May 2023 00:12:01 -0700
Subject: Revert "Work around
 https://lists.gnu.org/archive/html/bug-gnu-emacs/2023-05/msg01512.html"

This reverts commit e7cd4e4053af9872840f04e7a36c5f11aa81648b.

Upstream is attempting to work around the issue we encountered, so we
revert to avoid conflicts.
---
 overlays/emacs.nix               |   4 -
 overlays/nativecomp-revert.patch | 294 ---------------------------------------
 2 files changed, 298 deletions(-)
 delete mode 100644 overlays/nativecomp-revert.patch

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 6bcc92f66289..79353f1776ad 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -146,8 +146,6 @@ let
       patches = oa.patches ++ [
         # XXX: #318
         ./bytecomp-revert.patch
-        # XXX: https://lists.gnu.org/archive/html/bug-gnu-emacs/2023-05/msg01512.html
-        ./nativecomp-revert.patch
       ]; }
   );
 
@@ -156,8 +154,6 @@ let
       patches = oa.patches ++ [
         # XXX: #318
         ./bytecomp-revert.patch
-        # XXX: https://lists.gnu.org/archive/html/bug-gnu-emacs/2023-05/msg01512.html
-        ./nativecomp-revert.patch
       ]; }
   );
 
diff --git a/overlays/nativecomp-revert.patch b/overlays/nativecomp-revert.patch
deleted file mode 100644
index 087f73547a4f..000000000000
--- a/overlays/nativecomp-revert.patch
+++ /dev/null
@@ -1,294 +0,0 @@
-diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
-index 0b09cd7d225..8fdafe18c50 100644
---- a/lisp/emacs-lisp/cl-macs.el
-+++ b/lisp/emacs-lisp/cl-macs.el
-@@ -3093,16 +3093,13 @@ cl-defstruct
-                               (cons 'and (cdddr pred-form))
-                             `(,predicate cl-x))))
-     (when pred-form
--      (push `(eval-and-compile
--               ;; Define the predicate to be effective at compile time
--               ;; as native comp relies on `cl-typep' that relies on
--               ;; predicates to be defined as they are registered in
--               ;; cl-deftype-satisfies.
--               (,defsym ,predicate (cl-x)
-+      (push `(,defsym ,predicate (cl-x)
-                (declare (side-effect-free error-free) (pure t))
-                ,(if (eq (car pred-form) 'and)
-                     (append pred-form '(t))
-                   `(and ,pred-form t)))
-+            forms)
-+      (push `(eval-and-compile
-                (define-symbol-prop ',name 'cl-deftype-satisfies ',predicate))
-             forms))
-     (let ((pos 0) (descp descs))
-@@ -3252,7 +3249,6 @@ cl-defstruct
- 
- ;;; Add cl-struct support to pcase
- 
--;;In use by comp.el
- (defun cl--struct-all-parents (class)
-   (when (cl--struct-class-p class)
-     (let ((res ())
-diff --git a/lisp/emacs-lisp/cl-preloaded.el b/lisp/emacs-lisp/cl-preloaded.el
-index f410270d340..5235be52996 100644
---- a/lisp/emacs-lisp/cl-preloaded.el
-+++ b/lisp/emacs-lisp/cl-preloaded.el
-@@ -113,7 +113,6 @@ cl-struct-cl-structure-object-tags
-         (record 'cl-slot-descriptor
-                 name initform type props)))
- 
--;; In use by comp.el
- (defun cl--struct-get-class (name)
-   (or (if (not (symbolp name)) name)
-       (cl--find-class name)
-diff --git a/lisp/emacs-lisp/comp-cstr.el b/lisp/emacs-lisp/comp-cstr.el
-index e9132552506..d4200c16c19 100644
---- a/lisp/emacs-lisp/comp-cstr.el
-+++ b/lisp/emacs-lisp/comp-cstr.el
-@@ -86,35 +86,7 @@ comp-cstr-f
-   (ret nil :type (or comp-cstr comp-cstr-f)
-        :documentation "Returned value."))
- 
--(defun comp--cl-class-hierarchy (x)
--  "Given a class name `x' return its hierarchy."
--  `(,@(mapcar #'cl--struct-class-name (cl--struct-all-parents
--                                       (cl--struct-get-class x)))
--    atom
--    t))
--
--(defun comp--all-classes ()
--  "Return all non built-in type names currently defined."
--  (let (res)
--    (mapatoms (lambda (x)
--                (when (cl-find-class x)
--                  (push x res)))
--              obarray)
--    res))
--
- (cl-defstruct comp-cstr-ctxt
--  (typeof-types (append comp--typeof-builtin-types
--                        (mapcar #'comp--cl-class-hierarchy (comp--all-classes)))
--                :type list
--                :documentation "Type hierarchy.")
--  (pred-type-h (cl-loop with h = (make-hash-table :test #'eq)
--	                for class-name in (comp--all-classes)
--                        for pred = (get class-name 'cl-deftype-satisfies)
--                        when pred
--                          do (puthash pred class-name h)
--	                finally return h)
--               :type hash-table
--               :documentation "Hash pred -> type.")
-   (union-typesets-mem (make-hash-table :test #'equal) :type hash-table
-                       :documentation "Serve memoization for
- `comp-union-typesets'.")
-@@ -258,7 +230,7 @@ comp-supertypes
-   (cl-loop
-    named outer
-    with found = nil
--   for l in (comp-cstr-ctxt-typeof-types comp-ctxt)
-+   for l in comp--typeof-builtin-types
-    do (cl-loop
-        for x in l
-        for i from (length l) downto 0
-@@ -301,7 +273,7 @@ comp-union-typesets
-                (cl-loop
-                 with types = (apply #'append typesets)
-                 with res = '()
--                for lane in (comp-cstr-ctxt-typeof-types comp-ctxt)
-+                for lane in comp--typeof-builtin-types
-                 do (cl-loop
-                     with last = nil
-                     for x in lane
-@@ -895,23 +867,6 @@ comp-cstr-cons-p
-          (null (neg cstr))
-          (equal (typeset cstr) '(cons)))))
- 
--;; Move to comp.el?
--(defsubst comp-cstr-cl-tag-p (cstr)
--  "Return non-nil if CSTR is a CL tag."
--  (with-comp-cstr-accessors
--    (and (null (range cstr))
--         (null (neg cstr))
--         (null (typeset cstr))
--         (length= (valset cstr) 1)
--         (string-match (rx "cl-struct-" (group-n 1 (1+ not-newline)) "-tags")
--                       (symbol-name (car (valset cstr)))))))
--
--(defsubst comp-cstr-cl-tag (cstr)
--  "If CSTR is a CL tag return its tag name."
--  (with-comp-cstr-accessors
--    (and (comp-cstr-cl-tag-p cstr)
--         (intern (match-string 1 (symbol-name (car (valset cstr))))))))
--
- (defun comp-cstr-= (dst op1 op2)
-   "Constraint OP1 being = OP2 setting the result into DST."
-   (with-comp-cstr-accessors
-diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
-index 8e59c06d40e..2e07b0b0e60 100644
---- a/lisp/emacs-lisp/comp.el
-+++ b/lisp/emacs-lisp/comp.el
-@@ -641,14 +641,11 @@ comp-known-predicates-h
- 
- (defun comp-known-predicate-p (predicate)
-   "Return t if PREDICATE is known."
--  (when (or (gethash predicate comp-known-predicates-h)
--            (gethash predicate (comp-cstr-ctxt-pred-type-h comp-ctxt)))
--    t))
-+  (when (gethash predicate comp-known-predicates-h) t))
- 
- (defun comp-pred-to-cstr (predicate)
-   "Given PREDICATE, return the corresponding constraint."
--  (or (gethash predicate comp-known-predicates-h)
--      (gethash predicate (comp-cstr-ctxt-pred-type-h comp-ctxt))))
-+  (gethash predicate comp-known-predicates-h))
- 
- (defconst comp-symbol-values-optimizable '(most-positive-fixnum
-                                            most-negative-fixnum)
-@@ -1543,7 +1540,7 @@ comp-callref
-                              for sp from stack-off
-                              collect (comp-slot-n sp))))
- 
--(cl-defun make-comp-mvar (&key slot (constant nil const-vld) type neg)
-+(cl-defun make-comp-mvar (&key slot (constant nil const-vld) type)
-   "`comp-mvar' initializer."
-   (let ((mvar (make--comp-mvar :slot slot)))
-     (when const-vld
-@@ -1551,8 +1548,6 @@ make-comp-mvar
-       (setf (comp-cstr-imm mvar) constant))
-     (when type
-       (setf (comp-mvar-typeset mvar) (list type)))
--    (when neg
--      (setf (comp-mvar-neg mvar) t))
-     mvar))
- 
- (defun comp-new-frame (size vsize &optional ssa)
-@@ -2548,19 +2543,6 @@ comp-add-cond-cstrs
-     for insns-seq on (comp-block-insns b)
-     do
-     (pcase insns-seq
--      (`((set ,(and (pred comp-mvar-p) mvar-tested-copy)
--              ,(and (pred comp-mvar-p) mvar-tested))
--         (set ,(and (pred comp-mvar-p) mvar-1)
--              (call type-of ,(and (pred comp-mvar-p) mvar-tested-copy)))
--         (set ,(and (pred comp-mvar-p) mvar-2)
--              (call symbol-value ,(and (pred comp-cstr-cl-tag-p) mvar-tag)))
--         (set ,(and (pred comp-mvar-p) mvar-3)
--              (call memq ,(and (pred comp-mvar-p) mvar-1) ,(and (pred comp-mvar-p) mvar-2)))
--         (cond-jump ,(and (pred comp-mvar-p) mvar-3) ,(pred comp-mvar-p) ,bb1 ,bb2))
--       (push  `(assume ,mvar-tested ,(make-comp-mvar :type (comp-cstr-cl-tag mvar-tag)))
--              (comp-block-insns (comp-add-cond-cstrs-target-block b bb2)))
--       (push  `(assume ,mvar-tested ,(make-comp-mvar :type (comp-cstr-cl-tag mvar-tag) :neg t))
--              (comp-block-insns (comp-add-cond-cstrs-target-block b bb1))))
-       (`((set ,(and (pred comp-mvar-p) cmp-res)
-               (,(pred comp-call-op-p)
-                ,(and (or (pred comp-equality-fun-p)
-@@ -3216,11 +3198,7 @@ comp-fwprop-call
-       (+ (comp-cstr-add lval args))
-       (- (comp-cstr-sub lval args))
-       (1+ (comp-cstr-add lval `(,(car args) ,comp-cstr-one)))
--      (1- (comp-cstr-sub lval `(,(car args) ,comp-cstr-one)))
--      (record (when (comp-cstr-imm-vld-p (car args))
--                (comp-cstr-shallow-copy lval
--                                        (comp-type-spec-to-cstr
--                                         (comp-cstr-imm (car args)))))))))
-+      (1- (comp-cstr-sub lval `(,(car args) ,comp-cstr-one))))))
- 
- (defun comp-fwprop-insn (insn)
-   "Propagate within INSN."
-diff --git a/lisp/loadup.el b/lisp/loadup.el
-index 532d2ca176d..1cc70348267 100644
---- a/lisp/loadup.el
-+++ b/lisp/loadup.el
-@@ -103,7 +103,7 @@
-       ;; During bootstrapping the byte-compiler is run interpreted
-       ;; when compiling itself, which uses a lot more stack
-       ;; than usual.
--      (setq max-lisp-eval-depth (max max-lisp-eval-depth 3400))))
-+      (setq max-lisp-eval-depth 2200)))
- 
- (if (eq t purify-flag)
-     ;; Hash consing saved around 11% of pure space in my tests.
-diff --git a/test/src/comp-resources/comp-test-funcs.el b/test/src/comp-resources/comp-test-funcs.el
-index d8c72c1a920..73da7182a54 100644
---- a/test/src/comp-resources/comp-test-funcs.el
-+++ b/test/src/comp-resources/comp-test-funcs.el
-@@ -23,8 +23,6 @@
- 
- ;;; Code:
- 
--(require 'cl-lib)
--
- (defvar comp-tests-var1 3)
- 
- (defun comp-tests-varref-f ()
-@@ -532,12 +530,6 @@ comp-test-62537-2-f
-     (comp-test-62537-1-f))
-   t)
- 
--(cl-defstruct comp-test-struct)
--
--(defun comp-test-63674-1-f (x)
--  (or
--   (if (comp-test-struct-p pkg) x)
--   t))
- 
- 
- ;;;;;;;;;;;;;;;;;;;;
-diff --git a/test/src/comp-tests.el b/test/src/comp-tests.el
-index 673a9342f1f..4682cac450e 100644
---- a/test/src/comp-tests.el
-+++ b/test/src/comp-tests.el
-@@ -875,8 +875,6 @@ comp-tests-check-ret-type-spec
-                    ret-type))))
- 
- (cl-eval-when (compile eval load)
--  (cl-defstruct comp-foo a b)
--  (cl-defstruct (comp-bar (:include comp-foo)) c)
-   (defconst comp-tests-type-spec-tests
-     ;; Why we quote everything here, you ask?  So that values of
-     ;; `most-positive-fixnum' and `most-negative-fixnum', which can be
-@@ -1406,39 +1404,7 @@ comp-tests-check-ret-type-spec
-          (if (eq x 0)
- 	     (error "")
- 	   (1+ x)))
--       'number)
--
--      ;; 75
--      ((defun comp-tests-ret-type-spec-f ()
--         (make-comp-foo))
--       'comp-foo)
--
--      ;; 76
--      ((defun comp-tests-ret-type-spec-f ()
--         (make-comp-bar))
--       'comp-bar)
--
--      ;; 77
--      ((defun comp-tests-ret-type-spec-f (x)
--          (setf (comp-foo-a x) 2)
--          x)
--       'comp-foo)
--
--      ;; 78
--      ((defun comp-tests-ret-type-spec-f (x)
--          (if x
--              (if (> x 11)
--	          x
--	        (make-comp-foo))
--            (make-comp-bar)))
--       '(or comp-foo float (integer 12 *)))
--
--      ;; 79
--      ((defun comp-tests-ret-type-spec-f (x)
--         (if (comp-foo-p x)
--             x
--           (error "")))
--       'comp-foo)))
-+       'number)))
- 
-   (defun comp-tests-define-type-spec-test (number x)
-     `(comp-deftest ,(intern (format "ret-type-spec-%d" number)) ()
--- 
-2.40.1
-
-- 
cgit 1.4.1


From 509a7ef0ea8d63fac38a09f68fde3f4fe8678c92 Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Tue, 30 May 2023 14:40:55 -0700
Subject: Remove tree-sitter stuff

It's now handled in nixpkgs.
---
 overlays/emacs.nix | 69 +++++++-----------------------------------------------
 1 file changed, 8 insertions(+), 61 deletions(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 79353f1776ad..c0b370430e9f 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -16,7 +16,7 @@ let
       super.emacs
       ([
 
-        (drv: drv.override ({ srcRepo = true; } // builtins.removeAttrs args [ "noTreeSitter" "treeSitterPlugins" ]))
+        (drv: drv.override ({ srcRepo = true; } // args))
 
         (
           drv: drv.overrideAttrs (
@@ -86,62 +86,9 @@ let
           in
           result
         )
-      ]
-      ++ (super.lib.optional (! (args ? "noTreeSitter")) (
-        drv: drv.overrideAttrs (old:
-          let
-            libName = drv: super.lib.removeSuffix "-grammar" drv.pname;
-            libSuffix = if super.stdenv.isDarwin then "dylib" else "so";
-            lib = drv: ''lib${libName drv}.${libSuffix}'';
-            linkCmd = drv:
-              if super.stdenv.isDarwin
-              then ''cp ${drv}/parser .
-                     chmod +w ./parser
-                     install_name_tool -id $out/lib/${lib drv} ./parser
-                     cp ./parser $out/lib/${lib drv}
-                     ${self.pkgs.darwin.sigtool}/bin/codesign -s - -f $out/lib/${lib drv}
-                ''
-              else ''ln -s ${drv}/parser $out/lib/${lib drv}'';
-            plugins = args.treeSitterPlugins;
-            tree-sitter-grammars = super.runCommandCC "tree-sitter-grammars" {}
-              (super.lib.concatStringsSep "\n" (["mkdir -p $out/lib"] ++ (map linkCmd plugins)));
-          in {
-            buildInputs = old.buildInputs ++ [ self.pkgs.tree-sitter tree-sitter-grammars ];
-            buildFlags = super.lib.optionalString self.stdenv.isDarwin
-              "LDFLAGS=-Wl,-rpath,${super.lib.makeLibraryPath [tree-sitter-grammars]}";
-            TREE_SITTER_LIBS = "-ltree-sitter";
-            # Add to list of directories dlopen/dynlib_open searches for tree sitter languages *.so
-            postFixup = old.postFixup + super.lib.optionalString self.stdenv.isLinux ''
-                ${self.pkgs.patchelf}/bin/patchelf --add-rpath ${super.lib.makeLibraryPath [ tree-sitter-grammars ]} $out/bin/emacs
-              '';
-          }
-        )
-      )));
-
-  defaultTreeSitterPlugins = with self.pkgs.tree-sitter-grammars; [
-    tree-sitter-bash
-    tree-sitter-c
-    tree-sitter-c-sharp
-    tree-sitter-cmake
-    tree-sitter-cpp
-    tree-sitter-css
-    tree-sitter-dockerfile
-    tree-sitter-go
-    tree-sitter-gomod
-    tree-sitter-html
-    tree-sitter-java
-    tree-sitter-javascript
-    tree-sitter-json
-    tree-sitter-python
-    tree-sitter-ruby
-    tree-sitter-rust
-    tree-sitter-toml
-    tree-sitter-tsx
-    tree-sitter-typescript
-    tree-sitter-yaml
-  ];
-
-  emacsGit = (super.lib.makeOverridable (mkGitEmacs "emacs-git" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; treeSitterPlugins = defaultTreeSitterPlugins; }).overrideAttrs (
+      ]);
+
+  emacsGit = (super.lib.makeOverridable (mkGitEmacs "emacs-git" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; withTreeSitter = true; }).overrideAttrs (
     oa: {
       patches = oa.patches ++ [
         # XXX: #318
@@ -149,7 +96,7 @@ let
       ]; }
   );
 
-  emacsPgtk = (super.lib.makeOverridable (mkGitEmacs "emacs-pgtk" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; withPgtk = true; treeSitterPlugins = defaultTreeSitterPlugins; }).overrideAttrs (
+  emacsPgtk = (super.lib.makeOverridable (mkGitEmacs "emacs-pgtk" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; withTreeSitter = true; withPgtk = true; }).overrideAttrs (
     oa: {
       patches = oa.patches ++ [
         # XXX: #318
@@ -157,11 +104,11 @@ let
       ]; }
   );
 
-  emacsUnstable = super.lib.makeOverridable (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = true; treeSitterPlugins = defaultTreeSitterPlugins; };
+  emacsUnstable = super.lib.makeOverridable (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = true; withTreeSitter = true; };
 
-  emacsUnstablePgtk = super.lib.makeOverridable (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = true; withPgtk = true; treeSitterPlugins = defaultTreeSitterPlugins; };
+  emacsUnstablePgtk = super.lib.makeOverridable (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = true; withTreeSitter = true; withPgtk = true; };
 
-  emacsLsp = (mkGitEmacs "emacs-lsp" ../repos/emacs/emacs-lsp.json { noTreeSitter = true; });
+  emacsLsp = (mkGitEmacs "emacs-lsp" ../repos/emacs/emacs-lsp.json { withTreeSitter = false; });
 
 in
 {
-- 
cgit 1.4.1


From 77c0c82383520020990fb0fe12592fcfaf5a4d3a Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Tue, 30 May 2023 16:27:51 -0700
Subject: Account for upstream refactor

---
 overlays/emacs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index c0b370430e9f..23a179440ea7 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -48,7 +48,7 @@ let
               # patch to be used. Not sure if it's better to rely on
               # upstream Nixpkgs since it's cumbersome to wait for
               # things to get merged into master.
-                (super.lib.optionalString (old ? NATIVE_FULL_AOT)
+                (super.lib.optionalString ((old ? NATIVE_FULL_AOT) || (old ? env.NATIVE_FULL_AOT))
                     (let backendPath = (super.lib.concatStringsSep " "
                       (builtins.map (x: ''\"-B${x}\"'') ([
                         # Paths necessary so the JIT compiler finds its libraries:
-- 
cgit 1.4.1


From 936f581fed5296053cb6098063fa706dec7fc13f Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Tue, 30 May 2023 17:48:40 -0700
Subject: Make emacsLsp overridable

---
 overlays/emacs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 23a179440ea7..2d94bd97def5 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -108,7 +108,7 @@ let
 
   emacsUnstablePgtk = super.lib.makeOverridable (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = true; withTreeSitter = true; withPgtk = true; };
 
-  emacsLsp = (mkGitEmacs "emacs-lsp" ../repos/emacs/emacs-lsp.json { withTreeSitter = false; });
+  emacsLsp = super.lib.makeOverridable (mkGitEmacs "emacs-lsp" ../repos/emacs/emacs-lsp.json) { withTreeSitter = false; };
 
 in
 {
-- 
cgit 1.4.1


From e20a3891139758fd04ef1905c19e3e1fcc744179 Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Tue, 30 May 2023 21:08:06 -0700
Subject: Account for nixpkgs checkouts lacking withTreeSitter attribute

---
 overlays/emacs.nix | 58 ++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 37 insertions(+), 21 deletions(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 2d94bd97def5..f8316d3f8427 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -88,27 +88,43 @@ let
         )
       ]);
 
-  emacsGit = (super.lib.makeOverridable (mkGitEmacs "emacs-git" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; withTreeSitter = true; }).overrideAttrs (
-    oa: {
-      patches = oa.patches ++ [
-        # XXX: #318
-        ./bytecomp-revert.patch
-      ]; }
-  );
-
-  emacsPgtk = (super.lib.makeOverridable (mkGitEmacs "emacs-pgtk" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; withTreeSitter = true; withPgtk = true; }).overrideAttrs (
-    oa: {
-      patches = oa.patches ++ [
-        # XXX: #318
-        ./bytecomp-revert.patch
-      ]; }
-  );
-
-  emacsUnstable = super.lib.makeOverridable (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = true; withTreeSitter = true; };
-
-  emacsUnstablePgtk = super.lib.makeOverridable (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = true; withTreeSitter = true; withPgtk = true; };
-
-  emacsLsp = super.lib.makeOverridable (mkGitEmacs "emacs-lsp" ../repos/emacs/emacs-lsp.json) { withTreeSitter = false; };
+  emacsGit = let base = (super.lib.makeOverridable (mkGitEmacs "emacs-git" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; });
+                 # TODO: remove when we drop support for < 23.05
+                 maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = true; } else base;
+             in
+               maybeOverridden.overrideAttrs (
+                 oa: {
+                   patches = oa.patches ++ [
+                     # XXX: #318
+                     ./bytecomp-revert.patch
+                   ]; }
+               );
+
+  emacsPgtk = let base = super.lib.makeOverridable (mkGitEmacs "emacs-pgtk" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; withPgtk = true; };
+                 # TODO: remove when we drop support for < 23.05
+                  maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = true; } else base;
+              in maybeOverridden.overrideAttrs (
+                oa: {
+                  patches = oa.patches ++ [
+                    # XXX: #318
+                    ./bytecomp-revert.patch
+                  ]; }
+              );
+
+  emacsUnstable = let base = super.lib.makeOverridable (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = true; };
+                      # TODO: remove when we drop support for < 23.05
+                      maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = true; } else base;
+                      in maybeOverridden;
+
+  emacsUnstablePgtk = let base = super.lib.makeOverridable (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = true; withPgtk = true; };
+                          # TODO: remove when we drop support for < 23.05
+                          maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = true; } else base;
+                      in maybeOverridden;
+
+  emacsLsp = let base = super.lib.makeOverridable (mkGitEmacs "emacs-lsp" ../repos/emacs/emacs-lsp.json) { };
+                 # TODO: remove when we drop support for < 23.05
+                 maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = false; } else base;
+                 in maybeOverridden;
 
 in
 {
-- 
cgit 1.4.1


From 2143986e6283433634dc0f661b665b3351b808af Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Tue, 30 May 2023 22:30:02 -0700
Subject: Clarify to-do

---
 overlays/emacs.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index f8316d3f8427..696cb79cc5d8 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -89,7 +89,7 @@ let
       ]);
 
   emacsGit = let base = (super.lib.makeOverridable (mkGitEmacs "emacs-git" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; });
-                 # TODO: remove when we drop support for < 23.05
+                 # TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
                  maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = true; } else base;
              in
                maybeOverridden.overrideAttrs (
@@ -101,7 +101,7 @@ let
                );
 
   emacsPgtk = let base = super.lib.makeOverridable (mkGitEmacs "emacs-pgtk" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; withPgtk = true; };
-                 # TODO: remove when we drop support for < 23.05
+                 # TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
                   maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = true; } else base;
               in maybeOverridden.overrideAttrs (
                 oa: {
@@ -112,17 +112,17 @@ let
               );
 
   emacsUnstable = let base = super.lib.makeOverridable (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = true; };
-                      # TODO: remove when we drop support for < 23.05
+                      # TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
                       maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = true; } else base;
                       in maybeOverridden;
 
   emacsUnstablePgtk = let base = super.lib.makeOverridable (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = true; withPgtk = true; };
-                          # TODO: remove when we drop support for < 23.05
+                          # TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
                           maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = true; } else base;
                       in maybeOverridden;
 
   emacsLsp = let base = super.lib.makeOverridable (mkGitEmacs "emacs-lsp" ../repos/emacs/emacs-lsp.json) { };
-                 # TODO: remove when we drop support for < 23.05
+                 # TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
                  maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = false; } else base;
                  in maybeOverridden;
 
-- 
cgit 1.4.1


From fdf09998a0484722757cfd5672a8b745bec982bb Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Thu, 1 Jun 2023 16:47:52 +1200
Subject: Align with nixpkgs attribute syntax since
 https://github.com/NixOS/nixpkgs/pull/233301

---
 flake.nix          | 24 ++++++++++--------------
 overlays/emacs.nix | 54 ++++++++++++++++++++++++++++++++----------------------
 2 files changed, 42 insertions(+), 36 deletions(-)

(limited to 'overlays')

diff --git a/flake.nix b/flake.nix
index 96f57b98e641..258e543f86ec 100644
--- a/flake.nix
+++ b/flake.nix
@@ -34,27 +34,23 @@
       # for backward compatibility, is safe to delete, not referenced anywhere
       overlay = self.overlays.default;
     } // flake-utils.lib.eachSystem [ "x86_64-linux" ] (system:
-    let
-      pkgs = importPkgs nixpkgs { inherit system; };
-      inherit (pkgs) lib;
-    in
     {
       hydraJobs =
         let
           mkHydraJobs = pkgs:
             let
               mkEmacsSet = emacs: pkgs.recurseIntoAttrs (
-                lib.filterAttrs
-                  (n: v: builtins.typeOf v == "set" && ! lib.isDerivation v)
+                pkgs.lib.filterAttrs
+                  (n: v: builtins.typeOf v == "set" && ! pkgs.lib.isDerivation v)
                   (pkgs.emacsPackagesFor emacs)
               );
 
             in
             {
               emacsen = {
-                inherit (pkgs) emacsUnstable emacsUnstable-nox;
-                inherit (pkgs) emacsGit emacsGit-nox;
-                inherit (pkgs) emacsPgtk;
+                inherit (pkgs) emacs-unstable emacs-unstable-nox;
+                inherit (pkgs) emacs-git emacs-git-nox;
+                inherit (pkgs) emacs-pgtk;
               };
 
               emacsen-cross =
@@ -69,20 +65,20 @@
                       in
                       lib.mapAttrs' (name: job: lib.nameValuePair "${name}-${target}" job)
                         ({
-                          inherit (targetPkgs) emacsUnstable emacsUnstable-nox;
-                          inherit (targetPkgs) emacsGit emacsGit-nox;
-                          inherit (targetPkgs) emacsPgtk;
+                          inherit (targetPkgs) emacs-unstable emacs-unstable-nox;
+                          inherit (targetPkgs) emacs-git emacs-git-nox;
+                          inherit (targetPkgs) emacs-pgtk;
                         }))
                     crossTargets);
 
               packages = mkEmacsSet pkgs.emacs;
-              packages-unstable = mkEmacsSet pkgs.emacsUnstable;
+              packages-unstable = mkEmacsSet pkgs.emacs-unstable;
             };
 
         in
         {
           "22.11" = mkHydraJobs (importPkgs nixpkgs-stable { inherit system; });
-          "unstable" = mkHydraJobs pkgs;
+          "unstable" = mkHydraJobs (importPkgs nixpkgs { inherit system; };);
         };
     }) // flake-utils.lib.eachDefaultSystem (system: (
       let
diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index 696cb79cc5d8..e0523eb8248e 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -88,7 +88,7 @@ let
         )
       ]);
 
-  emacsGit = let base = (super.lib.makeOverridable (mkGitEmacs "emacs-git" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; });
+  emacs-git = let base = (super.lib.makeOverridable (mkGitEmacs "emacs-git" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; });
                  # TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
                  maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = true; } else base;
              in
@@ -100,7 +100,7 @@ let
                    ]; }
                );
 
-  emacsPgtk = let base = super.lib.makeOverridable (mkGitEmacs "emacs-pgtk" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; withPgtk = true; };
+  emacs-pgtk = let base = super.lib.makeOverridable (mkGitEmacs "emacs-pgtk" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; withPgtk = true; };
                  # TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
                   maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = true; } else base;
               in maybeOverridden.overrideAttrs (
@@ -111,30 +111,24 @@ let
                   ]; }
               );
 
-  emacsUnstable = let base = super.lib.makeOverridable (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = true; };
+  emacs-unstable = let base = super.lib.makeOverridable (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = true; };
                       # TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
                       maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = true; } else base;
                       in maybeOverridden;
 
-  emacsUnstablePgtk = let base = super.lib.makeOverridable (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = true; withPgtk = true; };
+  emacs-unstable-pgtk = let base = super.lib.makeOverridable (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = true; withPgtk = true; };
                           # TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
                           maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = true; } else base;
                       in maybeOverridden;
 
-  emacsLsp = let base = super.lib.makeOverridable (mkGitEmacs "emacs-lsp" ../repos/emacs/emacs-lsp.json) { };
+  emacs-lsp = let base = super.lib.makeOverridable (mkGitEmacs "emacs-lsp" ../repos/emacs/emacs-lsp.json) { };
                  # TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
                  maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = false; } else base;
                  in maybeOverridden;
 
-in
-{
-  inherit emacsGit emacsUnstable;
-
-  inherit emacsPgtk emacsUnstablePgtk;
-
-  emacsGit-nox = (
+  emacs-git-nox = (
     (
-      emacsGit.override {
+      emacs-git.override {
         withNS = false;
         withX = false;
         withGTK2 = false;
@@ -148,9 +142,9 @@ in
     )
   );
 
-  emacsUnstable-nox = (
+  emacs-unstable-nox = (
     (
-      emacsUnstable.override {
+      emacs-unstable.override {
         withNS = false;
         withX = false;
         withGTK2 = false;
@@ -164,17 +158,33 @@ in
     )
   );
 
-  inherit emacsLsp;
+in
+{
+  inherit emacs-git emacs-unstable;
+
+  inherit emacs-pgtk emacs-unstable-pgtk;
+
+  inherit emacs-git-nox emacs-unstable-nox;
+
+  inherit emacs-lsp;
 
   emacsWithPackagesFromUsePackage = import ../elisp.nix { pkgs = self; };
 
   emacsWithPackagesFromPackageRequires = import ../packreq.nix { pkgs = self; };
 
 } // super.lib.optionalAttrs (super.config.allowAliases or true) {
-  emacsGcc = builtins.trace "emacsGcc has been renamed to emacsGit, please update your expression." emacsGit;
-  emacsGitNativeComp = builtins.trace "emacsGitNativeComp has been renamed to emacsGit, please update your expression." emacsGit;
-  emacsGitTreeSitter = builtins.trace "emacsGitTreeSitter has been renamed to emacsGit, please update your expression." emacsGit;
-  emacsNativeComp = builtins.trace "emacsNativeComp has been renamed to emacsUnstable, please update your expression." emacsUnstable;
-  emacsPgtkGcc = builtins.trace "emacsPgtkGcc has been renamed to emacsPgtk, please update your expression." emacsPgtk;
-  emacsPgtkNativeComp = builtins.trace "emacsPgtkNativeComp has been renamed to emacsPgtk, please update your expression." emacsPgtk;
+  emacsGcc = builtins.trace "emacsGcc has been renamed to emacs-git, please update your expression." emacs-git;
+  emacsGitNativeComp = builtins.trace "emacsGitNativeComp has been renamed to emacs-git, please update your expression." emacs-git;
+  emacsGitTreeSitter = builtins.trace "emacsGitTreeSitter has been renamed to emacs-git, please update your expression." emacs-git;
+  emacsNativeComp = builtins.trace "emacsNativeComp has been renamed to emacs-unstable, please update your expression." emacs-unstable;
+  emacsPgtkGcc = builtins.trace "emacsPgtkGcc has been renamed to emacs-pgtk, please update your expression." emacs-pgtk;
+  emacsPgtkNativeComp = builtins.trace "emacsPgtkNativeComp has been renamed to emacs-pgtk, please update your expression." emacs-pgtk;
+
+  emacsGit = builtins.trace "emacsGit has been renamed to emacs-git, please update your expression." emacs-git;
+  emacsUnstable = builtins.trace "emacsUnstable has been renamed to emacs-unstable, please update your expression." emacs-unstable;
+  emacsPgtk = builtins.trace "emacsPgtk has been renamed to emacs-pgtk, please update your expression." emacs-pgtk;
+  emacsUnstablePgtk = builtins.trace "emacsUnstablePgtk has been renamed to emacs-unstable-pgtk, please update your expression." emacs-unstable-pgtk;
+  emacsGitNox = builtins.trace "emacsGitNox has been renamed to emacs-git-nox, please update your expression." emacs-git-nox;
+  emacsUnstableNox = builtins.trace "emacsUnstableNox has been renamed to emacs-unstable-nox, please update your expression." emacs-unstable-nox;
+  emacsLsp = builtins.trace "emacsLsp has been renamed to emacs-lsp, please update your expression." emacs-lsp;
 }
-- 
cgit 1.4.1


From 88d3f72dcc3d4b87499c54c2c66074d94890721e Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Wed, 31 May 2023 22:17:14 -0700
Subject: Fix indentation

---
 overlays/emacs.nix | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index e0523eb8248e..d19bebc21284 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -89,10 +89,21 @@ let
       ]);
 
   emacs-git = let base = (super.lib.makeOverridable (mkGitEmacs "emacs-git" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; });
-                 # TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
-                 maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = true; } else base;
-             in
-               maybeOverridden.overrideAttrs (
+                  # TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
+                  maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = true; } else base;
+              in
+                maybeOverridden.overrideAttrs (
+                  oa: {
+                    patches = oa.patches ++ [
+                      # XXX: #318
+                      ./bytecomp-revert.patch
+                    ]; }
+                );
+
+  emacs-pgtk = let base = super.lib.makeOverridable (mkGitEmacs "emacs-pgtk" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; withPgtk = true; };
+                   # TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
+                   maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = true; } else base;
+               in maybeOverridden.overrideAttrs (
                  oa: {
                    patches = oa.patches ++ [
                      # XXX: #318
@@ -100,31 +111,20 @@ let
                    ]; }
                );
 
-  emacs-pgtk = let base = super.lib.makeOverridable (mkGitEmacs "emacs-pgtk" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; withPgtk = true; };
-                 # TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
-                  maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = true; } else base;
-              in maybeOverridden.overrideAttrs (
-                oa: {
-                  patches = oa.patches ++ [
-                    # XXX: #318
-                    ./bytecomp-revert.patch
-                  ]; }
-              );
-
   emacs-unstable = let base = super.lib.makeOverridable (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = true; };
-                      # TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
-                      maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = true; } else base;
-                      in maybeOverridden;
+                       # TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
+                       maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = true; } else base;
+                   in maybeOverridden;
 
   emacs-unstable-pgtk = let base = super.lib.makeOverridable (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = true; withPgtk = true; };
-                          # TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
-                          maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = true; } else base;
-                      in maybeOverridden;
+                            # TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
+                            maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = true; } else base;
+                        in maybeOverridden;
 
   emacs-lsp = let base = super.lib.makeOverridable (mkGitEmacs "emacs-lsp" ../repos/emacs/emacs-lsp.json) { };
-                 # TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
-                 maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = false; } else base;
-                 in maybeOverridden;
+                  # TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
+                  maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = false; } else base;
+              in maybeOverridden;
 
   emacs-git-nox = (
     (
-- 
cgit 1.4.1


From 737fe5a55365f51bc3d47ffb0534a45cf0697c89 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Fri, 2 Jun 2023 00:33:07 +1200
Subject: Remove exwm repo

Exwm is in elpa and the update cadence doesn't motivate that we have the special handling around any more.

This removal feels quite funny given that this repository started it's
life as an overlay precisely to get bleeding edge exwm versions, and then grew to other packages from there.

So long exwm repo!
---
 overlays/package.nix | 41 +++--------------------------------------
 repos/exwm/exwm.json |  1 -
 repos/exwm/test.nix  |  9 ---------
 repos/exwm/update    | 27 ---------------------------
 repos/exwm/xelb.json |  1 -
 5 files changed, 3 insertions(+), 76 deletions(-)
 delete mode 100644 repos/exwm/exwm.json
 delete mode 100644 repos/exwm/test.nix
 delete mode 100755 repos/exwm/update
 delete mode 100644 repos/exwm/xelb.json

(limited to 'overlays')

diff --git a/overlays/package.nix b/overlays/package.nix
index 0a07cf99a239..e4d8288fc700 100644
--- a/overlays/package.nix
+++ b/overlays/package.nix
@@ -1,30 +1,4 @@
 self: super:
-let
-  mkExDrv = emacsPackages: name: args:
-    let
-      repoMeta = super.lib.importJSON (../repos/exwm/. + "/${name}.json");
-    in
-    emacsPackages.melpaBuild (
-      args // {
-        pname = name;
-        ename = name;
-        version = repoMeta.version;
-        commit = repoMeta.rev;
-
-        recipe = builtins.toFile "recipe" ''
-          (${name} :fetcher github
-          :repo "ch11ng/${name}")
-        '';
-
-        src = super.fetchFromGitHub {
-          owner = "ch11ng";
-          repo = name;
-          inherit (repoMeta) rev sha256;
-        };
-      }
-    );
-
-in
 {
   emacsPackagesFor = emacs: (
     (super.emacsPackagesFor emacs).overrideScope' (
@@ -46,21 +20,12 @@ in
             generated = ../repos/nongnu/nongnu-generated.nix;
           };
 
-          epkgs = esuper.override {
+        in
+          esuper.override {
             inherit melpaStablePackages melpaPackages elpaPackages
               nongnuPackages;
-          };
+          }
 
-        in
-        epkgs // {
-          xelb = mkExDrv eself "xelb" {
-            packageRequires = [ eself.cl-generic eself.emacs ];
-          };
-
-          exwm = mkExDrv eself "exwm" {
-            packageRequires = [ eself.xelb ];
-          };
-        }
     )
   );
 
diff --git a/repos/exwm/exwm.json b/repos/exwm/exwm.json
deleted file mode 100644
index a5d3c3b42058..000000000000
--- a/repos/exwm/exwm.json
+++ /dev/null
@@ -1 +0,0 @@
-{"rev": "b62d5e79b0c1799f2cd941b4cec5bf8492cb322c", "sha256": "1i2as2i5vq8xmia36qajdz6z05g2mpz21p106d44az1h4b2jxz5j", "version": "20221122.0"}
diff --git a/repos/exwm/test.nix b/repos/exwm/test.nix
deleted file mode 100644
index 865476ebbcbc..000000000000
--- a/repos/exwm/test.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ pkgs ? import <nixpkgs> { overlays = [ (import ../../default.nix) ]; } }:
-
-let
-  package = pkgs.emacs;
-  emacsPackages = pkgs.emacsPackagesFor package;
-  emacsWithPackages = emacsPackages.emacsWithPackages;
-in emacsWithPackages(epkgs: [
-  epkgs.exwm
-])
diff --git a/repos/exwm/update b/repos/exwm/update
deleted file mode 100755
index 97971d6058e3..000000000000
--- a/repos/exwm/update
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env nix-shell
-#! nix-shell -i bash -p curl xmlstarlet nix coreutils
-set -euxo pipefail
-
-SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
-cd $SCRIPTPATH
-
-function update_repo() {
-    owner=$1
-    repo=$2
-    echo $repo
-
-    # Get relevant data (commit id and timestamp) for the latest commit
-    commit_data=$(curl "https://github.com/$owner/$repo/commits/master.atom" | xmlstarlet sel -N atom="http://www.w3.org/2005/Atom" -t -m /atom:feed/atom:entry -v "concat(atom:id,'/',atom:updated)" -n | head -n 1)
-
-    # Extract commit sha and build a version number based on date: YYYYMMDD.0
-    commit_sha=$(echo $commit_data | cut -d '/' -f 2)
-    version_number=$(echo $commit_data | cut -d '/' -f 3 | cut -d 'T' -f 1 | sed 's/-//g').0
-
-    digest=$(nix-prefetch-url --unpack "https://github.com/$owner/$repo/archive/${commit_sha}.tar.gz")
-    echo "{\"rev\": \"${commit_sha}\", \"sha256\": \"${digest}\", \"version\": \"${version_number}\"}" > $repo.json
-}
-
-update_repo ch11ng exwm
-update_repo ch11ng xelb
-
-nix-build --no-out-link --show-trace ./test.nix
diff --git a/repos/exwm/xelb.json b/repos/exwm/xelb.json
deleted file mode 100644
index 35fe0be49aed..000000000000
--- a/repos/exwm/xelb.json
+++ /dev/null
@@ -1 +0,0 @@
-{"rev": "df102a5773b37cec154e795a17a8513144dde643", "sha256": "10vlghs3610krmigszzainwjjrgdf66pxg6hd88lzicmki8gjypd", "version": "20200719.0"}
-- 
cgit 1.4.1


From ec3643e9cf2e09e9a328ae53de7c602b05c07b61 Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Mon, 5 Jun 2023 04:59:35 -0700
Subject: Account for upstream renaming

See https://github.com/NixOS/nixpkgs/pull/235859
---
 overlays/emacs.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index d19bebc21284..d8ecc21e3945 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -90,7 +90,7 @@ let
 
   emacs-git = let base = (super.lib.makeOverridable (mkGitEmacs "emacs-git" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; });
                   # TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
-                  maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = true; } else base;
+                  maybeOverridden = if (super.lib.hasAttr "treeSitter" base || super.lib.hasAttr "withTreeSitter" base) then base.override { withTreeSitter = true; } else base;
               in
                 maybeOverridden.overrideAttrs (
                   oa: {
@@ -102,7 +102,7 @@ let
 
   emacs-pgtk = let base = super.lib.makeOverridable (mkGitEmacs "emacs-pgtk" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; withPgtk = true; };
                    # TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
-                   maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = true; } else base;
+                   maybeOverridden = if (super.lib.hasAttr "treeSitter" base || super.lib.hasAttr "withTreeSitter" base) then base.override { withTreeSitter = true; } else base;
                in maybeOverridden.overrideAttrs (
                  oa: {
                    patches = oa.patches ++ [
@@ -113,17 +113,17 @@ let
 
   emacs-unstable = let base = super.lib.makeOverridable (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = true; };
                        # TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
-                       maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = true; } else base;
+                       maybeOverridden = if (super.lib.hasAttr "treeSitter" base || super.lib.hasAttr "withTreeSitter" base) then base.override { withTreeSitter = true; } else base;
                    in maybeOverridden;
 
   emacs-unstable-pgtk = let base = super.lib.makeOverridable (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = true; withPgtk = true; };
                             # TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
-                            maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = true; } else base;
+                            maybeOverridden = if (super.lib.hasAttr "treeSitter" base || super.lib.hasAttr "withTreeSitter" base) then base.override { withTreeSitter = true; } else base;
                         in maybeOverridden;
 
   emacs-lsp = let base = super.lib.makeOverridable (mkGitEmacs "emacs-lsp" ../repos/emacs/emacs-lsp.json) { };
                   # TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
-                  maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = false; } else base;
+                  maybeOverridden = if (super.lib.hasAttr "treeSitter" base || super.lib.hasAttr "withTreeSitter" base) then base.override { withTreeSitter = false; } else base;
               in maybeOverridden;
 
   emacs-git-nox = (
-- 
cgit 1.4.1


From eb1d1ce028583d406ea5f6ccb8110d184600af7d Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Wed, 7 Jun 2023 18:26:39 -0700
Subject: Add elpaDevelPackages

---
 overlays/package.nix                |    6 +-
 repos/elpa/elpa-devel-generated.nix | 6775 +++++++++++++++++++++++++++++++++++
 repos/elpa/update                   |    5 +
 3 files changed, 6785 insertions(+), 1 deletion(-)
 create mode 100644 repos/elpa/elpa-devel-generated.nix

(limited to 'overlays')

diff --git a/overlays/package.nix b/overlays/package.nix
index e4d8288fc700..bc2979926997 100644
--- a/overlays/package.nix
+++ b/overlays/package.nix
@@ -12,6 +12,10 @@ self: super:
             archiveJson = ../repos/melpa/recipes-archive-melpa.json;
           };
 
+          elpaDevelPackages = esuper.elpaDevelPackages.override {
+            generated = ../repos/elpa/elpa-devel-generated.nix;
+          };
+
           elpaPackages = esuper.elpaPackages.override {
             generated = ../repos/elpa/elpa-generated.nix;
           };
@@ -22,7 +26,7 @@ self: super:
 
         in
           esuper.override {
-            inherit melpaStablePackages melpaPackages elpaPackages
+            inherit melpaStablePackages melpaPackages elpaDevelPackages elpaPackages
               nongnuPackages;
           }
 
diff --git a/repos/elpa/elpa-devel-generated.nix b/repos/elpa/elpa-devel-generated.nix
new file mode 100644
index 000000000000..3855c23ad6c1
--- /dev/null
+++ b/repos/elpa/elpa-devel-generated.nix
@@ -0,0 +1,6775 @@
+{ callPackage }:
+  {
+    ace-window = callPackage ({ avy
+                              , elpaBuild
+                              , fetchurl
+                              , lib }:
+      elpaBuild {
+        pname = "ace-window";
+        ename = "ace-window";
+        version = "0.10.0.0.20220911.35841";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/ace-window-0.10.0.0.20220911.35841.tar";
+          sha256 = "1q506qdi55rg2c9z3555klsqy5sxqpii11mx69l8x76a33a0j1f4";
+        };
+        packageRequires = [ avy ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ace-window.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ack = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "ack";
+        ename = "ack";
+        version = "1.11.0.20220924.84123";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/ack-1.11.0.20220924.84123.tar";
+          sha256 = "1npl618r6g25mzkibj0x4l31kqws73w9aid6ichm0ql9mi6pry5m";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ack.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ada-mode = callPackage ({ elpaBuild
+                            , emacs
+                            , fetchurl
+                            , gnat-compiler
+                            , lib
+                            , uniquify-files
+                            , wisi }:
+      elpaBuild {
+        pname = "ada-mode";
+        ename = "ada-mode";
+        version = "8.0.5.0.20230208.70712";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/ada-mode-8.0.5.0.20230208.70712.tar";
+          sha256 = "1957w6fynk345iwhgc4iq7zlda3fi211r7vi5420g761568wp4ca";
+        };
+        packageRequires = [ emacs gnat-compiler uniquify-files wisi ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ada-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ada-ref-man = callPackage ({ elpaBuild
+                               , fetchurl
+                               , lib }:
+      elpaBuild {
+        pname = "ada-ref-man";
+        ename = "ada-ref-man";
+        version = "2020.1.0.20201129.190419";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/ada-ref-man-2020.1.0.20201129.190419.tar";
+          sha256 = "0pvlfgq4b2a4d7452b3y0ns3saq8497fq9m62pi4ylqnqwjkfy61";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ada-ref-man.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    adaptive-wrap = callPackage ({ elpaBuild
+                                 , fetchurl
+                                 , lib }:
+      elpaBuild {
+        pname = "adaptive-wrap";
+        ename = "adaptive-wrap";
+        version = "0.8.0.20210602.91446";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/adaptive-wrap-0.8.0.20210602.91446.tar";
+          sha256 = "1fm3bx1qyv1ridj6inzr8qyw2fzj6fzcrzf57zs2lsfkvj7b5knd";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/adaptive-wrap.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    adjust-parens = callPackage ({ elpaBuild
+                                 , fetchurl
+                                 , lib }:
+      elpaBuild {
+        pname = "adjust-parens";
+        ename = "adjust-parens";
+        version = "3.1.0.20221221.73810";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/adjust-parens-3.1.0.20221221.73810.tar";
+          sha256 = "1p56b0pkyw6csl3wy1gi3ys2jzlm867bw3ca04ssm6l1lypirhg8";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/adjust-parens.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    advice-patch = callPackage ({ elpaBuild
+                                , emacs
+                                , fetchurl
+                                , lib }:
+      elpaBuild {
+        pname = "advice-patch";
+        ename = "advice-patch";
+        version = "0.1.0.20201220.233221";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/advice-patch-0.1.0.20201220.233221.tar";
+          sha256 = "09ivqir4b5rr1h7mc5g9czr5d9iig10zxvwjnnx12qzqaqwz2yvr";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/advice-patch.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    aggressive-completion = callPackage ({ elpaBuild
+                                         , emacs
+                                         , fetchurl
+                                         , lib }:
+      elpaBuild {
+        pname = "aggressive-completion";
+        ename = "aggressive-completion";
+        version = "1.7.0.20220417.71805";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/aggressive-completion-1.7.0.20220417.71805.tar";
+          sha256 = "0kizmb64l0dbrgyj0wzbpdxpyr060myval62y5i88an74fvjli60";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/aggressive-completion.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    aggressive-indent = callPackage ({ elpaBuild
+                                     , emacs
+                                     , fetchurl
+                                     , lib }:
+      elpaBuild {
+        pname = "aggressive-indent";
+        ename = "aggressive-indent";
+        version = "1.10.0.0.20230112.100030";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/aggressive-indent-1.10.0.0.20230112.100030.tar";
+          sha256 = "0jjai48mf0j8b9dcxi9rlrpcpbz2cm2y6iqbi2f7q8012166hvgs";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/aggressive-indent.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    agitate = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "agitate";
+        ename = "agitate";
+        version = "0.0.20230101.152816";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/agitate-0.0.20230101.152816.tar";
+          sha256 = "0a8xgi19b5zc585mmr23dfif2zfbwgdhybrvk5nkc8lc2ifmnf60";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/agitate.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ahungry-theme = callPackage ({ elpaBuild
+                                 , emacs
+                                 , fetchurl
+                                 , lib }:
+      elpaBuild {
+        pname = "ahungry-theme";
+        ename = "ahungry-theme";
+        version = "1.10.0.0.20211231.115425";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/ahungry-theme-1.10.0.0.20211231.115425.tar";
+          sha256 = "0irq26pxgv31ak0wrwy1smhfazsc3nvn99ki3zq21h1d31i2xhcr";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ahungry-theme.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    aircon-theme = callPackage ({ elpaBuild
+                                , emacs
+                                , fetchurl
+                                , lib }:
+      elpaBuild {
+        pname = "aircon-theme";
+        ename = "aircon-theme";
+        version = "0.0.6.0.20220827.93355";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/aircon-theme-0.0.6.0.20220827.93355.tar";
+          sha256 = "0p2svw1db5km3ks2ywb38lsqh0y54ng8wgmh1s80mzvcflc8gia6";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/aircon-theme.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    all = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "all";
+        ename = "all";
+        version = "1.0.0.20221221.74133";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/all-1.0.0.20221221.74133.tar";
+          sha256 = "0mg5fhfw8n33whx6yg969jwcxlqjgmxvfrh00mq31hzwhppjy293";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/all.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    altcaps = callPackage ({ elpaBuild
+                           , emacs
+                           , fetchurl
+                           , lib }:
+      elpaBuild {
+        pname = "altcaps";
+        ename = "altcaps";
+        version = "1.1.0.0.20230101.152850";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/altcaps-1.1.0.0.20230101.152850.tar";
+          sha256 = "112c8yv5vbz78j83qacv0d97lxmxyr7m3mk0l7hm7556424y5v3v";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/altcaps.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ampc = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "ampc";
+        ename = "ampc";
+        version = "0.2.0.20221214.153219";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/ampc-0.2.0.20221214.153219.tar";
+          sha256 = "1smb3217kz0dj495d0hy6zkin30xaba4a574d74va3hv0n5485lb";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ampc.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    arbitools = callPackage ({ cl-lib ? null
+                             , elpaBuild
+                             , fetchurl
+                             , lib }:
+      elpaBuild {
+        pname = "arbitools";
+        ename = "arbitools";
+        version = "0.977.0.20221212.221354";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/arbitools-0.977.0.20221212.221354.tar";
+          sha256 = "1fxm44g6ymvzcz784v48c4114kf23h8qylc5fnirla9bk0lhwqpj";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/arbitools.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ascii-art-to-unicode = callPackage ({ elpaBuild
+                                        , fetchurl
+                                        , lib }:
+      elpaBuild {
+        pname = "ascii-art-to-unicode";
+        ename = "ascii-art-to-unicode";
+        version = "1.13.0.20221221.74335";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/ascii-art-to-unicode-1.13.0.20221221.74335.tar";
+          sha256 = "0hqaw76say538jzbhizrdm57g0k42jhwirq11hbfc8iwckv26xjp";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ascii-art-to-unicode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    async = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "async";
+        ename = "async";
+        version = "1.9.7.0.20230528.62258";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/async-1.9.7.0.20230528.62258.tar";
+          sha256 = "15gl3p29id1gzza6m39q9w23yiydfhcq7ckk0m8hj8i1y5d7bb7n";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/async.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auctex = callPackage ({ elpaBuild
+                          , emacs
+                          , fetchurl
+                          , lib }:
+      elpaBuild {
+        pname = "auctex";
+        ename = "auctex";
+        version = "13.2.0.0.20230424.174359";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/auctex-13.2.0.0.20230424.174359.tar";
+          sha256 = "1p5xy6hhpsvjd14vdb3bsdvcmalgn9nc0a73fjslpfv7n8kzh94s";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/auctex.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    aumix-mode = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "aumix-mode";
+        ename = "aumix-mode";
+        version = "7.0.20221221.74552";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/aumix-mode-7.0.20221221.74552.tar";
+          sha256 = "0ksihp1qa9n1290qpf7ahxxpbp4q9pwbpvk6ybgjcjdb4pjgfyms";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/aumix-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-correct = callPackage ({ elpaBuild
+                                , fetchurl
+                                , lib }:
+      elpaBuild {
+        pname = "auto-correct";
+        ename = "auto-correct";
+        version = "1.1.4.0.20221221.74656";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/auto-correct-1.1.4.0.20221221.74656.tar";
+          sha256 = "0w9q0ibghmafbwla8wxnfki1fidb476cvsx37v3bs4pvq2kkcphk";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/auto-correct.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-header = callPackage ({ elpaBuild
+                               , fetchurl
+                               , lib }:
+      elpaBuild {
+        pname = "auto-header";
+        ename = "auto-header";
+        version = "0.1.2.0.20230407.82136";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/auto-header-0.1.2.0.20230407.82136.tar";
+          sha256 = "1h455ikypf1sd082r7i59yldm4p794a3w1ya7qfzcwvfhygdzdgz";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/auto-header.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-overlays = callPackage ({ cl-lib ? null
+                                 , elpaBuild
+                                 , fetchurl
+                                 , lib }:
+      elpaBuild {
+        pname = "auto-overlays";
+        ename = "auto-overlays";
+        version = "0.10.10.0.20201215.220815";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/auto-overlays-0.10.10.0.20201215.220815.tar";
+          sha256 = "18lq41am7psh7kbf7yxk5qqhiddjzjqkb1pv0zn0vbps7pka68qh";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/auto-overlays.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    autocrypt = callPackage ({ elpaBuild
+                             , emacs
+                             , fetchurl
+                             , lib }:
+      elpaBuild {
+        pname = "autocrypt";
+        ename = "autocrypt";
+        version = "0.4.1.0.20230505.70117";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/autocrypt-0.4.1.0.20230505.70117.tar";
+          sha256 = "1g83wm21a56w056bj97ciqalw464ra3bfhp1m66jiw7v06ppgi56";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/autocrypt.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    avy = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "avy";
+        ename = "avy";
+        version = "0.5.0.0.20230424.65712";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/avy-0.5.0.0.20230424.65712.tar";
+          sha256 = "08kbfjwjbkbgbkkc51nmcbs9qq1hw8gv1z8h1knry8clvh23k735";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/avy.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bbdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "bbdb";
+        ename = "bbdb";
+        version = "3.2.2.2.0.20220705.233849";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/bbdb-3.2.2.2.0.20220705.233849.tar";
+          sha256 = "1041nqxs8sp34zvpahn6x603hx8i2zc65jp6ygd611z7rb2mwd5x";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/bbdb.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    beacon = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "beacon";
+        ename = "beacon";
+        version = "1.3.4.0.20220729.220057";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/beacon-1.3.4.0.20220729.220057.tar";
+          sha256 = "0wcc9hw6h1b3p1s506mc7zgjhhcb1bc4wq1bplax62lg2jyxiaks";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/beacon.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    beframe = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "beframe";
+        ename = "beframe";
+        version = "0.3.0.0.20230521.62220";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/beframe-0.3.0.0.20230521.62220.tar";
+          sha256 = "0hr2yqasiq7l4alvi96jjq23rz9g2dpsvg3mrfph01qarnhnwhga";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/beframe.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bind-key = callPackage ({ elpaBuild
+                            , emacs
+                            , fetchurl
+                            , lib }:
+      elpaBuild {
+        pname = "bind-key";
+        ename = "bind-key";
+        version = "2.4.1.0.20230101.54747";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/bind-key-2.4.1.0.20230101.54747.tar";
+          sha256 = "0x6h8kbigak7m8570jz40iym0mzsjran090391f99dn6ka7qdsp2";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/bind-key.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    blist = callPackage ({ elpaBuild, emacs, fetchurl, ilist, lib }:
+      elpaBuild {
+        pname = "blist";
+        ename = "blist";
+        version = "0.2.0.20220913.173909";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/blist-0.2.0.20220913.173909.tar";
+          sha256 = "0sjw36rlz714l3v8wlzk6hjsxvy082dl6wvszbxd60a6avysazip";
+        };
+        packageRequires = [ emacs ilist ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/blist.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bluetooth = callPackage ({ dash
+                             , elpaBuild
+                             , emacs
+                             , fetchurl
+                             , lib }:
+      elpaBuild {
+        pname = "bluetooth";
+        ename = "bluetooth";
+        version = "0.3.1.0.20230119.122638";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/bluetooth-0.3.1.0.20230119.122638.tar";
+          sha256 = "1wzv7wlpimqiagli02s87i75lj2xb33jld5w9xqnfnks2xvh7srl";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/bluetooth.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bnf-mode = callPackage ({ cl-lib ? null
+                            , elpaBuild
+                            , emacs
+                            , fetchurl
+                            , lib }:
+      elpaBuild {
+        pname = "bnf-mode";
+        ename = "bnf-mode";
+        version = "0.4.5.0.20221205.150230";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/bnf-mode-0.4.5.0.20221205.150230.tar";
+          sha256 = "0rlg12z0dxy190c15p09inpnms374xxr5zv3h4gn9ilbb5g5r7d4";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/bnf-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    boxy = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "boxy";
+        ename = "boxy";
+        version = "1.1.3.0.20230408.95238";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/boxy-1.1.3.0.20230408.95238.tar";
+          sha256 = "0hzfrbc20qn9ld51ivkvclphsvc2qqq4ir056d2d9bjxq56zndl6";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/boxy.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    boxy-headings = callPackage ({ boxy
+                                 , elpaBuild
+                                 , emacs
+                                 , fetchurl
+                                 , lib
+                                 , org }:
+      elpaBuild {
+        pname = "boxy-headings";
+        ename = "boxy-headings";
+        version = "2.1.4.0.20221114.84552";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/boxy-headings-2.1.4.0.20221114.84552.tar";
+          sha256 = "1ximn07ri3wga73alglzlfmqly52v2dbr3y1hp6syv5m3mxk248f";
+        };
+        packageRequires = [ boxy emacs org ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/boxy-headings.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    brief = callPackage ({ cl-lib ? null
+                         , elpaBuild
+                         , fetchurl
+                         , lib
+                         , nadvice }:
+      elpaBuild {
+        pname = "brief";
+        ename = "brief";
+        version = "5.88.22.2.0.20230201.162442";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/brief-5.88.22.2.0.20230201.162442.tar";
+          sha256 = "0aviny6xvw2riy6rx6jdym5ay4wzd5fjian9y5zrvrcri19382dc";
+        };
+        packageRequires = [ cl-lib nadvice ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/brief.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    buffer-env = callPackage ({ compat
+                              , elpaBuild
+                              , emacs
+                              , fetchurl
+                              , lib }:
+      elpaBuild {
+        pname = "buffer-env";
+        ename = "buffer-env";
+        version = "0.4.0.20221130.201504";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/buffer-env-0.4.0.20221130.201504.tar";
+          sha256 = "1kf3cns7jqwv2w8laq9avn908yswy32x7q8l7vbidf5qlkj1iy5h";
+        };
+        packageRequires = [ compat emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/buffer-env.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    buffer-expose = callPackage ({ cl-lib ? null
+                                 , elpaBuild
+                                 , emacs
+                                 , fetchurl
+                                 , lib }:
+      elpaBuild {
+        pname = "buffer-expose";
+        ename = "buffer-expose";
+        version = "0.4.3.0.20190429.135558";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/buffer-expose-0.4.3.0.20190429.135558.tar";
+          sha256 = "0s11p8dlycv14j94599d33bkp3hhpvjq5a3jrmx9rynamhzvfig9";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/buffer-expose.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bug-hunter = callPackage ({ cl-lib ? null
+                              , elpaBuild
+                              , fetchurl
+                              , lib
+                              , seq }:
+      elpaBuild {
+        pname = "bug-hunter";
+        ename = "bug-hunter";
+        version = "1.3.1.0.20201128.92354";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/bug-hunter-1.3.1.0.20201128.92354.tar";
+          sha256 = "0gis7vrjrh0khjl71mb5vsbfhcwph0yv5c11wmwa3jc4n1wgxiq9";
+        };
+        packageRequires = [ cl-lib seq ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/bug-hunter.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    calibre = callPackage ({ compat
+                           , elpaBuild
+                           , emacs
+                           , fetchurl
+                           , lib }:
+      elpaBuild {
+        pname = "calibre";
+        ename = "calibre";
+        version = "1.3.3.0.20230520.233506";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/calibre-1.3.3.0.20230520.233506.tar";
+          sha256 = "1r1vc446q1f90vzk74mdygnjfc9qrbc1fc6gwpq7kv8m56n96giw";
+        };
+        packageRequires = [ compat emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/calibre.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cape = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "cape";
+        ename = "cape";
+        version = "0.15.0.20230606.90445";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/cape-0.15.0.20230606.90445.tar";
+          sha256 = "0r63wp2h7qf7na1jcj1brgw86bvs3fs5xb2a3r24832wd0j5shic";
+        };
+        packageRequires = [ compat emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/cape.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    capf-autosuggest = callPackage ({ elpaBuild
+                                    , emacs
+                                    , fetchurl
+                                    , lib }:
+      elpaBuild {
+        pname = "capf-autosuggest";
+        ename = "capf-autosuggest";
+        version = "0.3.0.20211123.104430";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/capf-autosuggest-0.3.0.20211123.104430.tar";
+          sha256 = "17ih1lbsiydazwdn8caqnw8fm31yfyq8aqmcyv85y1w8zlnb6x4j";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/capf-autosuggest.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    caps-lock = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "caps-lock";
+        ename = "caps-lock";
+        version = "1.0.0.20221221.74713";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/caps-lock-1.0.0.20221221.74713.tar";
+          sha256 = "1wylgdwfm9pf0fpj53fprn7dknv3ldkf74xibgndh5i8xn11d036";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/caps-lock.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    captain = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "captain";
+        ename = "captain";
+        version = "1.0.3.0.20221221.74732";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/captain-1.0.3.0.20221221.74732.tar";
+          sha256 = "03zgffj8lbh4y6gg8dr40kxcm8pnllzfy3jbsapmw98ps9qnahi7";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/captain.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    chess = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "chess";
+        ename = "chess";
+        version = "2.0.5.0.20220926.150547";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/chess-2.0.5.0.20220926.150547.tar";
+          sha256 = "0wdyq7a142r57f9qa77gcvdld9mlh3nqjm0jyz8z7xwjz1km395b";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/chess.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cl-generic = callPackage ({ elpaBuild
+                              , fetchurl
+                              , lib }:
+      elpaBuild {
+        pname = "cl-generic";
+        ename = "cl-generic";
+        version = "0.3.0.20221221.74800";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/cl-generic-0.3.0.20221221.74800.tar";
+          sha256 = "12yqi7fc59rblh4asf94a4fj8qj873qs20bgjydp2djkrh4xas62";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/cl-generic.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cl-lib = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "cl-lib";
+        ename = "cl-lib";
+        version = "0.7.1.0.20221221.74809";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/cl-lib-0.7.1.0.20221221.74809.tar";
+          sha256 = "18wfqbdibz62bisphcw91rpd3jacs7i24lib7l3wg9pf2563p98i";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/cl-lib.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    clipboard-collector = callPackage ({ elpaBuild
+                                       , emacs
+                                       , fetchurl
+                                       , lib }:
+      elpaBuild {
+        pname = "clipboard-collector";
+        ename = "clipboard-collector";
+        version = "0.3.0.20190215.154741";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/clipboard-collector-0.3.0.20190215.154741.tar";
+          sha256 = "1hjvwqi089r3wrs5771i1sjgmk63gk9m9a88gxnk99vzvh6r31dq";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/clipboard-collector.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cobol-mode = callPackage ({ cl-lib ? null
+                              , elpaBuild
+                              , fetchurl
+                              , lib }:
+      elpaBuild {
+        pname = "cobol-mode";
+        ename = "cobol-mode";
+        version = "1.1.0.20221221.74904";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/cobol-mode-1.1.0.20221221.74904.tar";
+          sha256 = "1c3axx65bycr44hjy1cw4c9z89l3sqq16d2yk2animms3iwajvl0";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/cobol-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    code-cells = callPackage ({ elpaBuild
+                              , emacs
+                              , fetchurl
+                              , lib }:
+      elpaBuild {
+        pname = "code-cells";
+        ename = "code-cells";
+        version = "0.3.0.20220917.143159";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/code-cells-0.3.0.20220917.143159.tar";
+          sha256 = "1amsw75dm7d1iz9cj6nl36acg0im4yjx7x8xrf9a5252jnzz5xsw";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/code-cells.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    comint-mime = callPackage ({ elpaBuild
+                               , emacs
+                               , fetchurl
+                               , lib }:
+      elpaBuild {
+        pname = "comint-mime";
+        ename = "comint-mime";
+        version = "0.3.0.20230528.142235";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/comint-mime-0.3.0.20230528.142235.tar";
+          sha256 = "0b4mwcfrnydjlqvljw61q2lnc2967lxlfmfz1ypyimcv7ijc2h7d";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/comint-mime.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    compact-docstrings = callPackage ({ elpaBuild
+                                      , fetchurl
+                                      , lib }:
+      elpaBuild {
+        pname = "compact-docstrings";
+        ename = "compact-docstrings";
+        version = "0.2.0.20220305.183958";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/compact-docstrings-0.2.0.20220305.183958.tar";
+          sha256 = "0xmhvfrla7la127hkj0jpam0laq495q4gfa3kbw4p3p3m070jxks";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/compact-docstrings.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company = callPackage ({ elpaBuild
+                           , emacs
+                           , fetchurl
+                           , lib }:
+      elpaBuild {
+        pname = "company";
+        ename = "company";
+        version = "0.9.13.0.20230416.203422";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/company-0.9.13.0.20230416.203422.tar";
+          sha256 = "1iwzhz938s11fwndiv59qcviqc5gwam08a6ygamlzr4z626i5zyh";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/company.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-ebdb = callPackage ({ company
+                                , ebdb
+                                , elpaBuild
+                                , fetchurl
+                                , lib }:
+      elpaBuild {
+        pname = "company-ebdb";
+        ename = "company-ebdb";
+        version = "1.1.0.20221221.74915";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/company-ebdb-1.1.0.20221221.74915.tar";
+          sha256 = "1nh7jwlwd8wji5s3ywzlwj7vyqjn6jllrywi6mjk9bwyg5yhyd8a";
+        };
+        packageRequires = [ company ebdb ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/company-ebdb.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-math = callPackage ({ company
+                                , elpaBuild
+                                , fetchurl
+                                , lib
+                                , math-symbol-lists }:
+      elpaBuild {
+        pname = "company-math";
+        ename = "company-math";
+        version = "1.5.1.0.20221227.132907";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/company-math-1.5.1.0.20221227.132907.tar";
+          sha256 = "10jm0vb9z3pkh681vdd2ggi6pvhykghmalgib20pgcnm383kwpcn";
+        };
+        packageRequires = [ company math-symbol-lists ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/company-math.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-statistics = callPackage ({ company
+                                      , elpaBuild
+                                      , emacs
+                                      , fetchurl
+                                      , lib }:
+      elpaBuild {
+        pname = "company-statistics";
+        ename = "company-statistics";
+        version = "0.2.3.0.20170210.193350";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/company-statistics-0.2.3.0.20170210.193350.tar";
+          sha256 = "140281sy7w5pj3dkidlgi130axrzwh0y8z3ivkpk55bypdaardlw";
+        };
+        packageRequires = [ company emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/company-statistics.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    compat = callPackage ({ elpaBuild
+                          , emacs
+                          , fetchurl
+                          , lib
+                          , seq }:
+      elpaBuild {
+        pname = "compat";
+        ename = "compat";
+        version = "29.1.4.1.0.20230524.90557";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/compat-29.1.4.1.0.20230524.90557.tar";
+          sha256 = "0k3g7mi18hcxz6jprqjw23mc82v9935vavffg1x96xmnbk633fpm";
+        };
+        packageRequires = [ emacs seq ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/compat.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    consult = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "consult";
+        ename = "consult";
+        version = "0.34.0.20230606.101010";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/consult-0.34.0.20230606.101010.tar";
+          sha256 = "0v54ajplk92jfs37qi3w4gl2hzinabq6kwqjqfsk5was473dxh5r";
+        };
+        packageRequires = [ compat emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/consult.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    consult-recoll = callPackage ({ consult
+                                  , elpaBuild
+                                  , emacs
+                                  , fetchurl
+                                  , lib }:
+      elpaBuild {
+        pname = "consult-recoll";
+        ename = "consult-recoll";
+        version = "0.8.0.20221014.200255";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/consult-recoll-0.8.0.20221014.200255.tar";
+          sha256 = "063l4p54bjmk9x9ajcjpb1qc1lz9w7jfcd5vz95jv17imwy0pzzg";
+        };
+        packageRequires = [ consult emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/consult-recoll.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    context-coloring = callPackage ({ elpaBuild
+                                    , emacs
+                                    , fetchurl
+                                    , lib }:
+      elpaBuild {
+        pname = "context-coloring";
+        ename = "context-coloring";
+        version = "8.1.0.0.20201127.182211";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/context-coloring-8.1.0.0.20201127.182211.tar";
+          sha256 = "0mbj7awrnifn3jb0i9s25535h41pk45fz6n0m5p5nq3jjyhj6z62";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/context-coloring.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    corfu = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "corfu";
+        ename = "corfu";
+        version = "0.36.0.20200206.121427";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/corfu-0.36.0.20200206.121427.tar";
+          sha256 = "169mwgip42rcin1bs76lq0586wzh4acllxdzgqq8nhb15ja90k1z";
+        };
+        packageRequires = [ compat emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/corfu.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    coterm = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "coterm";
+        ename = "coterm";
+        version = "1.6.0.20221015.160420";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/coterm-1.6.0.20221015.160420.tar";
+          sha256 = "0n5694klkdki9q363mknr4qwvr6q28lb6ss27v3pw0mzh91gavzp";
+        };
+        packageRequires = [ compat emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/coterm.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    counsel = callPackage ({ elpaBuild
+                           , emacs
+                           , fetchurl
+                           , ivy
+                           , lib
+                           , swiper }:
+      elpaBuild {
+        pname = "counsel";
+        ename = "counsel";
+        version = "0.14.0.0.20230410.182848";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/counsel-0.14.0.0.20230410.182848.tar";
+          sha256 = "0lqrbw1b9xypfsnjp4mijas0xi6h6bsrvv5maclvlnfp7pc7xbls";
+        };
+        packageRequires = [ emacs ivy swiper ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/counsel.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cpio-mode = callPackage ({ elpaBuild
+                             , emacs
+                             , fetchurl
+                             , lib }:
+      elpaBuild {
+        pname = "cpio-mode";
+        ename = "cpio-mode";
+        version = "0.17.0.20211211.193556";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/cpio-mode-0.17.0.20211211.193556.tar";
+          sha256 = "064yc4hs6ci80a231mlv3688ys9p8z5aabfg2s2ya1kkmpwra4f2";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/cpio-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cpupower = callPackage ({ elpaBuild
+                            , fetchurl
+                            , lib }:
+      elpaBuild {
+        pname = "cpupower";
+        ename = "cpupower";
+        version = "1.0.5.0.20220514.74621";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/cpupower-1.0.5.0.20220514.74621.tar";
+          sha256 = "0r9rivdclr9s76kllwvi3smwf3ij1dxssbfc1wrkxpw4wav2bci6";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/cpupower.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    crdt = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "crdt";
+        ename = "crdt";
+        version = "0.3.5.0.20230213.22302";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/crdt-0.3.5.0.20230213.22302.tar";
+          sha256 = "1hpkxpr88g4lpq7kxb15xhm3gpks5rz4vfdkkrkflh1wm3bpf4ah";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/crdt.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    crisp = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "crisp";
+        ename = "crisp";
+        version = "1.3.6.0.20221221.74923";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/crisp-1.3.6.0.20221221.74923.tar";
+          sha256 = "1jjl6hv0qib5519p5xigbiydz2f2h0fy773abnga7lvzx57rgppi";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/crisp.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    csharp-mode = callPackage ({ elpaBuild
+                               , emacs
+                               , fetchurl
+                               , lib }:
+      elpaBuild {
+        pname = "csharp-mode";
+        ename = "csharp-mode";
+        version = "2.0.0.0.20221205.181941";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/csharp-mode-2.0.0.0.20221205.181941.tar";
+          sha256 = "0fl1v45apz448pqnz0psi6w4inakdxv54wydc99sjq8l3lm8ldrm";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/csharp-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    csv-mode = callPackage ({ cl-lib ? null
+                            , elpaBuild
+                            , emacs
+                            , fetchurl
+                            , lib }:
+      elpaBuild {
+        pname = "csv-mode";
+        ename = "csv-mode";
+        version = "1.22.0.20230208.161318";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/csv-mode-1.22.0.20230208.161318.tar";
+          sha256 = "0jzna3i4dbz4lvpnvjm7lsggk71wiq0bdcgq4h2rcs6lqsr559dp";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/csv-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cursory = callPackage ({ elpaBuild
+                           , emacs
+                           , fetchurl
+                           , lib }:
+      elpaBuild {
+        pname = "cursory";
+        ename = "cursory";
+        version = "0.3.0.0.20230101.152922";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/cursory-0.3.0.0.20230101.152922.tar";
+          sha256 = "1vnp9bh6g2jarzlq37lln05rqr2x3i6pv64s1g5fq7r0cw238p90";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/cursory.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cycle-quotes = callPackage ({ elpaBuild
+                                , fetchurl
+                                , lib }:
+      elpaBuild {
+        pname = "cycle-quotes";
+        ename = "cycle-quotes";
+        version = "0.1.0.20221221.75021";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/cycle-quotes-0.1.0.20221221.75021.tar";
+          sha256 = "07gp0bbwajm44n24wywj7la1jdy9hrid6j9cj0cxhv3gdg3681z2";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/cycle-quotes.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    darkroom = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "darkroom";
+        ename = "darkroom";
+        version = "0.3.0.20200507.173652";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/darkroom-0.3.0.20200507.173652.tar";
+          sha256 = "1njijhakvxqh6ik3krrz3zz97asfxmaxs7dz3wsnkmmcy9x0bbjb";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/darkroom.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dash = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "dash";
+        ename = "dash";
+        version = "2.19.1.0.20230502.132438";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/dash-2.19.1.0.20230502.132438.tar";
+          sha256 = "1jjy8izqb3s0zald16zjigpvl81kvmjax5b3wn34abik6nkvaypl";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/dash.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dbus-codegen = callPackage ({ cl-lib ? null
+                                , elpaBuild
+                                , fetchurl
+                                , lib }:
+      elpaBuild {
+        pname = "dbus-codegen";
+        ename = "dbus-codegen";
+        version = "0.1.0.20220306.62546";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/dbus-codegen-0.1.0.20220306.62546.tar";
+          sha256 = "0s2ax0vqbh69dan5vdgy2dc2qfsfbxk4cqnxwysbhhpc7qqd7ljq";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/dbus-codegen.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    debbugs = callPackage ({ elpaBuild, emacs, fetchurl, lib, soap-client }:
+      elpaBuild {
+        pname = "debbugs";
+        ename = "debbugs";
+        version = "0.35.0.20221213.83424";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/debbugs-0.35.0.20221213.83424.tar";
+          sha256 = "10s6vqvb4l136xry4683ahdq42s71bx19cvhip0x91rslcd6rrbd";
+        };
+        packageRequires = [ emacs soap-client ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/debbugs.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    delight = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }:
+      elpaBuild {
+        pname = "delight";
+        ename = "delight";
+        version = "1.7.0.20200711.42851";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/delight-1.7.0.20200711.42851.tar";
+          sha256 = "1s22gr05yqirb4dddafw96kq4ifccncypvr09rxmhdf7iv4096dm";
+        };
+        packageRequires = [ cl-lib nadvice ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/delight.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    denote = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "denote";
+        ename = "denote";
+        version = "1.2.0.0.20230605.73117";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/denote-1.2.0.0.20230605.73117.tar";
+          sha256 = "1rj7gaqxliyah72q485hx1gm474xs391zi34hdpdz3l87bd57n6a";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/denote.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    denote-menu = callPackage ({ denote
+                               , elpaBuild
+                               , emacs
+                               , fetchurl
+                               , lib }:
+      elpaBuild {
+        pname = "denote-menu";
+        ename = "denote-menu";
+        version = "1.1.1.0.20230516.161156";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/denote-menu-1.1.1.0.20230516.161156.tar";
+          sha256 = "0bimkcfmizidgibsv68kgvql5a4njx6n5zd1n9z0hzbawzsasz29";
+        };
+        packageRequires = [ denote emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/denote-menu.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    detached = callPackage ({ elpaBuild
+                            , emacs
+                            , fetchurl
+                            , lib }:
+      elpaBuild {
+        pname = "detached";
+        ename = "detached";
+        version = "0.10.1.0.20221129.143049";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/detached-0.10.1.0.20221129.143049.tar";
+          sha256 = "0b6b3q5z983744s5k9k771d0hnnbnrx249cqw4nkgplb2zay9zii";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/detached.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    devdocs = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "devdocs";
+        ename = "devdocs";
+        version = "0.5.0.20230220.204256";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/devdocs-0.5.0.20230220.204256.tar";
+          sha256 = "19vjsvyikyli7f367gh6razvdwgsdvjxy6sfywk272q11wy1imcy";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/devdocs.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dict-tree = callPackage ({ elpaBuild
+                             , fetchurl
+                             , heap
+                             , lib
+                             , tNFA
+                             , trie }:
+      elpaBuild {
+        pname = "dict-tree";
+        ename = "dict-tree";
+        version = "0.16.0.20201214.122037";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/dict-tree-0.16.0.20201214.122037.tar";
+          sha256 = "0ax5xzmaf4zsbg95hf3d4khq1yf1zafc48vrpgfwgm2735mxsins";
+        };
+        packageRequires = [ heap tNFA trie ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/dict-tree.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    diff-hl = callPackage ({ cl-lib ? null
+                           , elpaBuild
+                           , emacs
+                           , fetchurl
+                           , lib }:
+      elpaBuild {
+        pname = "diff-hl";
+        ename = "diff-hl";
+        version = "1.9.2.0.20230423.183732";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/diff-hl-1.9.2.0.20230423.183732.tar";
+          sha256 = "1wgsd9c3n9f7sw0ma1i28dc0riwfv3f9gw43h3xbgydqw7hqa0r4";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/diff-hl.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    diffview = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "diffview";
+        ename = "diffview";
+        version = "1.0.0.20230224.111651";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/diffview-1.0.0.20230224.111651.tar";
+          sha256 = "030lkz0y188frlr8525ka4q26pbrj1rd1i5mn3152wnac3xmzj3q";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/diffview.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    diminish = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "diminish";
+        ename = "diminish";
+        version = "0.46.0.20220909.84745";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/diminish-0.46.0.20220909.84745.tar";
+          sha256 = "05yv0gvqcha0404spd200rgfw08zww9r5h2rbmykhq7c7chml542";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/diminish.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-du = callPackage ({ cl-lib ? null
+                            , elpaBuild
+                            , emacs
+                            , fetchurl
+                            , lib }:
+      elpaBuild {
+        pname = "dired-du";
+        ename = "dired-du";
+        version = "0.5.2.0.20221221.75108";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/dired-du-0.5.2.0.20221221.75108.tar";
+          sha256 = "0hbb6f2ycnn8s5b5wk3zqfwmz56ijgiyggr2rjj3pqvg3hhrdkcx";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/dired-du.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-git-info = callPackage ({ elpaBuild
+                                  , emacs
+                                  , fetchurl
+                                  , lib }:
+      elpaBuild {
+        pname = "dired-git-info";
+        ename = "dired-git-info";
+        version = "0.3.1.0.20191229.192948";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/dired-git-info-0.3.1.0.20191229.192948.tar";
+          sha256 = "1gkvn9g3nn113qa0fdq3h88fbmjy9498y9zcd5jfyz4kx0iid016";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/dired-git-info.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    disk-usage = callPackage ({ elpaBuild
+                              , emacs
+                              , fetchurl
+                              , lib }:
+      elpaBuild {
+        pname = "disk-usage";
+        ename = "disk-usage";
+        version = "1.3.3.0.20220920.80620";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/disk-usage-1.3.3.0.20220920.80620.tar";
+          sha256 = "0sf43dx83pa6zk0xv9v7g41xi3jqx5kw7xbdmlabg7xckkzlwk16";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/disk-usage.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dismal = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "dismal";
+        ename = "dismal";
+        version = "1.5.2.0.20221221.75154";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/dismal-1.5.2.0.20221221.75154.tar";
+          sha256 = "011lvc7sxy8waqyirgsbf7p0y1n16zc5srlx0yk22x7q7i28svrp";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/dismal.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    djvu = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "djvu";
+        ename = "djvu";
+        version = "1.1.2.0.20221221.75224";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/djvu-1.1.2.0.20221221.75224.tar";
+          sha256 = "08q6sryvpgl0nx17r3rr2sramgzxgwx9qlwripy1iqcydyz844d1";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/djvu.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    doc-toc = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "doc-toc";
+        ename = "doc-toc";
+        version = "1.2.0.20230409.212954";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/doc-toc-1.2.0.20230409.212954.tar";
+          sha256 = "1y5i6669416llpkpnqnhkckvbwy493gfbcjlq1hh1mwy508bq2va";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/doc-toc.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    docbook = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "docbook";
+        ename = "docbook";
+        version = "0.1.0.20221221.75233";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/docbook-0.1.0.20221221.75233.tar";
+          sha256 = "0zp2hhgxi4ab6ijxfinjay34jjbwn36iy1laaxp65cb7dy6k2aas";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/docbook.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dts-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "dts-mode";
+        ename = "dts-mode";
+        version = "1.0.0.20221221.75311";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/dts-mode-1.0.0.20221221.75311.tar";
+          sha256 = "0jmvg2gi43iaqq82s1ahzymday7i9gihhv9affjxcs97ydzwzaj2";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/dts-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    easy-escape = callPackage ({ elpaBuild
+                               , fetchurl
+                               , lib }:
+      elpaBuild {
+        pname = "easy-escape";
+        ename = "easy-escape";
+        version = "0.2.1.0.20210917.85414";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/easy-escape-0.2.1.0.20210917.85414.tar";
+          sha256 = "08npj12pd9jjmwvzadxxs6ldkyqm40355by1q9xq0wdmnh60lcpg";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/easy-escape.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    easy-kill = callPackage ({ cl-lib ? null
+                             , elpaBuild
+                             , emacs
+                             , fetchurl
+                             , lib }:
+      elpaBuild {
+        pname = "easy-kill";
+        ename = "easy-kill";
+        version = "0.9.5.0.20220511.55730";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/easy-kill-0.9.5.0.20220511.55730.tar";
+          sha256 = "0lwj2x09a8rmanymk25cgx4wlqlnq9zxwzymc9bsv9pxg0svcira";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/easy-kill.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ebdb = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }:
+      elpaBuild {
+        pname = "ebdb";
+        ename = "ebdb";
+        version = "0.8.17.0.20230219.150703";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/ebdb-0.8.17.0.20230219.150703.tar";
+          sha256 = "12zbh8556b0kmiwb2w7slb0cw8yba8drn873b3bd6bj6431pgkbv";
+        };
+        packageRequires = [ emacs seq ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ebdb.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ebdb-gnorb = callPackage ({ ebdb
+                              , elpaBuild
+                              , fetchurl
+                              , gnorb
+                              , lib }:
+      elpaBuild {
+        pname = "ebdb-gnorb";
+        ename = "ebdb-gnorb";
+        version = "1.0.2.0.20221221.75324";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/ebdb-gnorb-1.0.2.0.20221221.75324.tar";
+          sha256 = "1g71ycs0z0ac2011wazfm2caqh5gly82dxj88kcwh4pbcx4p6ywn";
+        };
+        packageRequires = [ ebdb gnorb ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ebdb-gnorb.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ebdb-i18n-chn = callPackage ({ ebdb
+                                 , elpaBuild
+                                 , fetchurl
+                                 , lib
+                                 , pyim }:
+      elpaBuild {
+        pname = "ebdb-i18n-chn";
+        ename = "ebdb-i18n-chn";
+        version = "1.3.2.0.20221221.75334";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/ebdb-i18n-chn-1.3.2.0.20221221.75334.tar";
+          sha256 = "087fc78fczrmv73nigvxy25x8k69l57v67big5p8kaddp2z756l8";
+        };
+        packageRequires = [ ebdb pyim ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ebdb-i18n-chn.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ediprolog = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "ediprolog";
+        ename = "ediprolog";
+        version = "2.2.0.20221026.91800";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/ediprolog-2.2.0.20221026.91800.tar";
+          sha256 = "0hgqwscykw0030w9vlkrxvid2li93v5z6js829nfmssmqvzibic2";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ediprolog.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eev = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "eev";
+        ename = "eev";
+        version = "20230127.0.20230521.54745";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/eev-20230127.0.20230521.54745.tar";
+          sha256 = "09s6r6xjyfhdiy7j3wnw53gyjbjr8347ikzhi6xxzkna3r5fc1mx";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/eev.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ef-themes = callPackage ({ elpaBuild
+                             , emacs
+                             , fetchurl
+                             , lib }:
+      elpaBuild {
+        pname = "ef-themes";
+        ename = "ef-themes";
+        version = "1.0.2.0.20230605.70126";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/ef-themes-1.0.2.0.20230605.70126.tar";
+          sha256 = "1pqi00s8qx2h3ns8lml17c29kkri919wii1xfgkyzcgq3x8fmz3a";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ef-themes.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eglot = callPackage ({ eldoc
+                         , elpaBuild
+                         , emacs
+                         , external-completion
+                         , fetchurl
+                         , flymake ? null
+                         , jsonrpc
+                         , lib
+                         , project
+                         , seq
+                         , xref }:
+      elpaBuild {
+        pname = "eglot";
+        ename = "eglot";
+        version = "1.15.0.20230525.132945";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/eglot-1.15.0.20230525.132945.tar";
+          sha256 = "1w9r3mn4jfvi24knb29bs0maji7jp9hb556lamsr6v4mv9519h82";
+        };
+        packageRequires = [
+          eldoc
+          emacs
+          external-completion
+          flymake
+          jsonrpc
+          project
+          seq
+          xref
+        ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/eglot.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    el-search = callPackage ({ cl-print ? null
+                             , elpaBuild
+                             , emacs
+                             , fetchurl
+                             , lib
+                             , stream }:
+      elpaBuild {
+        pname = "el-search";
+        ename = "el-search";
+        version = "1.12.6.1.0.20221221.75346";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/el-search-1.12.6.1.0.20221221.75346.tar";
+          sha256 = "08r2hw47ijwb7y1amhn49r9l9kh2kv0y631rg4f8xjqfd38msh45";
+        };
+        packageRequires = [ cl-print emacs stream ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/el-search.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eldoc = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "eldoc";
+        ename = "eldoc";
+        version = "1.14.0.0.20230413.164237";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/eldoc-1.14.0.0.20230413.164237.tar";
+          sha256 = "07fqmdm1fl9466272y1ywnsxq6d3j3vhy6sl7zqgh9kfq0b9xdn5";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/eldoc.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eldoc-eval = callPackage ({ elpaBuild
+                              , fetchurl
+                              , lib }:
+      elpaBuild {
+        pname = "eldoc-eval";
+        ename = "eldoc-eval";
+        version = "0.2.0.20220106.195151";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/eldoc-eval-0.2.0.20220106.195151.tar";
+          sha256 = "0lidijrg9ylwl80dljhkhsqdmrspfz5n3wdvrnibzvhlqyan7vd1";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/eldoc-eval.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    electric-spacing = callPackage ({ elpaBuild
+                                    , fetchurl
+                                    , lib }:
+      elpaBuild {
+        pname = "electric-spacing";
+        ename = "electric-spacing";
+        version = "5.0.0.20201201.154407";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/electric-spacing-5.0.0.20201201.154407.tar";
+          sha256 = "1iaw30bxjzxkvnqvcw10vxyjfbxabr0cb04kmwy0ibzh8dim25i0";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/electric-spacing.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elisp-benchmarks = callPackage ({ elpaBuild
+                                    , fetchurl
+                                    , lib }:
+      elpaBuild {
+        pname = "elisp-benchmarks";
+        ename = "elisp-benchmarks";
+        version = "1.14.0.20221221.75401";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/elisp-benchmarks-1.14.0.20221221.75401.tar";
+          sha256 = "14gvzrcp32yg594g7pzxp7kic2zyrfqwn6a8ansil9adqsz8yarx";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/elisp-benchmarks.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    embark = callPackage ({ compat
+                          , elpaBuild
+                          , emacs
+                          , fetchurl
+                          , lib }:
+      elpaBuild {
+        pname = "embark";
+        ename = "embark";
+        version = "0.22.1.0.20230604.235020";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/embark-0.22.1.0.20230604.235020.tar";
+          sha256 = "0yb3g3yp4vd9w6bclmff1qgqryj1hz9xf187yfrnqv3viv924454";
+        };
+        packageRequires = [ compat emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/embark.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    embark-consult = callPackage ({ consult
+                                  , elpaBuild
+                                  , emacs
+                                  , embark
+                                  , fetchurl
+                                  , lib }:
+      elpaBuild {
+        pname = "embark-consult";
+        ename = "embark-consult";
+        version = "0.7.0.20230604.235020";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/embark-consult-0.7.0.20230604.235020.tar";
+          sha256 = "1982pcvf2crwmind8ykx5i30dvyd63pfljnrsjgnb4ws7nglbrbi";
+        };
+        packageRequires = [ consult emacs embark ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/embark-consult.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emms = callPackage ({ cl-lib ? null
+                        , elpaBuild
+                        , fetchurl
+                        , lib
+                        , nadvice
+                        , seq }:
+      elpaBuild {
+        pname = "emms";
+        ename = "emms";
+        version = "15.0.20230525.163835";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/emms-15.0.20230525.163835.tar";
+          sha256 = "084ax2gl1zjxr24sidnlmx1n7ra0myvmxzlicmwg49szl2majszp";
+        };
+        packageRequires = [ cl-lib nadvice seq ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/emms.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    engrave-faces = callPackage ({ elpaBuild
+                                 , emacs
+                                 , fetchurl
+                                 , lib }:
+      elpaBuild {
+        pname = "engrave-faces";
+        ename = "engrave-faces";
+        version = "0.3.1.0.20230115.70118";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/engrave-faces-0.3.1.0.20230115.70118.tar";
+          sha256 = "19cg0ksh1v3yhvknpf18q21y0wbhf55ll8p67vvlqaaikwlmbpxz";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/engrave-faces.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    enwc = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "enwc";
+        ename = "enwc";
+        version = "2.0.0.20171007.121321";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/enwc-2.0.0.20171007.121321.tar";
+          sha256 = "13lj4br2r845zwg491y9f2m5zxi2gj4qkihwcsrnc1ybf3zdlpfy";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/enwc.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    epoch-view = callPackage ({ elpaBuild
+                              , fetchurl
+                              , lib }:
+      elpaBuild {
+        pname = "epoch-view";
+        ename = "epoch-view";
+        version = "0.0.1.0.20221221.75416";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/epoch-view-0.0.1.0.20221221.75416.tar";
+          sha256 = "0lhs1i02rl8mb7m56bsmv942pq7dgdp5qjp1zs7flv0zgyi8ip5c";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/epoch-view.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ergoemacs-mode = callPackage ({ cl-lib ? null
+                                  , elpaBuild
+                                  , emacs
+                                  , fetchurl
+                                  , lib
+                                  , nadvice }:
+      elpaBuild {
+        pname = "ergoemacs-mode";
+        ename = "ergoemacs-mode";
+        version = "5.16.10.12.0.20230207.95118";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/ergoemacs-mode-5.16.10.12.0.20230207.95118.tar";
+          sha256 = "1gf8mn2g453kwgibpawj6gjmd707p33lfkx6dq9wba66zh4cgp4a";
+        };
+        packageRequires = [ cl-lib emacs nadvice ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ergoemacs-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    excorporate = callPackage ({ cl-lib ? null
+                               , elpaBuild
+                               , emacs
+                               , fetchurl
+                               , fsm
+                               , lib
+                               , nadvice
+                               , soap-client
+                               , url-http-ntlm
+                               , url-http-oauth }:
+      elpaBuild {
+        pname = "excorporate";
+        ename = "excorporate";
+        version = "1.1.1.0.20230529.173200";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/excorporate-1.1.1.0.20230529.173200.tar";
+          sha256 = "1485cy2a8vzws2k796cj8a6dydjf8dagyid1ns04krzafvkfdnh4";
+        };
+        packageRequires = [
+          cl-lib
+          emacs
+          fsm
+          nadvice
+          soap-client
+          url-http-ntlm
+          url-http-oauth
+        ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/excorporate.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    expand-region = callPackage ({ elpaBuild
+                                 , fetchurl
+                                 , lib }:
+      elpaBuild {
+        pname = "expand-region";
+        ename = "expand-region";
+        version = "0.11.0.0.20200225.132539";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/expand-region-0.11.0.0.20200225.132539.tar";
+          sha256 = "1fvjm2741q51zrd6i6smsg8l5vz1z2xiwwq2bhaq9dc1b8avpd2z";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/expand-region.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    external-completion = callPackage ({ elpaBuild
+                                       , fetchurl
+                                       , lib }:
+      elpaBuild {
+        pname = "external-completion";
+        ename = "external-completion";
+        version = "0.1.0.20230101.53112";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/external-completion-0.1.0.20230101.53112.tar";
+          sha256 = "042mjdaia5c267qlpc1s3cy3qhxdsa4hygqjbfir5z1mrks28z1v";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/external-completion.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }:
+      elpaBuild {
+        pname = "exwm";
+        ename = "exwm";
+        version = "0.27.0.20221122.0";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/exwm-0.27.0.20221122.0.tar";
+          sha256 = "1vx1qy44vdnwzsc6xq69nql468yh6nc6k8b4fkx3xl45zkwnvck2";
+        };
+        packageRequires = [ xelb ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/exwm.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    f90-interface-browser = callPackage ({ cl-lib ? null
+                                         , elpaBuild
+                                         , fetchurl
+                                         , lib }:
+      elpaBuild {
+        pname = "f90-interface-browser";
+        ename = "f90-interface-browser";
+        version = "1.1.0.20221221.75553";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/f90-interface-browser-1.1.0.20221221.75553.tar";
+          sha256 = "1xbrm524dadmww961m4n2dqi1gplbflfldxwc6cs0cas2cf4ydal";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/f90-interface-browser.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    face-shift = callPackage ({ elpaBuild
+                              , emacs
+                              , fetchurl
+                              , lib }:
+      elpaBuild {
+        pname = "face-shift";
+        ename = "face-shift";
+        version = "0.2.1.0.20230426.73945";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/face-shift-0.2.1.0.20230426.73945.tar";
+          sha256 = "0h33w6n1sj0g4ji8ckdd9pgxq3gj4kn0mqlazrs82sf32hsjfi5w";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/face-shift.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    filladapt = callPackage ({ elpaBuild
+                             , emacs
+                             , fetchurl
+                             , lib }:
+      elpaBuild {
+        pname = "filladapt";
+        ename = "filladapt";
+        version = "2.12.2.0.20221221.75607";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/filladapt-2.12.2.0.20221221.75607.tar";
+          sha256 = "0izqqh2dlp9p6kbkmn5qp9lbqdf8ps3f38lclc9fm2652mssvddv";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/filladapt.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    firefox-javascript-repl = callPackage ({ elpaBuild
+                                           , emacs
+                                           , fetchurl
+                                           , lib }:
+      elpaBuild {
+        pname = "firefox-javascript-repl";
+        ename = "firefox-javascript-repl";
+        version = "0.9.5.0.20230605.161924";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/firefox-javascript-repl-0.9.5.0.20230605.161924.tar";
+          sha256 = "1fwi01mqyz0mvy27rxz4k97mww02gv6njhb4p7wxj1wrx1xsmm1z";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/firefox-javascript-repl.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flylisp = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "flylisp";
+        ename = "flylisp";
+        version = "0.2.0.20221221.75619";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/flylisp-0.2.0.20221221.75619.tar";
+          sha256 = "0b48wd2isf5nqfgscpd311hwisp9gs77lsinpdrs40swvwnflyfb";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/flylisp.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake = callPackage ({ eldoc
+                           , elpaBuild
+                           , emacs
+                           , fetchurl
+                           , lib
+                           , project }:
+      elpaBuild {
+        pname = "flymake";
+        ename = "flymake";
+        version = "1.3.4.0.20230418.225726";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/flymake-1.3.4.0.20230418.225726.tar";
+          sha256 = "1afzqxma730gdmbg6390v2bcm2mnpv8lbnjad4h1wvg95xg2c9ig";
+        };
+        packageRequires = [ eldoc emacs project ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/flymake.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-proselint = callPackage ({ elpaBuild
+                                     , emacs
+                                     , fetchurl
+                                     , lib }:
+      elpaBuild {
+        pname = "flymake-proselint";
+        ename = "flymake-proselint";
+        version = "0.3.0.0.20230325.160756";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/flymake-proselint-0.3.0.0.20230325.160756.tar";
+          sha256 = "09r9karqm7f8s8wmbfai8nrawpxcn5f7lwpfp5vz1j7w068zn3mi";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/flymake-proselint.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fontaine = callPackage ({ elpaBuild
+                            , emacs
+                            , fetchurl
+                            , lib }:
+      elpaBuild {
+        pname = "fontaine";
+        ename = "fontaine";
+        version = "1.0.0.0.20230523.95022";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/fontaine-1.0.0.0.20230523.95022.tar";
+          sha256 = "0s8fbjvkcz0627fdpf28myjhzw6bwlclwf4v9shld9vhsg7brhxk";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/fontaine.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    frame-tabs = callPackage ({ elpaBuild
+                              , fetchurl
+                              , lib }:
+      elpaBuild {
+        pname = "frame-tabs";
+        ename = "frame-tabs";
+        version = "1.1.0.20221221.75627";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/frame-tabs-1.1.0.20221221.75627.tar";
+          sha256 = "0c9sbfqnl2vmrw9ziaybd7dmzw23a9p5b8nl1g5w4kkwwh7kwl35";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/frame-tabs.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    frog-menu = callPackage ({ avy
+                             , elpaBuild
+                             , emacs
+                             , fetchurl
+                             , lib
+                             , posframe }:
+      elpaBuild {
+        pname = "frog-menu";
+        ename = "frog-menu";
+        version = "0.2.11.0.20201115.95734";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/frog-menu-0.2.11.0.20201115.95734.tar";
+          sha256 = "1rvvkzd639x8rddkbcxwqi6f29y4zybiryvp1is9f68jj6dn3y98";
+        };
+        packageRequires = [ avy emacs posframe ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/frog-menu.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fsm = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "fsm";
+        ename = "fsm";
+        version = "0.2.1.0.20221212.223608";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/fsm-0.2.1.0.20221212.223608.tar";
+          sha256 = "1q7i32b3kx1cp1yag2mijab36b289hpv1vx7fby8n35agbnqabh8";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/fsm.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ftable = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "ftable";
+        ename = "ftable";
+        version = "1.1.0.20230102.145125";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/ftable-1.1.0.20230102.145125.tar";
+          sha256 = "0bhzxrhl87fyv9ynlxp0c3nschpbamkkxzh5gzakdigbm79602ir";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ftable.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gcmh = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "gcmh";
+        ename = "gcmh";
+        version = "0.2.1.0.20201116.225142";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/gcmh-0.2.1.0.20201116.225142.tar";
+          sha256 = "1xfpms62svxmvhpdprhb68bsa27m8m8z8wmq3sn42rjf8fi9hrqf";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/gcmh.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ggtags = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "ggtags";
+        ename = "ggtags";
+        version = "0.9.0.0.20230602.13355";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/ggtags-0.9.0.0.20230602.13355.tar";
+          sha256 = "1d8d4shaf3rkan48vpqjc32qms6n90f912wdxsy7nz9fqadv31cz";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ggtags.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "gited";
+        ename = "gited";
+        version = "0.6.0.0.20221221.75709";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/gited-0.6.0.0.20221221.75709.tar";
+          sha256 = "1pl8chdmnpfby8ap3lirjc837nns5bdgsqms4v86g3acgyz1zd8d";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/gited.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gle-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "gle-mode";
+        ename = "gle-mode";
+        version = "1.1.0.20221221.75729";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/gle-mode-1.1.0.20221221.75729.tar";
+          sha256 = "1icjvfrh7j1jp31fhgazai9xdm1s2wk0b3zs3n44km9v2gfy4gcc";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/gle-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gnat-compiler = callPackage ({ elpaBuild
+                                 , emacs
+                                 , fetchurl
+                                 , lib
+                                 , wisi }:
+      elpaBuild {
+        pname = "gnat-compiler";
+        ename = "gnat-compiler";
+        version = "1.0.2.0.20230124.51334";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/gnat-compiler-1.0.2.0.20230124.51334.tar";
+          sha256 = "0kqzqw2dbsmcmrqkb5rsjmkpznfj1licnbfjbp1ifs0kaf2cigqy";
+        };
+        packageRequires = [ emacs wisi ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/gnat-compiler.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gnome-c-style = callPackage ({ elpaBuild
+                                 , fetchurl
+                                 , lib }:
+      elpaBuild {
+        pname = "gnome-c-style";
+        ename = "gnome-c-style";
+        version = "0.1.0.20160130.1526";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/gnome-c-style-0.1.0.20160130.1526.tar";
+          sha256 = "0jj6xxn35iijzxipqna3kpks6ffg7gpp566riy7icifcq1pxkws1";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/gnome-c-style.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "gnorb";
+        ename = "gnorb";
+        version = "1.6.11.0.20230108.110132";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/gnorb-1.6.11.0.20230108.110132.tar";
+          sha256 = "0w14v19idq2njgb80ry0qa7dv9hhj5lg488acxx0pz5cxk606rgh";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/gnorb.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gnu-elpa = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "gnu-elpa";
+        ename = "gnu-elpa";
+        version = "1.1.0.20221212.224322";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/gnu-elpa-1.1.0.20221212.224322.tar";
+          sha256 = "1aglbzgvprqws45xybs7cfajgkgbcl8pk61nqdja7qhgr7a68ymx";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/gnu-elpa.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gnu-elpa-keyring-update = callPackage ({ elpaBuild
+                                           , fetchurl
+                                           , lib }:
+      elpaBuild {
+        pname = "gnu-elpa-keyring-update";
+        ename = "gnu-elpa-keyring-update";
+        version = "2022.12.0.20221228.123117";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/gnu-elpa-keyring-update-2022.12.0.20221228.123117.tar";
+          sha256 = "1aa9lwjd4cll6qm5909dg2dgx34sai3w3jg76xjlax3afg4vak2v";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/gnu-elpa-keyring-update.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gnugo = callPackage ({ ascii-art-to-unicode
+                         , cl-lib ? null
+                         , elpaBuild
+                         , fetchurl
+                         , lib
+                         , xpm }:
+      elpaBuild {
+        pname = "gnugo";
+        ename = "gnugo";
+        version = "3.1.2.0.20221212.224439";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/gnugo-3.1.2.0.20221212.224439.tar";
+          sha256 = "1hkwbpy9nar0wxnvbcycjbn3k1ga9kg6jk8f4nfhvm0rxdvp53ig";
+        };
+        packageRequires = [ ascii-art-to-unicode cl-lib xpm ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/gnugo.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gnus-mock = callPackage ({ elpaBuild
+                             , fetchurl
+                             , lib }:
+      elpaBuild {
+        pname = "gnus-mock";
+        ename = "gnus-mock";
+        version = "0.5.0.20210503.105756";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/gnus-mock-0.5.0.20210503.105756.tar";
+          sha256 = "1p4znd3hzzlxwzxja764vfdy4vb6lf39m6hhvm8knqikq823y26d";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/gnus-mock.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gpastel = callPackage ({ elpaBuild
+                           , emacs
+                           , fetchurl
+                           , lib }:
+      elpaBuild {
+        pname = "gpastel";
+        ename = "gpastel";
+        version = "0.5.0.0.20181231.183754";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/gpastel-0.5.0.0.20181231.183754.tar";
+          sha256 = "19byv5l09h8zdsgpifsc0j7np0iq1md4l0y7865g95xbax60i9id";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/gpastel.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gpr-mode = callPackage ({ elpaBuild
+                            , emacs
+                            , fetchurl
+                            , gnat-compiler
+                            , lib
+                            , wisi }:
+      elpaBuild {
+        pname = "gpr-mode";
+        ename = "gpr-mode";
+        version = "1.0.3.0.20230119.135149";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/gpr-mode-1.0.3.0.20230119.135149.tar";
+          sha256 = "1qd4wdmjlhj325q5qjhdx2l4z1bqpv4giwvsgd29s9k3sh7n8m2h";
+        };
+        packageRequires = [ emacs gnat-compiler wisi ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/gpr-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gpr-query = callPackage ({ elpaBuild
+                             , emacs
+                             , fetchurl
+                             , gnat-compiler
+                             , lib
+                             , wisi }:
+      elpaBuild {
+        pname = "gpr-query";
+        ename = "gpr-query";
+        version = "1.0.3.0.20230128.112055";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/gpr-query-1.0.3.0.20230128.112055.tar";
+          sha256 = "0fnq3zdzlcfc54m5ix01ix78drfmzvfiicjp9cvsw78s0sd05p9x";
+        };
+        packageRequires = [ emacs gnat-compiler wisi ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/gpr-query.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    graphql = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "graphql";
+        ename = "graphql";
+        version = "0.1.2.0.20221202.2453";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/graphql-0.1.2.0.20221202.2453.tar";
+          sha256 = "175ss2ln21j0s83fy5yydb05rgsawgc7f8qbahc6ahc1sclppk26";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/graphql.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    greader = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "greader";
+        ename = "greader";
+        version = "0.1.0.20230317.61441";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/greader-0.1.0.20230317.61441.tar";
+          sha256 = "1s1lz80irpgr4d69l098wj8dbvmy3h14hfl28k51ng6q95hxyizl";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/greader.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    greenbar = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "greenbar";
+        ename = "greenbar";
+        version = "1.1.0.20221221.80217";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/greenbar-1.1.0.20221221.80217.tar";
+          sha256 = "1cm2fj2arhgxc5dl6yw03xjyipgk2skaamyy8gybbb4zdglhpd0m";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/greenbar.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gtags-mode = callPackage ({ elpaBuild
+                              , emacs
+                              , fetchurl
+                              , lib }:
+      elpaBuild {
+        pname = "gtags-mode";
+        ename = "gtags-mode";
+        version = "1.0.0.20221205.52414";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/gtags-mode-1.0.0.20221205.52414.tar";
+          sha256 = "0y6dsyrm91yb63bmm6cpjzffq4314saqfryz790h8jm19x5nc4m2";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/gtags-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    guess-language = callPackage ({ cl-lib ? null
+                                  , elpaBuild
+                                  , emacs
+                                  , fetchurl
+                                  , lib
+                                  , nadvice }:
+      elpaBuild {
+        pname = "guess-language";
+        ename = "guess-language";
+        version = "0.0.1.0.20190417.81229";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/guess-language-0.0.1.0.20190417.81229.tar";
+          sha256 = "0xzaq5wm20jkbimg60na2if7zpxlbddqbr9hadg3qqswkg4zp1v7";
+        };
+        packageRequires = [ cl-lib emacs nadvice ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/guess-language.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hcel = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "hcel";
+        ename = "hcel";
+        version = "1.0.0.0.20221012.11633";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/hcel-1.0.0.0.20221012.11633.tar";
+          sha256 = "0hmrb914pilsqvqlw28iy93mkw0h3isyxd0dmw5k3sf9x8zlifh9";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/hcel.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    heap = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "heap";
+        ename = "heap";
+        version = "0.5.0.20201214.121301";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/heap-0.5.0.20201214.121301.tar";
+          sha256 = "0i16nc0rc5q2hrqamdqfrf8rzw9msi1a9sad2jq68dlbyv113l6n";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/heap.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hiddenquote = callPackage ({ elpaBuild
+                               , emacs
+                               , fetchurl
+                               , lib }:
+      elpaBuild {
+        pname = "hiddenquote";
+        ename = "hiddenquote";
+        version = "1.2.0.20221206.105559";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/hiddenquote-1.2.0.20221206.105559.tar";
+          sha256 = "0jmlby1ic1sfymiz5rxpq7l7zfxp5hkmcik4ax62q1vnqm67gvq4";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/hiddenquote.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    highlight-escape-sequences = callPackage ({ elpaBuild
+                                              , fetchurl
+                                              , lib }:
+      elpaBuild {
+        pname = "highlight-escape-sequences";
+        ename = "highlight-escape-sequences";
+        version = "0.4.0.20201214.173014";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/highlight-escape-sequences-0.4.0.20201214.173014.tar";
+          sha256 = "1av3fzavy83xjbd52dnql6i95993gyxfhkd1san6c3hi0lcnh3vw";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/highlight-escape-sequences.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hook-helpers = callPackage ({ elpaBuild
+                                , emacs
+                                , fetchurl
+                                , lib }:
+      elpaBuild {
+        pname = "hook-helpers";
+        ename = "hook-helpers";
+        version = "1.1.1.0.20201201.93957";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/hook-helpers-1.1.1.0.20201201.93957.tar";
+          sha256 = "01iimwwy274kpc0vpy9barfq1rakfrj0d4v3akrzwscnfkxzm1ms";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/hook-helpers.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    html5-schema = callPackage ({ elpaBuild
+                                , fetchurl
+                                , lib }:
+      elpaBuild {
+        pname = "html5-schema";
+        ename = "html5-schema";
+        version = "0.1.0.20221221.80245";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/html5-schema-0.1.0.20221221.80245.tar";
+          sha256 = "1k3a653n3whprkhc1pc7q1dsc00g2w6923p74ap64ymdv6sx6pw2";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/html5-schema.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hydra = callPackage ({ elpaBuild, emacs, fetchurl, lib, lv }:
+      elpaBuild {
+        pname = "hydra";
+        ename = "hydra";
+        version = "0.15.0.0.20221030.224757";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/hydra-0.15.0.0.20221030.224757.tar";
+          sha256 = "1ici53s3h7syvzrvz4l5q8790fgfl9wfhdrx2mc0wdhc9jwgxif0";
+        };
+        packageRequires = [ emacs lv ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/hydra.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ilist = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "ilist";
+        ename = "ilist";
+        version = "0.1.0.20220115.130125";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/ilist-0.1.0.20220115.130125.tar";
+          sha256 = "088g1ybcvphlgjyl7n7y81m0q2g77brabdbj479j2s8rbidw26va";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ilist.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    inspector = callPackage ({ elpaBuild
+                             , emacs
+                             , fetchurl
+                             , lib }:
+      elpaBuild {
+        pname = "inspector";
+        ename = "inspector";
+        version = "0.31.0.20230525.102939";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/inspector-0.31.0.20230525.102939.tar";
+          sha256 = "1bh0688w2qs9wawk8xfrfynx3wbhjgbmsyfkbpz2zj2xavmjqmbi";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/inspector.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ioccur = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "ioccur";
+        ename = "ioccur";
+        version = "2.6.0.20211231.163129";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/ioccur-2.6.0.20211231.163129.tar";
+          sha256 = "0vgb0p6gb2djrqviq2ifvkkd7zyp094z2jsly52i14j153cvi9pd";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ioccur.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    isearch-mb = callPackage ({ elpaBuild
+                              , emacs
+                              , fetchurl
+                              , lib }:
+      elpaBuild {
+        pname = "isearch-mb";
+        ename = "isearch-mb";
+        version = "0.7.0.20230218.111405";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/isearch-mb-0.7.0.20230218.111405.tar";
+          sha256 = "1bvizhy320yln1h34dn31v9cwh0k83iwyqcqspj6qly89wnhn3zm";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/isearch-mb.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    iterators = callPackage ({ elpaBuild
+                             , emacs
+                             , fetchurl
+                             , lib }:
+      elpaBuild {
+        pname = "iterators";
+        ename = "iterators";
+        version = "0.1.1.0.20221221.80300";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/iterators-0.1.1.0.20221221.80300.tar";
+          sha256 = "14psdlyar90zhq091w39z2zkfi99x4dq2zrnhnbzwll0sr5q7j7z";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/iterators.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ivy = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "ivy";
+        ename = "ivy";
+        version = "0.14.0.0.20230410.182111";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/ivy-0.14.0.0.20230410.182111.tar";
+          sha256 = "0dsx4z1afcnh4landah0srq6g4abdzm2khpa8nlvcfrgvfyzvhq1";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ivy.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ivy-avy = callPackage ({ avy
+                           , elpaBuild
+                           , emacs
+                           , fetchurl
+                           , ivy
+                           , lib }:
+      elpaBuild {
+        pname = "ivy-avy";
+        ename = "ivy-avy";
+        version = "0.14.0.0.20230410.182616";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/ivy-avy-0.14.0.0.20230410.182616.tar";
+          sha256 = "1s749025jyd5qy5yhxnnd71bj1qcwa6ah0ddl2cs16h9mdbf87qy";
+        };
+        packageRequires = [ avy emacs ivy ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ivy-avy.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ivy-explorer = callPackage ({ elpaBuild
+                                , emacs
+                                , fetchurl
+                                , ivy
+                                , lib }:
+      elpaBuild {
+        pname = "ivy-explorer";
+        ename = "ivy-explorer";
+        version = "0.3.2.0.20190909.192125";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/ivy-explorer-0.3.2.0.20190909.192125.tar";
+          sha256 = "1h4yp4xp5kqirlxhbg425v7fh9zphwkqflvf4qf0xf275w4i8g88";
+        };
+        packageRequires = [ emacs ivy ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ivy-explorer.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ivy-hydra = callPackage ({ elpaBuild
+                             , emacs
+                             , fetchurl
+                             , hydra
+                             , ivy
+                             , lib }:
+      elpaBuild {
+        pname = "ivy-hydra";
+        ename = "ivy-hydra";
+        version = "0.14.0.0.20230410.182324";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/ivy-hydra-0.14.0.0.20230410.182324.tar";
+          sha256 = "10sd554k3qb81am3jvg7l084i031c133a24cgh0g44vjj2s76nra";
+        };
+        packageRequires = [ emacs hydra ivy ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ivy-hydra.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ivy-posframe = callPackage ({ elpaBuild
+                                , emacs
+                                , fetchurl
+                                , ivy
+                                , lib
+                                , posframe }:
+      elpaBuild {
+        pname = "ivy-posframe";
+        ename = "ivy-posframe";
+        version = "0.6.3.0.20211217.23411";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/ivy-posframe-0.6.3.0.20211217.23411.tar";
+          sha256 = "1d1yhydqcbdsya7rnkxd2c05p7vd6iixkx814cl9j1k14amvl46w";
+        };
+        packageRequires = [ emacs ivy posframe ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ivy-posframe.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jarchive = callPackage ({ elpaBuild
+                            , emacs
+                            , fetchurl
+                            , lib }:
+      elpaBuild {
+        pname = "jarchive";
+        ename = "jarchive";
+        version = "0.10.0.0.20230118.130252";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/jarchive-0.10.0.0.20230118.130252.tar";
+          sha256 = "19mfqk255bj6f56r9flgx07s4ylf144l08w5id89qn4l6rbmjvrg";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/jarchive.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    javaimp = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "javaimp";
+        ename = "javaimp";
+        version = "0.9.1.0.20221221.80314";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/javaimp-0.9.1.0.20221221.80314.tar";
+          sha256 = "07qmxqsp9gbdr7pxv4f8826l50gbwcxs2f5zw3v88h64rgrkll5c";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/javaimp.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jgraph-mode = callPackage ({ cl-lib ? null
+                               , elpaBuild
+                               , fetchurl
+                               , lib }:
+      elpaBuild {
+        pname = "jgraph-mode";
+        ename = "jgraph-mode";
+        version = "1.1.0.20221221.80333";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/jgraph-mode-1.1.0.20221221.80333.tar";
+          sha256 = "1dljzr1f0vdhsrw8wksz4gq1q0vwl0136diwzrxh4hwya97mvsrn";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/jgraph-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jinx = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "jinx";
+        ename = "jinx";
+        version = "0.8.0.20230527.124738";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/jinx-0.8.0.20230527.124738.tar";
+          sha256 = "1r1r4g1q96wzzwsfh89i779wm4kjvkci2aq59kf56xm514h5i9yh";
+        };
+        packageRequires = [ compat emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/jinx.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jit-spell = callPackage ({ compat
+                             , elpaBuild
+                             , emacs
+                             , fetchurl
+                             , lib }:
+      elpaBuild {
+        pname = "jit-spell";
+        ename = "jit-spell";
+        version = "0.3.0.20230330.165659";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/jit-spell-0.3.0.20230330.165659.tar";
+          sha256 = "1qlk3srh34sqvl0vnm1r3vjm5qn9jxvzp60zl8hrhrip8cwi9l9j";
+        };
+        packageRequires = [ compat emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/jit-spell.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    js2-mode = callPackage ({ cl-lib ? null
+                            , elpaBuild
+                            , emacs
+                            , fetchurl
+                            , lib }:
+      elpaBuild {
+        pname = "js2-mode";
+        ename = "js2-mode";
+        version = "20230408.0.20230509.224433";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/js2-mode-20230408.0.20230509.224433.tar";
+          sha256 = "1na5fzwqdmwhc3j7v5wijr3yqk2xiylgj1nsnn7j77hl5fm5j0m6";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/js2-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    json-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "json-mode";
+        ename = "json-mode";
+        version = "0.2.0.20221221.80401";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/json-mode-0.2.0.20221221.80401.tar";
+          sha256 = "10rgam19spjrqfmpvxnhp4akgz1ya6l4kvzdyhavgi03bd8c8gxn";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/json-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jsonrpc = callPackage ({ elpaBuild
+                           , emacs
+                           , fetchurl
+                           , lib }:
+      elpaBuild {
+        pname = "jsonrpc";
+        ename = "jsonrpc";
+        version = "1.0.17.0.20230415.124337";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/jsonrpc-1.0.17.0.20230415.124337.tar";
+          sha256 = "0xg2998bpdp3z6w1jp64shkwvzynnasagdgmz8gddpb3mmcqymjm";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/jsonrpc.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jumpc = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "jumpc";
+        ename = "jumpc";
+        version = "3.0.0.20221221.80412";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/jumpc-3.0.0.20221221.80412.tar";
+          sha256 = "17phcxzqf2drxjmg19iyn9r8mlrzbj26c834p76p9887k05xcjyg";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/jumpc.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kind-icon = callPackage ({ elpaBuild
+                             , emacs
+                             , fetchurl
+                             , lib
+                             , svg-lib }:
+      elpaBuild {
+        pname = "kind-icon";
+        ename = "kind-icon";
+        version = "0.2.0.0.20230506.135746";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/kind-icon-0.2.0.0.20230506.135746.tar";
+          sha256 = "141gj4yln50d36pdr171h3ykhw1c7yspvcnv5rsicy1kygi9x8km";
+        };
+        packageRequires = [ emacs svg-lib ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/kind-icon.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kiwix = callPackage ({ elpaBuild, emacs, fetchurl, lib, request }:
+      elpaBuild {
+        pname = "kiwix";
+        ename = "kiwix";
+        version = "1.1.5.0.20220316.84759";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/kiwix-1.1.5.0.20220316.84759.tar";
+          sha256 = "1w0701chsjxnc19g7qd8aipb9vsncfmccgpkw9w65fcmcr7v0ipf";
+        };
+        packageRequires = [ emacs request ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/kiwix.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kmb = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "kmb";
+        ename = "kmb";
+        version = "0.1.0.20221221.80420";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/kmb-0.1.0.20221221.80420.tar";
+          sha256 = "03jgn57h4i3rdfk4qankz3fivrglbxd1y86bm2k7ansdq8a5f7kn";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/kmb.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    landmark = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "landmark";
+        ename = "landmark";
+        version = "1.0.0.20221221.80428";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/landmark-1.0.0.20221221.80428.tar";
+          sha256 = "1jab8b832x4zf6kxfk7n80rc6jhzxsdnmck9jx3asxw9013cc6c8";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/landmark.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    latex-table-wizard = callPackage ({ auctex
+                                      , elpaBuild
+                                      , emacs
+                                      , fetchurl
+                                      , lib
+                                      , transient }:
+      elpaBuild {
+        pname = "latex-table-wizard";
+        ename = "latex-table-wizard";
+        version = "1.5.2.0.20230516.145709";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/latex-table-wizard-1.5.2.0.20230516.145709.tar";
+          sha256 = "0rdk12bdra2k5wncykx3268l66sbap7kx0z2ywnbrgqfnrkcvpx2";
+        };
+        packageRequires = [ auctex emacs transient ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/latex-table-wizard.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    leaf = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "leaf";
+        ename = "leaf";
+        version = "4.5.5.0.20221107.5633";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/leaf-4.5.5.0.20221107.5633.tar";
+          sha256 = "1r76jfd0z771dllxqzgrg5z0vli3y3516frdjrlcc1mprj35dml5";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/leaf.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    let-alist = callPackage ({ elpaBuild
+                             , emacs
+                             , fetchurl
+                             , lib }:
+      elpaBuild {
+        pname = "let-alist";
+        ename = "let-alist";
+        version = "1.0.6.0.20230101.53112";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/let-alist-1.0.6.0.20230101.53112.tar";
+          sha256 = "068hdnbqr2jwfscwspf6zch0gwkcdpwj80zmrvi6dmixrnz65a9w";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/let-alist.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lex = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "lex";
+        ename = "lex";
+        version = "1.1.0.20221221.80437";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/lex-1.1.0.20221221.80437.tar";
+          sha256 = "1f13cijb1pgna364yp7kssnxka7n7wmswsi63pprljxh8mf8p2w5";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/lex.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lin = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "lin";
+        ename = "lin";
+        version = "1.0.0.0.20230120.90459";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/lin-1.0.0.0.20230120.90459.tar";
+          sha256 = "1f7xgw4dvjhrkd3cgb0v20272ah2bdhlnmqhlcjbkw67wan8arrv";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/lin.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lmc = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "lmc";
+        ename = "lmc";
+        version = "1.4.0.20230105.113402";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/lmc-1.4.0.20230105.113402.tar";
+          sha256 = "0pw31akqdf59y9cxk25y8z5643szd4ybhbcmj91i1k9gkhdqhh1x";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/lmc.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    load-dir = callPackage ({ cl-lib ? null
+                            , elpaBuild
+                            , fetchurl
+                            , lib }:
+      elpaBuild {
+        pname = "load-dir";
+        ename = "load-dir";
+        version = "0.0.5.0.20221221.80456";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/load-dir-0.0.5.0.20221221.80456.tar";
+          sha256 = "1hdyy212iz057q2znp8pb6ns8gyi6f5xbr6kvs02rybsd9wjv40s";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/load-dir.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    load-relative = callPackage ({ elpaBuild
+                                 , fetchurl
+                                 , lib }:
+      elpaBuild {
+        pname = "load-relative";
+        ename = "load-relative";
+        version = "1.3.2.0.20230214.53224";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/load-relative-1.3.2.0.20230214.53224.tar";
+          sha256 = "027mlcg38x2yb3j9lnjzfg84fj8hah7sd9nnndf6fkpabi7bbysq";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/load-relative.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    loc-changes = callPackage ({ elpaBuild
+                               , fetchurl
+                               , lib }:
+      elpaBuild {
+        pname = "loc-changes";
+        ename = "loc-changes";
+        version = "1.2.0.20201201.94106";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/loc-changes-1.2.0.20201201.94106.tar";
+          sha256 = "1jrjqn5600l245vhr5h6zwg6g72k0n721ck94mji755bqd231yxs";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/loc-changes.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    loccur = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "loccur";
+        ename = "loccur";
+        version = "1.2.4.0.20201130.183958";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/loccur-1.2.4.0.20201130.183958.tar";
+          sha256 = "1skpv5pmbkhn5vx2c4dqqx4ds3pj4z2lg6ka0pas9xkijdbfy7v0";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/loccur.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    logos = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "logos";
+        ename = "logos";
+        version = "1.0.1.0.20230326.52119";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/logos-1.0.1.0.20230326.52119.tar";
+          sha256 = "1a6hdlm738kfwd6h5hysxmj29yyigb1xin778431pd0jrznf1rva";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/logos.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    luwak = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "luwak";
+        ename = "luwak";
+        version = "1.0.0.0.20221125.50733";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/luwak-1.0.0.0.20221125.50733.tar";
+          sha256 = "06kl3c6b7z9wzw44c6l49vnj4k25g4az8lps8q7kd7w7f0cjn3yx";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/luwak.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lv = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "lv";
+        ename = "lv";
+        version = "0.15.0.0.20221030.224757";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/lv-0.15.0.0.20221030.224757.tar";
+          sha256 = "0xjizznzwsydwqs2hvcbi8nqcyzvca0w3m48dpi2xwvnm22a7v48";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/lv.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    map = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "map";
+        ename = "map";
+        version = "3.3.1.0.20230101.53112";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/map-3.3.1.0.20230101.53112.tar";
+          sha256 = "0a2b95svxzd73n70s9pabjnqvyjz9mqc26rndvf030g54m7c3j8a";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/map.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    marginalia = callPackage ({ compat
+                              , elpaBuild
+                              , emacs
+                              , fetchurl
+                              , lib }:
+      elpaBuild {
+        pname = "marginalia";
+        ename = "marginalia";
+        version = "1.2.0.20230527.102116";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/marginalia-1.2.0.20230527.102116.tar";
+          sha256 = "1qaw7yszshnjafljbfx8vi3417mwz47rhx17h0py2nzc07fbc1dl";
+        };
+        packageRequires = [ compat emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/marginalia.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    markchars = callPackage ({ elpaBuild
+                             , fetchurl
+                             , lib }:
+      elpaBuild {
+        pname = "markchars";
+        ename = "markchars";
+        version = "0.2.2.0.20221221.80510";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/markchars-0.2.2.0.20221221.80510.tar";
+          sha256 = "0snw8hc65mkmmlaj1x87gwkyrz43qdm5ahnnjh09dad5pfd1s0v0";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/markchars.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    math-symbol-lists = callPackage ({ elpaBuild
+                                     , fetchurl
+                                     , lib }:
+      elpaBuild {
+        pname = "math-symbol-lists";
+        ename = "math-symbol-lists";
+        version = "1.3.0.20220828.204754";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/math-symbol-lists-1.3.0.20220828.204754.tar";
+          sha256 = "11n6lmh9q6j0aamd4wbij0ymdfpdmqm0iqysqvk2vnnq6ly4hw3f";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/math-symbol-lists.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mct = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "mct";
+        ename = "mct";
+        version = "0.5.0.0.20230329.161705";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/mct-0.5.0.0.20230329.161705.tar";
+          sha256 = "0wrxhlcwgbpkfp1p0djhqj09s6q484vyr3sxlvg9vvqk75v73brv";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/mct.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    memory-usage = callPackage ({ elpaBuild
+                                , fetchurl
+                                , lib }:
+      elpaBuild {
+        pname = "memory-usage";
+        ename = "memory-usage";
+        version = "0.2.0.20201201.223908";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/memory-usage-0.2.0.20201201.223908.tar";
+          sha256 = "1klpmxgkmc9rb8daldllfwvwagg9sc01kq2jp1vq2wsbrvgpai6d";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/memory-usage.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    metar = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "metar";
+        ename = "metar";
+        version = "0.3.0.20221221.80722";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/metar-0.3.0.20221221.80722.tar";
+          sha256 = "18hzsasajy00m4lvb8pqmpipb3a4m3g9mn151vqndd5hnk08wafn";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/metar.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    midi-kbd = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "midi-kbd";
+        ename = "midi-kbd";
+        version = "0.2.0.20221221.80736";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/midi-kbd-0.2.0.20221221.80736.tar";
+          sha256 = "1ssr8srsdd3f0ijyrx7mcyshb4jdcdi9klm9akablnwzx9z2scm8";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/midi-kbd.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mines = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "mines";
+        ename = "mines";
+        version = "1.6.0.20201130.184335";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/mines-1.6.0.20201130.184335.tar";
+          sha256 = "0xcb0faxsqzrjqxj5z3r8b3hyd8czb5vadzy6shfzkp5xk6w0bny";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/mines.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    minibuffer-header = callPackage ({ elpaBuild
+                                     , emacs
+                                     , fetchurl
+                                     , lib }:
+      elpaBuild {
+        pname = "minibuffer-header";
+        ename = "minibuffer-header";
+        version = "0.5.0.20220921.71345";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/minibuffer-header-0.5.0.20220921.71345.tar";
+          sha256 = "0d3mj2j6bkvci78yx9gidgkig6qvg99zhh3g4z5fqsymyndi1l1w";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/minibuffer-header.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    minibuffer-line = callPackage ({ elpaBuild
+                                   , fetchurl
+                                   , lib }:
+      elpaBuild {
+        pname = "minibuffer-line";
+        ename = "minibuffer-line";
+        version = "0.1.0.20221221.80745";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/minibuffer-line-0.1.0.20221221.80745.tar";
+          sha256 = "1zq1y69wwci8r840ns3izq59hr95b8ncyha0q06gqrv989jamrjw";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/minibuffer-line.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    minimap = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "minimap";
+        ename = "minimap";
+        version = "1.4.0.20201201.162630";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/minimap-1.4.0.20201201.162630.tar";
+          sha256 = "1r062v8a4r4d78biz9d3jk5y8w3ahhamr05cnhfwh2aib4byplf1";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/minimap.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mmm-mode = callPackage ({ cl-lib ? null
+                            , elpaBuild
+                            , emacs
+                            , fetchurl
+                            , lib }:
+      elpaBuild {
+        pname = "mmm-mode";
+        ename = "mmm-mode";
+        version = "0.5.9.0.20221228.193134";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/mmm-mode-0.5.9.0.20221228.193134.tar";
+          sha256 = "0hmj27q8b10dsf3scjq9nslybpdip8bivd0h5dd5bc29mhazld8g";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/mmm-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    modus-themes = callPackage ({ elpaBuild
+                                , emacs
+                                , fetchurl
+                                , lib }:
+      elpaBuild {
+        pname = "modus-themes";
+        ename = "modus-themes";
+        version = "4.2.0.0.20230602.41836";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/modus-themes-4.2.0.0.20230602.41836.tar";
+          sha256 = "0scqgsh3g9llvqannl9i3xwk3sldrsq1lvml3b0j1fyjn1c1hbq4";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/modus-themes.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    multi-mode = callPackage ({ elpaBuild
+                              , fetchurl
+                              , lib }:
+      elpaBuild {
+        pname = "multi-mode";
+        ename = "multi-mode";
+        version = "1.14.0.20221221.80812";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/multi-mode-1.14.0.20221221.80812.tar";
+          sha256 = "0054sb4jp1xp6bf0zh42k6blhvlpw5yr38fg5pm5gv8a6iw3gc9x";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/multi-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    multishell = callPackage ({ cl-lib ? null
+                              , elpaBuild
+                              , fetchurl
+                              , lib }:
+      elpaBuild {
+        pname = "multishell";
+        ename = "multishell";
+        version = "1.1.10.0.20220605.120254";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/multishell-1.1.10.0.20220605.120254.tar";
+          sha256 = "1vs9w1v8hqwfhypk0nz7l2n7q1rf7nx2nwlljqn8clx817glqlfm";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/multishell.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    muse = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "muse";
+        ename = "muse";
+        version = "3.20.2.0.20201128.92545";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/muse-3.20.2.0.20201128.92545.tar";
+          sha256 = "0n201dzka0r2fwjjfklzif8kgbkh102pw83irb0y93sjsj6kkm9l";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/muse.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    myers = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "myers";
+        ename = "myers";
+        version = "0.1.0.20221221.80834";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/myers-0.1.0.20221221.80834.tar";
+          sha256 = "1hk1587bni5sn9q91yv43s1i5dvbirbh2md46cx7c9y69bshyaqh";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/myers.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nadvice = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "nadvice";
+        ename = "nadvice";
+        version = "0.4.0.20230111.104526";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/nadvice-0.4.0.20230111.104526.tar";
+          sha256 = "0kcgdrcsjf4rqcb9k95amcvx3qx8qx7msnwjy21a87vc0w8gpv3r";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/nadvice.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nameless = callPackage ({ elpaBuild
+                            , emacs
+                            , fetchurl
+                            , lib }:
+      elpaBuild {
+        pname = "nameless";
+        ename = "nameless";
+        version = "1.0.2.0.20230112.95905";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/nameless-1.0.2.0.20230112.95905.tar";
+          sha256 = "0a8zjsm75k02ixynd5jxxniyj5yn4gbcvidi03jkk9z3vxr19vi7";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/nameless.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    names = callPackage ({ cl-lib ? null
+                         , elpaBuild
+                         , emacs
+                         , fetchurl
+                         , lib
+                         , nadvice }:
+      elpaBuild {
+        pname = "names";
+        ename = "names";
+        version = "20151201.0.0.20220425.173515";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/names-20151201.0.0.20220425.173515.tar";
+          sha256 = "1rd7v5yvb2d5zxcqmdjg7hmhgd12lhcrg03wm6sd1lq3jw0hbxhr";
+        };
+        packageRequires = [ cl-lib emacs nadvice ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/names.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nano-agenda = callPackage ({ elpaBuild
+                               , emacs
+                               , fetchurl
+                               , lib }:
+      elpaBuild {
+        pname = "nano-agenda";
+        ename = "nano-agenda";
+        version = "0.3.0.20230417.100538";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/nano-agenda-0.3.0.20230417.100538.tar";
+          sha256 = "1v7dx53zl0mw8ap91kvzwqb4kiikg14dsw3r49n0j5766nc320fv";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/nano-agenda.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nano-modeline = callPackage ({ elpaBuild
+                                 , emacs
+                                 , fetchurl
+                                 , lib }:
+      elpaBuild {
+        pname = "nano-modeline";
+        ename = "nano-modeline";
+        version = "1.0.0.0.20230603.175642";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/nano-modeline-1.0.0.0.20230603.175642.tar";
+          sha256 = "11wjf5rda157h60m5v2dhmigc91jr043x76g49fyzmk2v60ilrak";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/nano-modeline.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nano-theme = callPackage ({ elpaBuild
+                              , emacs
+                              , fetchurl
+                              , lib }:
+      elpaBuild {
+        pname = "nano-theme";
+        ename = "nano-theme";
+        version = "0.3.4.0.20230421.53238";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/nano-theme-0.3.4.0.20230421.53238.tar";
+          sha256 = "04fmfzy965d6wbaxgpkgyxaw9qv6103gc9g8kw1gcvbxdgq0rf56";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/nano-theme.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nftables-mode = callPackage ({ elpaBuild
+                                 , emacs
+                                 , fetchurl
+                                 , lib }:
+      elpaBuild {
+        pname = "nftables-mode";
+        ename = "nftables-mode";
+        version = "1.1.0.20221221.80909";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/nftables-mode-1.1.0.20221221.80909.tar";
+          sha256 = "11a38dgnnvzsh6k7l8n1fzkn8ma4mj3sv17r2614g4jjkmwkaz0i";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/nftables-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nhexl-mode = callPackage ({ elpaBuild
+                              , emacs
+                              , fetchurl
+                              , lib }:
+      elpaBuild {
+        pname = "nhexl-mode";
+        ename = "nhexl-mode";
+        version = "1.5.0.20221215.152407";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/nhexl-mode-1.5.0.20221215.152407.tar";
+          sha256 = "10jxk0n8x8lr7chfnr562gmyfmcsh25xc1vsqw802c0y3l8z3jw1";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/nhexl-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nlinum = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "nlinum";
+        ename = "nlinum";
+        version = "1.9.0.20221221.80940";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/nlinum-1.9.0.20221221.80940.tar";
+          sha256 = "1vifq3rlh9zwrqq0zkhdqv1g2pzgndyxjdr21xis6kxdc50s59l1";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/nlinum.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    notes-mode = callPackage ({ elpaBuild
+                              , fetchurl
+                              , lib }:
+      elpaBuild {
+        pname = "notes-mode";
+        ename = "notes-mode";
+        version = "1.30.0.20201201.121157";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/notes-mode-1.30.0.20201201.121157.tar";
+          sha256 = "0jliwzbmn89qfjfd096sa5gia52mqvivg8kif41mrmczbhzgqp6a";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/notes-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    notmuch-indicator = callPackage ({ elpaBuild
+                                     , emacs
+                                     , fetchurl
+                                     , lib }:
+      elpaBuild {
+        pname = "notmuch-indicator";
+        ename = "notmuch-indicator";
+        version = "0.2.2.0.20230101.153332";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/notmuch-indicator-0.2.2.0.20230101.153332.tar";
+          sha256 = "1rh3gqq5ihcvpslykqdx32g6l2dlxyj86i7q1kjanhjc6yirbc37";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/notmuch-indicator.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ntlm = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "ntlm";
+        ename = "ntlm";
+        version = "2.1.0.0.20230506.82958";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/ntlm-2.1.0.0.20230506.82958.tar";
+          sha256 = "0y4jd98bwv8bzypai2ahspknxgq0a90bn6pqfn9d65ddf611rswl";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ntlm.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    num3-mode = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "num3-mode";
+        ename = "num3-mode";
+        version = "1.5.0.20221221.81242";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/num3-mode-1.5.0.20221221.81242.tar";
+          sha256 = "0pwlklfmz0brsq2l4zkvmg18hryc9cszsbyn0ky9n8nz0m9nfxsw";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/num3-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    oauth2 = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }:
+      elpaBuild {
+        pname = "oauth2";
+        ename = "oauth2";
+        version = "0.16.0.20221221.81302";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/oauth2-0.16.0.20221221.81302.tar";
+          sha256 = "1hxmwsb56m73qr4nqfh32bhbd8b0bl5yfccsk754sjywpn1wnlpq";
+        };
+        packageRequires = [ cl-lib nadvice ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/oauth2.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ob-haxe = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "ob-haxe";
+        ename = "ob-haxe";
+        version = "1.0.0.20210211.73431";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/ob-haxe-1.0.0.20210211.73431.tar";
+          sha256 = "18i9wmchnaz0hnh1bb3sydawxrcxqy1gfp150i69p0miwsfmz7ip";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ob-haxe.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    objed = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "objed";
+        ename = "objed";
+        version = "0.8.3.0.20201002.84752";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/objed-0.8.3.0.20201002.84752.tar";
+          sha256 = "1ar3i58cb55958dnj88bxa5wnmlz4dnfh76m7nf0kf5sld71l0vf";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/objed.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    omn-mode = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "omn-mode";
+        ename = "omn-mode";
+        version = "1.2.0.20221221.81322";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/omn-mode-1.2.0.20221221.81322.tar";
+          sha256 = "0bpp3aj93srdmqbh33k36q9762dzzagymh1rxca2axdfb7q7xsa2";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/omn-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    on-screen = callPackage ({ cl-lib ? null
+                             , elpaBuild
+                             , fetchurl
+                             , lib }:
+      elpaBuild {
+        pname = "on-screen";
+        ename = "on-screen";
+        version = "1.3.3.0.20201127.191411";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/on-screen-1.3.3.0.20201127.191411.tar";
+          sha256 = "123kq277vcm4backwdpmnmkkqiplnnbpf62ppn5cg8zl09r87cl6";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/on-screen.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    openpgp = callPackage ({ elpaBuild
+                           , emacs
+                           , fetchurl
+                           , lib }:
+      elpaBuild {
+        pname = "openpgp";
+        ename = "openpgp";
+        version = "1.0.1.0.20230325.141904";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/openpgp-1.0.1.0.20230325.141904.tar";
+          sha256 = "1zpdxm8s7kd936klrsyf72g7my4ffci74cc9gwasgff4r383f000";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/openpgp.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    orderless = callPackage ({ elpaBuild
+                             , emacs
+                             , fetchurl
+                             , lib }:
+      elpaBuild {
+        pname = "orderless";
+        ename = "orderless";
+        version = "1.0.0.20230219.104813";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/orderless-1.0.0.20230219.104813.tar";
+          sha256 = "00il7zsahys2c53zr77rbnq18lffhpp3fhg8k09pc9zhx5b1arpn";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/orderless.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-contacts = callPackage ({ elpaBuild
+                                , emacs
+                                , fetchurl
+                                , lib
+                                , org }:
+      elpaBuild {
+        pname = "org-contacts";
+        ename = "org-contacts";
+        version = "1.1.0.20230227.141730";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/org-contacts-1.1.0.20230227.141730.tar";
+          sha256 = "0y78hwcranqdlm9lip623v5qaj15gv335lnxaakxra9dfri703fm";
+        };
+        packageRequires = [ emacs org ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/org-contacts.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-edna = callPackage ({ elpaBuild
+                            , emacs
+                            , fetchurl
+                            , lib
+                            , org
+                            , seq }:
+      elpaBuild {
+        pname = "org-edna";
+        ename = "org-edna";
+        version = "1.1.2.0.20200902.94459";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/org-edna-1.1.2.0.20200902.94459.tar";
+          sha256 = "0s7485x4dblrz2gnnd9qxaq3jph16z5ylp1na3b0mi60v0ibnwa4";
+        };
+        packageRequires = [ emacs org seq ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/org-edna.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-modern = callPackage ({ compat
+                              , elpaBuild
+                              , emacs
+                              , fetchurl
+                              , lib }:
+      elpaBuild {
+        pname = "org-modern";
+        ename = "org-modern";
+        version = "0.9.0.20230604.100249";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/org-modern-0.9.0.20230604.100249.tar";
+          sha256 = "0f7qnkh1cj4hmgxg6l7vmqq3fcck2shaszbfk86m94why3agh708";
+        };
+        packageRequires = [ compat emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/org-modern.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-notify = callPackage ({ elpaBuild
+                              , emacs
+                              , fetchurl
+                              , lib }:
+      elpaBuild {
+        pname = "org-notify";
+        ename = "org-notify";
+        version = "0.1.0.0.20221102.174044";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/org-notify-0.1.0.0.20221102.174044.tar";
+          sha256 = "1jp3d7f63jkqhamihc7x1pmcj0k2bg1y8hp4akjdv5sfwxm2gr9q";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/org-notify.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-real = callPackage ({ boxy
+                            , elpaBuild
+                            , emacs
+                            , fetchurl
+                            , lib
+                            , org }:
+      elpaBuild {
+        pname = "org-real";
+        ename = "org-real";
+        version = "1.0.6.0.20221114.84409";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/org-real-1.0.6.0.20221114.84409.tar";
+          sha256 = "1xmix5ldxxkh249fgyqlp31yndl14gz3ylpcsh6l9hmwqagzg20x";
+        };
+        packageRequires = [ boxy emacs org ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/org-real.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-remark = callPackage ({ elpaBuild
+                              , emacs
+                              , fetchurl
+                              , lib
+                              , org }:
+      elpaBuild {
+        pname = "org-remark";
+        ename = "org-remark";
+        version = "1.1.0.0.20230520.73005";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/org-remark-1.1.0.0.20230520.73005.tar";
+          sha256 = "1vq1wb4z0csrxysvv1k0ysj81v53c0ayyc49xvigjadn53v9rqdr";
+        };
+        packageRequires = [ emacs org ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/org-remark.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-transclusion = callPackage ({ elpaBuild
+                                    , emacs
+                                    , fetchurl
+                                    , lib
+                                    , org }:
+      elpaBuild {
+        pname = "org-transclusion";
+        ename = "org-transclusion";
+        version = "1.3.2.0.20230524.192243";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/org-transclusion-1.3.2.0.20230524.192243.tar";
+          sha256 = "0kw1kwgrsv5xbj3qkhqp11gh0w7q8p347frg6cqm8wsyp49psl9r";
+        };
+        packageRequires = [ emacs org ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/org-transclusion.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-translate = callPackage ({ elpaBuild
+                                 , emacs
+                                 , fetchurl
+                                 , lib
+                                 , org }:
+      elpaBuild {
+        pname = "org-translate";
+        ename = "org-translate";
+        version = "0.1.4.0.20220312.90634";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/org-translate-0.1.4.0.20220312.90634.tar";
+          sha256 = "1lgnr4swyh1irq7q8x6di1kmglr1h4ph864mz3491pxks9y0hxjx";
+        };
+        packageRequires = [ emacs org ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/org-translate.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    orgalist = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "orgalist";
+        ename = "orgalist";
+        version = "1.13.0.20221221.81335";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/orgalist-1.13.0.20221221.81335.tar";
+          sha256 = "0blq29dbzxssrmxs31q51z5085z6ym2iyr5bjjp81ar3qpa0v86f";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/orgalist.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    osc = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "osc";
+        ename = "osc";
+        version = "0.4.0.20221221.81343";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/osc-0.4.0.20221221.81343.tar";
+          sha256 = "1q4sd2pf492gyqhdrkj7qn4zh1x3jhwb1mxgs811k28fl16hanqh";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/osc.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    osm = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "osm";
+        ename = "osm";
+        version = "0.12.0.20230518.153430";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/osm-0.12.0.20230518.153430.tar";
+          sha256 = "1fyzahk86lhzb6j8p1996364j3a66pg54q655ifvd124pij6xbi9";
+        };
+        packageRequires = [ compat emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/osm.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    other-frame-window = callPackage ({ elpaBuild
+                                      , emacs
+                                      , fetchurl
+                                      , lib }:
+      elpaBuild {
+        pname = "other-frame-window";
+        ename = "other-frame-window";
+        version = "1.0.6.0.20221221.81352";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/other-frame-window-1.0.6.0.20221221.81352.tar";
+          sha256 = "1w0lqbrgjkf5l7n1zrqlbldznhzb1xshhdg68mxydq97rhbl1msg";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/other-frame-window.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pabbrev = callPackage ({ elpaBuild
+                           , fetchurl
+                           , lib }:
+      elpaBuild {
+        pname = "pabbrev";
+        ename = "pabbrev";
+        version = "4.2.2.0.20230101.115226";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/pabbrev-4.2.2.0.20230101.115226.tar";
+          sha256 = "0wx9833z07riclppprjwf08s7kybwg1145rzxwxrk1gjv2glq4lj";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/pabbrev.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    paced = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "paced";
+        ename = "paced";
+        version = "1.1.3.0.20190227.204125";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/paced-1.1.3.0.20190227.204125.tar";
+          sha256 = "09ain2dq42j6bvvchddr077z9dbsmx09qg88yklqi3pc4rc7f3rv";
+        };
+        packageRequires = [ async emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/paced.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    package-fixes = callPackage ({ elpaBuild
+                                 , fetchurl
+                                 , lib }:
+      elpaBuild {
+        pname = "package-fixes";
+        ename = "package-fixes";
+        version = "0.0.20221221.81359";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/package-fixes-0.0.20221221.81359.tar";
+          sha256 = "0n86dq8l2hwknilrx0871w8w4i9hnkndjj6q0yas5gm8jm4w0wfq";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/package-fixes.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    parsec = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "parsec";
+        ename = "parsec";
+        version = "0.1.3.0.20180729.171626";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/parsec-0.1.3.0.20180729.171626.tar";
+          sha256 = "1icrhga35n6nvwa8dy939cc2cc1phvqh27xr1blqdxgcyyzm9ava";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/parsec.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    parser-generator = callPackage ({ elpaBuild
+                                    , emacs
+                                    , fetchurl
+                                    , lib }:
+      elpaBuild {
+        pname = "parser-generator";
+        ename = "parser-generator";
+        version = "0.1.6.0.20220512.173154";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/parser-generator-0.1.6.0.20220512.173154.tar";
+          sha256 = "16kl8r8mgq17230gi2v61cqhxwawp1m6xjrbhc3qdlhy6plgidcy";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/parser-generator.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    path-iterator = callPackage ({ elpaBuild
+                                 , emacs
+                                 , fetchurl
+                                 , lib }:
+      elpaBuild {
+        pname = "path-iterator";
+        ename = "path-iterator";
+        version = "1.0.0.20221221.81414";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/path-iterator-1.0.0.20221221.81414.tar";
+          sha256 = "12ap8ij593dkba4kahqwzvpd9d62894z4hlplwz0c59qpy90lyxb";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/path-iterator.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    peg = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "peg";
+        ename = "peg";
+        version = "1.0.1.0.20221221.81502";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/peg-1.0.1.0.20221221.81502.tar";
+          sha256 = "1m5wl30zdq6fxllxkqblil6r1dqqsprdnqvlxivka6f0khbc6wdk";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/peg.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    perl-doc = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "perl-doc";
+        ename = "perl-doc";
+        version = "0.6.0.20220929.155443";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/perl-doc-0.6.0.20220929.155443.tar";
+          sha256 = "0sz036kvymq14ph03gqkzxmz4r64b8g44phx7bmz70w803w9rpxd";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/perl-doc.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    persist = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "persist";
+        ename = "persist";
+        version = "0.5.0.20220622.42135";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/persist-0.5.0.20220622.42135.tar";
+          sha256 = "1vgrj3b6iblj5mkzd3lv9dx4h12pbia89gpab02w774i4yq13k9d";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/persist.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    phps-mode = callPackage ({ elpaBuild
+                             , emacs
+                             , fetchurl
+                             , lib }:
+      elpaBuild {
+        pname = "phps-mode";
+        ename = "phps-mode";
+        version = "0.4.46.0.20230414.164307";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/phps-mode-0.4.46.0.20230414.164307.tar";
+          sha256 = "14m5gl1scj9rbn83wp35460vn71nc6fjmmmqw3pz5lzjcwxarvpq";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/phps-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pinentry = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "pinentry";
+        ename = "pinentry";
+        version = "0.1.0.20180116.131526";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/pinentry-0.1.0.20180116.131526.tar";
+          sha256 = "152g6d7b084rzqpm7fw49rmgxx6baivhhjbb0q3ci0c3b4k01lbq";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/pinentry.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    poke = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "poke";
+        ename = "poke";
+        version = "3.2.0.20230517.100500";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/poke-3.2.0.20230517.100500.tar";
+          sha256 = "0y5qrnqlhvvynvd1fknl0xp9d8bq55bnn2ms6lpbr0sd7ixh24qq";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/poke.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    poke-mode = callPackage ({ elpaBuild
+                             , fetchurl
+                             , lib }:
+      elpaBuild {
+        pname = "poke-mode";
+        ename = "poke-mode";
+        version = "3.0.0.20230312.110305";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/poke-mode-3.0.0.20230312.110305.tar";
+          sha256 = "0zm1kgvf8qypzjg2c256s0lhp3idybl0dzwszaa1yjpv7hs792ky";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/poke-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    poker = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "poker";
+        ename = "poker";
+        version = "0.2.0.20221221.81510";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/poker-0.2.0.20221221.81510.tar";
+          sha256 = "048i3l2z7pkxaphmb731cks0bw3w07arnpls2smm4dv51js14g5j";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/poker.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    polymode = callPackage ({ elpaBuild
+                            , emacs
+                            , fetchurl
+                            , lib }:
+      elpaBuild {
+        pname = "polymode";
+        ename = "polymode";
+        version = "0.2.2.0.20230317.121821";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/polymode-0.2.2.0.20230317.121821.tar";
+          sha256 = "129k592y80jixsff2h0bjvn1z1mcl9lwl4gc2sk1fg3vdq6984ng";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/polymode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    posframe = callPackage ({ elpaBuild
+                            , emacs
+                            , fetchurl
+                            , lib }:
+      elpaBuild {
+        pname = "posframe";
+        ename = "posframe";
+        version = "1.4.2.0.20230601.152949";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/posframe-1.4.2.0.20230601.152949.tar";
+          sha256 = "02s06gn7s2idf372p62gn7zbkg9az52wgrbd8zkd8fjc2q7mh5bc";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/posframe.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pq = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "pq";
+        ename = "pq";
+        version = "0.1.0.20220719.42000";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/pq-0.1.0.20220719.42000.tar";
+          sha256 = "11anvvmsjrfcfcz5sxfd40gsm6mlmc9llrvdnwhp4dsvi2llqv65";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/pq.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    prefixed-core = callPackage ({ elpaBuild
+                                 , fetchurl
+                                 , lib }:
+      elpaBuild {
+        pname = "prefixed-core";
+        ename = "prefixed-core";
+        version = "0.0.20221212.225529";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/prefixed-core-0.0.20221212.225529.tar";
+          sha256 = "10a58xidv1b9yz8bps4ihhx5fl4w337695jmm66dpmphjvmr0hi4";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/prefixed-core.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    project = callPackage ({ elpaBuild, emacs, fetchurl, lib, xref }:
+      elpaBuild {
+        pname = "project";
+        ename = "project";
+        version = "0.9.8.0.20230603.55058";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/project-0.9.8.0.20230603.55058.tar";
+          sha256 = "0bb31z07i9vd5w2j5bv93hzv7c4ahc484v9334n50zlqfphapvzy";
+        };
+        packageRequires = [ emacs xref ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/project.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    psgml = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "psgml";
+        ename = "psgml";
+        version = "1.3.5.0.20221229.184738";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/psgml-1.3.5.0.20221229.184738.tar";
+          sha256 = "055dpaylampjl53vby2b2lvmyfgjqjy64mpda6inmbc93jd3rq90";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/psgml.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pspp-mode = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "pspp-mode";
+        ename = "pspp-mode";
+        version = "1.1.0.20221221.81719";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/pspp-mode-1.1.0.20221221.81719.tar";
+          sha256 = "0awha64p3dyqpahsyr7dbhkprq3mizv239g6q4jiws6laqk54gqz";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/pspp-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pulsar = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "pulsar";
+        ename = "pulsar";
+        version = "0.5.0.0.20230306.95333";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/pulsar-0.5.0.0.20230306.95333.tar";
+          sha256 = "1m6fws539lp8852aj40kl0cwsr1madg41l1clirgrxv8bsvkc9vd";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/pulsar.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pyim = callPackage ({ async, elpaBuild, emacs, fetchurl, lib, xr }:
+      elpaBuild {
+        pname = "pyim";
+        ename = "pyim";
+        version = "5.3.2.0.20230412.13407";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/pyim-5.3.2.0.20230412.13407.tar";
+          sha256 = "0q4rnvrhvyybyadcc4nlrvzd54i41rxacfvh0ysc2cfiqcw9mkjv";
+        };
+        packageRequires = [ async emacs xr ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/pyim.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pyim-basedict = callPackage ({ elpaBuild
+                                 , fetchurl
+                                 , lib }:
+      elpaBuild {
+        pname = "pyim-basedict";
+        ename = "pyim-basedict";
+        version = "0.5.4.0.20220614.110824";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/pyim-basedict-0.5.4.0.20220614.110824.tar";
+          sha256 = "0bf6fwjid16xhdyxaj229xra94qv5zaqwajqccd0y32bpw3ldf9f";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/pyim-basedict.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    python = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib, seq }:
+      elpaBuild {
+        pname = "python";
+        ename = "python";
+        version = "0.28.0.20230603.55058";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/python-0.28.0.20230603.55058.tar";
+          sha256 = "083l5b0vppdi6pjkb2hh1wa12ja0z0ndqjzn4a7pry118xbjp4vz";
+        };
+        packageRequires = [ compat emacs seq ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/python.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    quarter-plane = callPackage ({ elpaBuild
+                                 , fetchurl
+                                 , lib }:
+      elpaBuild {
+        pname = "quarter-plane";
+        ename = "quarter-plane";
+        version = "0.1.0.20221221.81727";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/quarter-plane-0.1.0.20221221.81727.tar";
+          sha256 = "17ahmyi0jih6jxplw5lpw50yq2rji8y7irgpxsd65xxj3fzydjrr";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/quarter-plane.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    queue = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "queue";
+        ename = "queue";
+        version = "0.2.0.20210306.173709";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/queue-0.2.0.20210306.173709.tar";
+          sha256 = "0sp42hjqdhyc3jayjrn2zrcz4rqn3ww9yqhq9nl8rwxh9b9xk4x4";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/queue.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rainbow-mode = callPackage ({ elpaBuild
+                                , fetchurl
+                                , lib }:
+      elpaBuild {
+        pname = "rainbow-mode";
+        ename = "rainbow-mode";
+        version = "1.0.6.0.20221221.81735";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/rainbow-mode-1.0.6.0.20221221.81735.tar";
+          sha256 = "1rwng66c7439m6dngl3b99162ranx6bwliy214vvv7i1qb92j3g7";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/rainbow-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rbit = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "rbit";
+        ename = "rbit";
+        version = "0.1.0.20201128.182847";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/rbit-0.1.0.20201128.182847.tar";
+          sha256 = "0n16yy2qbgiv1ykzhga62j8w8dwawb1b8z7qq7mkpxwbyd44c1i3";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/rbit.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rcirc-color = callPackage ({ elpaBuild
+                               , emacs
+                               , fetchurl
+                               , lib }:
+      elpaBuild {
+        pname = "rcirc-color";
+        ename = "rcirc-color";
+        version = "0.4.5.0.20230414.195045";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/rcirc-color-0.4.5.0.20230414.195045.tar";
+          sha256 = "0d0q5nvndpzxl0f8q6ahbia2j4mk4k9h1krw09n44i7jg45277v4";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/rcirc-color.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rcirc-menu = callPackage ({ elpaBuild
+                              , fetchurl
+                              , lib }:
+      elpaBuild {
+        pname = "rcirc-menu";
+        ename = "rcirc-menu";
+        version = "1.1.0.20221221.81818";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/rcirc-menu-1.1.0.20221221.81818.tar";
+          sha256 = "08cqb3p76qanii46vvpn31ngz4zjqwfplnrfwdlg12pnhz75fx0m";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/rcirc-menu.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    realgud = callPackage ({ elpaBuild
+                           , emacs
+                           , fetchurl
+                           , lib
+                           , load-relative
+                           , loc-changes
+                           , test-simple }:
+      elpaBuild {
+        pname = "realgud";
+        ename = "realgud";
+        version = "1.5.1.0.20220818.135039";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/realgud-1.5.1.0.20220818.135039.tar";
+          sha256 = "0sazlcbwmdyn4g8lyak0bl44nq8qkr2qajdnr9xd4dqkhvz9w4gd";
+        };
+        packageRequires = [ emacs load-relative loc-changes test-simple ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/realgud.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    realgud-ipdb = callPackage ({ elpaBuild
+                                , emacs
+                                , fetchurl
+                                , lib
+                                , load-relative
+                                , realgud }:
+      elpaBuild {
+        pname = "realgud-ipdb";
+        ename = "realgud-ipdb";
+        version = "1.0.0.0.20230320.62057";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/realgud-ipdb-1.0.0.0.20230320.62057.tar";
+          sha256 = "0h5j1n835mm4y8rg0j52gvbkdp5r722hk7sxphhci09smjwncg1l";
+        };
+        packageRequires = [ emacs load-relative realgud ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/realgud-ipdb.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    realgud-jdb = callPackage ({ elpaBuild
+                               , emacs
+                               , fetchurl
+                               , lib
+                               , load-relative
+                               , realgud }:
+      elpaBuild {
+        pname = "realgud-jdb";
+        ename = "realgud-jdb";
+        version = "1.0.0.0.20200722.72030";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/realgud-jdb-1.0.0.0.20200722.72030.tar";
+          sha256 = "1dmgw2bdwh20wr4yi66aamj48pkzmaz3ilhdx68qsirw5n48qg83";
+        };
+        packageRequires = [ emacs load-relative realgud ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/realgud-jdb.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    realgud-lldb = callPackage ({ elpaBuild
+                                , emacs
+                                , fetchurl
+                                , lib
+                                , load-relative
+                                , realgud }:
+      elpaBuild {
+        pname = "realgud-lldb";
+        ename = "realgud-lldb";
+        version = "1.0.2.0.20230319.171320";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/realgud-lldb-1.0.2.0.20230319.171320.tar";
+          sha256 = "15azvxwq861i6j61sj0240mxdq725wbln1wpim5pn45wzqh56zmv";
+        };
+        packageRequires = [ emacs load-relative realgud ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/realgud-lldb.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    realgud-node-debug = callPackage ({ cl-lib ? null
+                                      , elpaBuild
+                                      , emacs
+                                      , fetchurl
+                                      , lib
+                                      , load-relative
+                                      , realgud }:
+      elpaBuild {
+        pname = "realgud-node-debug";
+        ename = "realgud-node-debug";
+        version = "1.0.0.0.20190525.123417";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/realgud-node-debug-1.0.0.0.20190525.123417.tar";
+          sha256 = "1w4n28pv65yzkz8lzn3sicz4il7gx4gxwgzwc6sp21yhb05kfz09";
+        };
+        packageRequires = [ cl-lib emacs load-relative realgud ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/realgud-node-debug.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    realgud-node-inspect = callPackage ({ cl-lib ? null
+                                        , elpaBuild
+                                        , emacs
+                                        , fetchurl
+                                        , lib
+                                        , load-relative
+                                        , realgud }:
+      elpaBuild {
+        pname = "realgud-node-inspect";
+        ename = "realgud-node-inspect";
+        version = "1.0.0.0.20190526.154549";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/realgud-node-inspect-1.0.0.0.20190526.154549.tar";
+          sha256 = "1ds40vq756b8vkc7yqacrgm72jj09kq92dprqlmr215r7s8fdglk";
+        };
+        packageRequires = [ cl-lib emacs load-relative realgud ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/realgud-node-inspect.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    realgud-trepan-ni = callPackage ({ elpaBuild
+                                     , emacs
+                                     , fetchurl
+                                     , lib
+                                     , load-relative
+                                     , realgud }:
+      elpaBuild {
+        pname = "realgud-trepan-ni";
+        ename = "realgud-trepan-ni";
+        version = "1.0.1.0.20210513.183733";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/realgud-trepan-ni-1.0.1.0.20210513.183733.tar";
+          sha256 = "1gly5hvndc0hg1dfn9b12hbxa0wnlbz8zw9jzjzz5kj2d0fzjswx";
+        };
+        packageRequires = [ emacs load-relative realgud ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/realgud-trepan-ni.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    realgud-trepan-xpy = callPackage ({ elpaBuild
+                                      , emacs
+                                      , fetchurl
+                                      , lib
+                                      , load-relative
+                                      , realgud }:
+      elpaBuild {
+        pname = "realgud-trepan-xpy";
+        ename = "realgud-trepan-xpy";
+        version = "1.0.1.0.20230322.184556";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/realgud-trepan-xpy-1.0.1.0.20230322.184556.tar";
+          sha256 = "01h2v8jy0dl1xf7k938iinwkfb4zxrfr73z9s6jc59rrbybsqvha";
+        };
+        packageRequires = [ emacs load-relative realgud ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/realgud-trepan-xpy.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rec-mode = callPackage ({ elpaBuild
+                            , emacs
+                            , fetchurl
+                            , lib }:
+      elpaBuild {
+        pname = "rec-mode";
+        ename = "rec-mode";
+        version = "1.9.1.0.20221220.80844";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/rec-mode-1.9.1.0.20221220.80844.tar";
+          sha256 = "0wzc76phg755q47qrin32i7a6d3g5qrsvlnl3kfzhncmjcb118lh";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/rec-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    register-list = callPackage ({ elpaBuild
+                                 , fetchurl
+                                 , lib }:
+      elpaBuild {
+        pname = "register-list";
+        ename = "register-list";
+        version = "0.1.0.20221212.230034";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/register-list-0.1.0.20221212.230034.tar";
+          sha256 = "1b0099yhvjd69xvcdvn65nx49xay06n2qzafw6fnn7qi22nbvah7";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/register-list.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    relint = callPackage ({ elpaBuild, emacs, fetchurl, lib, xr }:
+      elpaBuild {
+        pname = "relint";
+        ename = "relint";
+        version = "1.22.0.20230326.142643";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/relint-1.22.0.20230326.142643.tar";
+          sha256 = "0ac7rckvvccvnlm52dw5dl83g5ywzziwkw6mnkgs27017mn3dlfh";
+        };
+        packageRequires = [ emacs xr ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/relint.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    repology = callPackage ({ elpaBuild
+                            , emacs
+                            , fetchurl
+                            , lib }:
+      elpaBuild {
+        pname = "repology";
+        ename = "repology";
+        version = "1.2.3.0.20220320.111223";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/repology-1.2.3.0.20220320.111223.tar";
+          sha256 = "01gxmfr5v2zj0mj0i9ffk824qxdjfwc773vh4fyv67im2m17i8wc";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/repology.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rich-minority = callPackage ({ cl-lib ? null
+                                 , elpaBuild
+                                 , fetchurl
+                                 , lib }:
+      elpaBuild {
+        pname = "rich-minority";
+        ename = "rich-minority";
+        version = "1.0.3.0.20190419.83620";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/rich-minority-1.0.3.0.20190419.83620.tar";
+          sha256 = "08xdd9gmay0xi2dzk08n30asfzqkhxqfrlvs099pxdd0klgsz60m";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/rich-minority.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rnc-mode = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "rnc-mode";
+        ename = "rnc-mode";
+        version = "0.3.0.20221221.81910";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/rnc-mode-0.3.0.20221221.81910.tar";
+          sha256 = "1jyi7z0y31c994x9l6pv2j4bkc7m1lrhzk92xdvar003zvll32q9";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/rnc-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rt-liberation = callPackage ({ elpaBuild
+                                 , fetchurl
+                                 , lib }:
+      elpaBuild {
+        pname = "rt-liberation";
+        ename = "rt-liberation";
+        version = "5.0.20220503.141657";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/rt-liberation-5.0.20220503.141657.tar";
+          sha256 = "0bx4zh21pfl6df5hj3ny6p3b6askjkk8jkqajj8lldwd8x5fyz6c";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/rt-liberation.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ruby-end = callPackage ({ elpaBuild
+                            , fetchurl
+                            , lib }:
+      elpaBuild {
+        pname = "ruby-end";
+        ename = "ruby-end";
+        version = "0.4.3.0.20230205.12506";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/ruby-end-0.4.3.0.20230205.12506.tar";
+          sha256 = "0l2dbpmhimqb8q5zjjmrf0lriwff4vwwrsba61fiyd3lzk0v0hl2";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ruby-end.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rudel = callPackage ({ cl-generic
+                         , cl-lib ? null
+                         , cl-print ? null
+                         , elpaBuild
+                         , emacs
+                         , fetchurl
+                         , lib }:
+      elpaBuild {
+        pname = "rudel";
+        ename = "rudel";
+        version = "0.3.2.0.20221212.230154";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/rudel-0.3.2.0.20221212.230154.tar";
+          sha256 = "1q3a4j14ww5wjyxr8b7ksqcckvm8cx44jy9sl117s7g9if48yn03";
+        };
+        packageRequires = [ cl-generic cl-lib cl-print emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/rudel.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    satchel = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }:
+      elpaBuild {
+        pname = "satchel";
+        ename = "satchel";
+        version = "0.2.0.20220223.202624";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/satchel-0.2.0.20220223.202624.tar";
+          sha256 = "0akcfjfw69r504qkcwr81vrxjhvkpmf19vy9d0dzlgc9v5m3p1h1";
+        };
+        packageRequires = [ emacs project ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/satchel.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    scanner = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "scanner";
+        ename = "scanner";
+        version = "0.2.0.20210104.105054";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/scanner-0.2.0.20210104.105054.tar";
+          sha256 = "1az7rg4n744ya0ba9fcggqhm3mjhpzwzhygyracsx7n5gry5slgv";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/scanner.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    scroll-restore = callPackage ({ elpaBuild
+                                  , fetchurl
+                                  , lib }:
+      elpaBuild {
+        pname = "scroll-restore";
+        ename = "scroll-restore";
+        version = "1.0.0.20221221.81959";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/scroll-restore-1.0.0.20221221.81959.tar";
+          sha256 = "08x45fk4m4pg33rdy911hhmnp5kvx2l1dq94s108nk5wznbzx578";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/scroll-restore.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sed-mode = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "sed-mode";
+        ename = "sed-mode";
+        version = "1.0.0.20221221.82014";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/sed-mode-1.0.0.20221221.82014.tar";
+          sha256 = "1c2wdqazxwlllihyyhikzf1zrr0a12pmn789mwjchfv1y6r5iq55";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/sed-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    seq = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "seq";
+        ename = "seq";
+        version = "2.23.0.20221221.82021";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/seq-2.23.0.20221221.82021.tar";
+          sha256 = "0v9zg4csf8r6ficdc9y418dw6w3zc2vmr4m6ayxybh5iawzpnlrg";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/seq.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    setup = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "setup";
+        ename = "setup";
+        version = "1.3.2.0.20230316.95834";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/setup-1.3.2.0.20230316.95834.tar";
+          sha256 = "1vbl9hxhy4nf4an4ibgcmv06l74a32rzi8qv7bjfh8k5f10h5ndv";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/setup.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shelisp = callPackage ({ elpaBuild
+                           , fetchurl
+                           , lib }:
+      elpaBuild {
+        pname = "shelisp";
+        ename = "shelisp";
+        version = "1.0.0.0.20221212.230255";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/shelisp-1.0.0.0.20221212.230255.tar";
+          sha256 = "0n673afq17fp3h3chs0acszv72dkqj9yd5x2ll6jgkyk74dka0fm";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/shelisp.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shell-command-plus = callPackage ({ elpaBuild
+                                      , emacs
+                                      , fetchurl
+                                      , lib }:
+      elpaBuild {
+        pname = "shell-command-plus";
+        ename = "shell-command+";
+        version = "2.4.2.0.20230311.131100";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/shell-command+-2.4.2.0.20230311.131100.tar";
+          sha256 = "03nlyl4r5dm2hr3j0z1qw3s2v4zf0qvij350caalm08qmc9apama";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/shell-command+.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shell-quasiquote = callPackage ({ elpaBuild
+                                    , fetchurl
+                                    , lib }:
+      elpaBuild {
+        pname = "shell-quasiquote";
+        ename = "shell-quasiquote";
+        version = "0.0.20221221.82030";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/shell-quasiquote-0.0.20221221.82030.tar";
+          sha256 = "1mvz4y9jkkp96cf0ppmpzdzh86q1xrhx6yb9l93941qm33j0z4p8";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/shell-quasiquote.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shen-mode = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "shen-mode";
+        ename = "shen-mode";
+        version = "0.1.0.20221221.82050";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/shen-mode-0.1.0.20221221.82050.tar";
+          sha256 = "1r0kgk46hk2dk0923az6g44bmikrb2dxn9p5v4a9r1680yfgf0bn";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/shen-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sisu-mode = callPackage ({ elpaBuild
+                             , fetchurl
+                             , lib }:
+      elpaBuild {
+        pname = "sisu-mode";
+        ename = "sisu-mode";
+        version = "7.1.8.0.20221221.82114";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/sisu-mode-7.1.8.0.20221221.82114.tar";
+          sha256 = "18l11bvwp57gjh4v5w6pdslqbdc250hidrj5nlm4p5rfll5647ri";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/sisu-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    site-lisp = callPackage ({ elpaBuild
+                             , emacs
+                             , fetchurl
+                             , lib }:
+      elpaBuild {
+        pname = "site-lisp";
+        ename = "site-lisp";
+        version = "0.1.1.0.20230423.152517";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/site-lisp-0.1.1.0.20230423.152517.tar";
+          sha256 = "1kx5zcd38m806piz3k1zqjykw5m5rwgs7lmz43rr46d3q920kniw";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/site-lisp.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sketch-mode = callPackage ({ elpaBuild
+                               , fetchurl
+                               , lib }:
+      elpaBuild {
+        pname = "sketch-mode";
+        ename = "sketch-mode";
+        version = "1.0.4.0.20230420.122954";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/sketch-mode-1.0.4.0.20230420.122954.tar";
+          sha256 = "1vyzwrph9ifqbwlqprglk1fnlx9hnxm0caq9bxk9az8h021zzzha";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/sketch-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    slime-volleyball = callPackage ({ cl-lib ? null
+                                    , elpaBuild
+                                    , fetchurl
+                                    , lib }:
+      elpaBuild {
+        pname = "slime-volleyball";
+        ename = "slime-volleyball";
+        version = "1.2.0.0.20221221.82156";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/slime-volleyball-1.2.0.0.20221221.82156.tar";
+          sha256 = "0ys6r0vg43x0hdfc9kl2s8djk8zd4253x93prhbcakpsa7p4jb5v";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/slime-volleyball.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sm-c-mode = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "sm-c-mode";
+        ename = "sm-c-mode";
+        version = "1.1.0.20221221.82204";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/sm-c-mode-1.1.0.20221221.82204.tar";
+          sha256 = "0zdzncy64b2d2kp7bnlr6vk30ajbhmzzmvvdkbbacc3n03bpdv7d";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/sm-c-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smalltalk-mode = callPackage ({ elpaBuild
+                                  , fetchurl
+                                  , lib }:
+      elpaBuild {
+        pname = "smalltalk-mode";
+        ename = "smalltalk-mode";
+        version = "4.0.0.20221221.82225";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/smalltalk-mode-4.0.0.20221221.82225.tar";
+          sha256 = "0na04h27bxy6mqdx7mp5ys4bjvpmxfp19nh40jh6j584dchb8y3k";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/smalltalk-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smart-yank = callPackage ({ elpaBuild
+                              , emacs
+                              , fetchurl
+                              , lib }:
+      elpaBuild {
+        pname = "smart-yank";
+        ename = "smart-yank";
+        version = "0.1.1.0.20221221.82231";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/smart-yank-0.1.1.0.20221221.82231.tar";
+          sha256 = "1dhnzvw3igrzp12lcbqp9dpmzidawhyc9a5ryyp29qxqh539c2qm";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/smart-yank.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sml-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "sml-mode";
+        ename = "sml-mode";
+        version = "6.12.0.20230411.5343";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/sml-mode-6.12.0.20230411.5343.tar";
+          sha256 = "0qq1naxx7hhfi5q78vnw0s9vw6aign8kb08vlcj45xz4sp2w4nlj";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/sml-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    so-long = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "so-long";
+        ename = "so-long";
+        version = "1.1.2.0.20230101.53112";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/so-long-1.1.2.0.20230101.53112.tar";
+          sha256 = "03difjd7hd72a01b97sr30y2wk49nrh4imrlf0vfzgfii96n8k6i";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/so-long.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    soap-client = callPackage ({ cl-lib ? null
+                               , elpaBuild
+                               , emacs
+                               , fetchurl
+                               , lib }:
+      elpaBuild {
+        pname = "soap-client";
+        ename = "soap-client";
+        version = "3.2.3.0.20230512.51050";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/soap-client-3.2.3.0.20230512.51050.tar";
+          sha256 = "0cghw13gh8ck7p1kb5bxffqj98i4dnsvw6qbzl3fnh61libfpx7a";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/soap-client.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sokoban = callPackage ({ cl-lib ? null
+                           , elpaBuild
+                           , emacs
+                           , fetchurl
+                           , lib }:
+      elpaBuild {
+        pname = "sokoban";
+        ename = "sokoban";
+        version = "1.4.9.0.20220928.185052";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/sokoban-1.4.9.0.20220928.185052.tar";
+          sha256 = "19df4wdhrpn1rb927jg131hjwackaldra1rvxaq31zfd3rlj4dp8";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/sokoban.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sotlisp = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "sotlisp";
+        ename = "sotlisp";
+        version = "1.6.2.0.20220909.50328";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/sotlisp-1.6.2.0.20220909.50328.tar";
+          sha256 = "14jlvdhncm7fp5ajnzp931gbpnqg97ysiis0ajwkmwan3mmxlv89";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/sotlisp.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    spacious-padding = callPackage ({ elpaBuild
+                                    , emacs
+                                    , fetchurl
+                                    , lib }:
+      elpaBuild {
+        pname = "spacious-padding";
+        ename = "spacious-padding";
+        version = "0.1.0.0.20230606.175440";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/spacious-padding-0.1.0.0.20230606.175440.tar";
+          sha256 = "01541k8j5g920vnj3ds6ancqyi36n6ak00g4rq5vc6ia1ybxiijh";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/spacious-padding.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    spinner = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "spinner";
+        ename = "spinner";
+        version = "1.7.4.0.20220915.94959";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/spinner-1.7.4.0.20220915.94959.tar";
+          sha256 = "0n5xmq7iay11pxlj5av4wnx477jz48ac87838pppks9mmsaj24a7";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/spinner.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sql-beeline = callPackage ({ elpaBuild
+                               , fetchurl
+                               , lib }:
+      elpaBuild {
+        pname = "sql-beeline";
+        ename = "sql-beeline";
+        version = "0.2.0.20221221.82329";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/sql-beeline-0.2.0.20221221.82329.tar";
+          sha256 = "0lfn5nvv2xns1l71as5vvsiyspn1d50rh9ki2sihhjs6rx8mprnw";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/sql-beeline.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sql-cassandra = callPackage ({ elpaBuild
+                                 , emacs
+                                 , fetchurl
+                                 , lib }:
+      elpaBuild {
+        pname = "sql-cassandra";
+        ename = "sql-cassandra";
+        version = "0.2.2.0.20221221.82336";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/sql-cassandra-0.2.2.0.20221221.82336.tar";
+          sha256 = "1daljwlbs6ng64rcmpgzf5ac8diaapraqwc7j2f3v6z6rw261f97";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/sql-cassandra.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sql-indent = callPackage ({ cl-lib ? null
+                              , elpaBuild
+                              , fetchurl
+                              , lib }:
+      elpaBuild {
+        pname = "sql-indent";
+        ename = "sql-indent";
+        version = "1.6.0.20220728.130257";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/sql-indent-1.6.0.20220728.130257.tar";
+          sha256 = "0l9dl2h7c034frdk59yh443zxblj2ry43v8dwp3mf6d3zgllvnwk";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/sql-indent.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sql-smie = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "sql-smie";
+        ename = "sql-smie";
+        version = "0.0.20221221.82351";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/sql-smie-0.0.20221221.82351.tar";
+          sha256 = "0pl47qr62gxjnwhf5ryc9xkbf75pr8fvqzi050c1g17jxjmbjfqa";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/sql-smie.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    srht = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz }:
+      elpaBuild {
+        pname = "srht";
+        ename = "srht";
+        version = "0.2.0.20221114.63606";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/srht-0.2.0.20221114.63606.tar";
+          sha256 = "0y3xl9l0c7mjppsglwnbawrq4wx402mjvgnim2ilw1d7568ahi9i";
+        };
+        packageRequires = [ emacs plz ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/srht.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ssh-deploy = callPackage ({ elpaBuild
+                              , emacs
+                              , fetchurl
+                              , lib }:
+      elpaBuild {
+        pname = "ssh-deploy";
+        ename = "ssh-deploy";
+        version = "3.1.14.0.20230129.90300";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/ssh-deploy-3.1.14.0.20230129.90300.tar";
+          sha256 = "1184y9kc1x0jj8llz0hf0ysq64sxjhrdpikjl32gs7iilvpj950m";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ssh-deploy.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    standard-themes = callPackage ({ elpaBuild
+                                   , emacs
+                                   , fetchurl
+                                   , lib }:
+      elpaBuild {
+        pname = "standard-themes";
+        ename = "standard-themes";
+        version = "1.2.0.0.20230602.54907";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/standard-themes-1.2.0.0.20230602.54907.tar";
+          sha256 = "0fjibdx8hif1d82d4l7x3ky64b45l9qdyq1sgbv16qlyl5lbhnbb";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/standard-themes.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "stream";
+        ename = "stream";
+        version = "2.2.5.0.20221221.82401";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/stream-2.2.5.0.20221221.82401.tar";
+          sha256 = "0m23a2dmhj37z3x42s3fxaq2r6n6zbic89vqd38w22ww6pm8i47d";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/stream.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    substitute = callPackage ({ elpaBuild
+                              , emacs
+                              , fetchurl
+                              , lib }:
+      elpaBuild {
+        pname = "substitute";
+        ename = "substitute";
+        version = "0.1.8.0.20230409.85458";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/substitute-0.1.8.0.20230409.85458.tar";
+          sha256 = "1yrpkhbf0msa9pvhwwkcj49p9zk044872q1ifrnsr9av60klwfhv";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/substitute.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    svg = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "svg";
+        ename = "svg";
+        version = "1.1.0.20230101.53112";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/svg-1.1.0.20230101.53112.tar";
+          sha256 = "0hd4xha8fhxx7ahirp3s03ylz13xdsdgy4bix6d0vhmz0hpiiwk8";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/svg.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    svg-clock = callPackage ({ elpaBuild, emacs, fetchurl, lib, svg }:
+      elpaBuild {
+        pname = "svg-clock";
+        ename = "svg-clock";
+        version = "1.2.0.20221221.82408";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/svg-clock-1.2.0.20221221.82408.tar";
+          sha256 = "1ymg49fkacpay624dr0b5ggha68j83qlcca7jnidmm1v6cxq753j";
+        };
+        packageRequires = [ emacs svg ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/svg-clock.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    svg-lib = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "svg-lib";
+        ename = "svg-lib";
+        version = "0.2.6.0.20230403.73919";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/svg-lib-0.2.6.0.20230403.73919.tar";
+          sha256 = "0x88al3kpjvcala6p5wqg98kjich2q9gd3q63h2h8126y6al7kn5";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/svg-lib.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    svg-tag-mode = callPackage ({ elpaBuild
+                                , emacs
+                                , fetchurl
+                                , lib
+                                , svg-lib }:
+      elpaBuild {
+        pname = "svg-tag-mode";
+        ename = "svg-tag-mode";
+        version = "0.3.2.0.20230110.182450";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/svg-tag-mode-0.3.2.0.20230110.182450.tar";
+          sha256 = "0ym02nj3c2ca2dfkj5jyvzc1bq1ymhg5nq8r9rnjxh73y6069knw";
+        };
+        packageRequires = [ emacs svg-lib ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/svg-tag-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    swiper = callPackage ({ elpaBuild
+                          , emacs
+                          , fetchurl
+                          , ivy
+                          , lib }:
+      elpaBuild {
+        pname = "swiper";
+        ename = "swiper";
+        version = "0.14.0.0.20230410.182739";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/swiper-0.14.0.0.20230410.182739.tar";
+          sha256 = "10vqxmqdzvr7rg6wg5whzl4w9y4j47m330fx7qgvzi5zw28b69f3";
+        };
+        packageRequires = [ emacs ivy ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/swiper.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    switchy-window = callPackage ({ compat
+                                  , elpaBuild
+                                  , emacs
+                                  , fetchurl
+                                  , lib }:
+      elpaBuild {
+        pname = "switchy-window";
+        ename = "switchy-window";
+        version = "1.3.0.20230411.180529";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/switchy-window-1.3.0.20230411.180529.tar";
+          sha256 = "1x2y6rgbkj11c53kxybz3xslbaszm3pr6xzsx4s17sq1w4vv6dc4";
+        };
+        packageRequires = [ compat emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/switchy-window.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sxhkdrc-mode = callPackage ({ elpaBuild
+                                , emacs
+                                , fetchurl
+                                , lib }:
+      elpaBuild {
+        pname = "sxhkdrc-mode";
+        ename = "sxhkdrc-mode";
+        version = "1.0.0.0.20230210.123052";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/sxhkdrc-mode-1.0.0.0.20230210.123052.tar";
+          sha256 = "00449dipkxpl4ddv5cjzvsahig23wl2f9p42zpqjfsvvg2gcklk8";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/sxhkdrc-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    system-packages = callPackage ({ elpaBuild
+                                   , emacs
+                                   , fetchurl
+                                   , lib }:
+      elpaBuild {
+        pname = "system-packages";
+        ename = "system-packages";
+        version = "1.0.11.0.20220409.62318";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/system-packages-1.0.11.0.20220409.62318.tar";
+          sha256 = "0lljns53xvn1mns5vx4fmckydrgv4kqy6cfj9svkvq81bya1smdc";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/system-packages.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    systemd = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "systemd";
+        ename = "systemd";
+        version = "0.0.20221221.82418";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/systemd-0.0.20221221.82418.tar";
+          sha256 = "0df7y6ymx7gwlksa79h36ds6ap0c6mdnvw4nlj5qr54r2ri2rv1z";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/systemd.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tNFA = callPackage ({ elpaBuild, fetchurl, lib, queue }:
+      elpaBuild {
+        pname = "tNFA";
+        ename = "tNFA";
+        version = "0.1.1.0.20170804.211606";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/tNFA-0.1.1.0.20170804.211606.tar";
+          sha256 = "0h282s6lkpsxvjgajfraj9dbj3ac1amg3s0q3d6knr1xfwhi29zz";
+        };
+        packageRequires = [ queue ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/tNFA.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    taxy = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "taxy";
+        ename = "taxy";
+        version = "0.10.1.0.20220919.160646";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/taxy-0.10.1.0.20220919.160646.tar";
+          sha256 = "03f3rwj01jqfz9pyr2wnd1qkg8165276l1pqlcdyaw7idvd4fc2i";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/taxy.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    taxy-magit-section = callPackage ({ elpaBuild
+                                      , emacs
+                                      , fetchurl
+                                      , lib
+                                      , magit-section
+                                      , taxy }:
+      elpaBuild {
+        pname = "taxy-magit-section";
+        ename = "taxy-magit-section";
+        version = "0.12.2.0.20230223.182024";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/taxy-magit-section-0.12.2.0.20230223.182024.tar";
+          sha256 = "1gd2z5rhns8d2bkz86h2j51xhxcpiqfmzllpz7mn3s7pfnfrva8w";
+        };
+        packageRequires = [ emacs magit-section taxy ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/taxy-magit-section.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    temp-buffer-browse = callPackage ({ elpaBuild
+                                      , emacs
+                                      , fetchurl
+                                      , lib }:
+      elpaBuild {
+        pname = "temp-buffer-browse";
+        ename = "temp-buffer-browse";
+        version = "1.5.0.20160804.124501";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/temp-buffer-browse-1.5.0.20160804.124501.tar";
+          sha256 = "060pbrrb33n5ghmyhblkl0paqj4m3g4028nwz65zxbd7irrj0fxz";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/temp-buffer-browse.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tempel = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "tempel";
+        ename = "tempel";
+        version = "0.7.0.20230606.80030";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/tempel-0.7.0.20230606.80030.tar";
+          sha256 = "0p2x5ba37a6f37m0bfs2a02hp8c81rs4f8q6v35n4r3652kbw7pm";
+        };
+        packageRequires = [ compat emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/tempel.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    test-simple = callPackage ({ cl-lib ? null
+                               , elpaBuild
+                               , fetchurl
+                               , lib }:
+      elpaBuild {
+        pname = "test-simple";
+        ename = "test-simple";
+        version = "1.3.0.0.20200722.214339";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/test-simple-1.3.0.0.20200722.214339.tar";
+          sha256 = "0q7b6y7qw8arhcx0cmhx0y1bmj84zk0nqjlgvra9bav07wb9xxm9";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/test-simple.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    timerfunctions = callPackage ({ cl-lib ? null
+                                  , elpaBuild
+                                  , emacs
+                                  , fetchurl
+                                  , lib }:
+      elpaBuild {
+        pname = "timerfunctions";
+        ename = "timerfunctions";
+        version = "1.4.2.0.20221221.82440";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/timerfunctions-1.4.2.0.20221221.82440.tar";
+          sha256 = "1bsqyf7v7ngk1pwxk4cgf35r019bnbvx6wrs3l1fvgmw1zgkqkqv";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/timerfunctions.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tiny = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "tiny";
+        ename = "tiny";
+        version = "0.2.1.0.20220910.192941";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/tiny-0.2.1.0.20220910.192941.tar";
+          sha256 = "17wp68apkd57g4sm7lvr6iv527rkb8x3smz2lqns6yggrg64c1j2";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/tiny.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tmr = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "tmr";
+        ename = "tmr";
+        version = "0.4.0.0.20230228.202513";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/tmr-0.4.0.0.20230228.202513.tar";
+          sha256 = "0xll0inryq2ajavnshpxrn3pjcraqbfmhyb0r9k15w3m6x4g38xk";
+        };
+        packageRequires = [ compat emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/tmr.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tomelr = callPackage ({ elpaBuild, emacs, fetchurl, lib, map, seq }:
+      elpaBuild {
+        pname = "tomelr";
+        ename = "tomelr";
+        version = "0.4.3.0.20220511.213722";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/tomelr-0.4.3.0.20220511.213722.tar";
+          sha256 = "15rx89phls3hk0f2rfwpzb7igzyjvaiqasn9yvhwrmpq92dpd6hn";
+        };
+        packageRequires = [ emacs map seq ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/tomelr.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    topspace = callPackage ({ elpaBuild
+                            , emacs
+                            , fetchurl
+                            , lib }:
+      elpaBuild {
+        pname = "topspace";
+        ename = "topspace";
+        version = "0.3.1.0.20230106.94110";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/topspace-0.3.1.0.20230106.94110.tar";
+          sha256 = "188q0jw3frbk6y37qxrq17dx3lfrwcac501z90cq8px6d0j3aq4k";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/topspace.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tramp = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "tramp";
+        ename = "tramp";
+        version = "2.6.0.5.0.20230530.81440";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/tramp-2.6.0.5.0.20230530.81440.tar";
+          sha256 = "0nhw6aicnvih8mwwn1gfnpcbypw0kmgkn2sggkh1clrf291bibqw";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/tramp.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tramp-nspawn = callPackage ({ elpaBuild
+                                , emacs
+                                , fetchurl
+                                , lib }:
+      elpaBuild {
+        pname = "tramp-nspawn";
+        ename = "tramp-nspawn";
+        version = "1.0.1.0.20220923.120957";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/tramp-nspawn-1.0.1.0.20220923.120957.tar";
+          sha256 = "11pjgxxyx5gx8xqj8nd8blg0998m57n3s7ydg17z4flfpizbycck";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/tramp-nspawn.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tramp-theme = callPackage ({ elpaBuild
+                               , emacs
+                               , fetchurl
+                               , lib }:
+      elpaBuild {
+        pname = "tramp-theme";
+        ename = "tramp-theme";
+        version = "0.2.0.20221221.82451";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/tramp-theme-0.2.0.20221221.82451.tar";
+          sha256 = "1bjfxs20gicn71q8lznmxj4665hv8vc5spj19jkvvhm16r7nh7mp";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/tramp-theme.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    transcribe = callPackage ({ elpaBuild
+                              , fetchurl
+                              , lib }:
+      elpaBuild {
+        pname = "transcribe";
+        ename = "transcribe";
+        version = "1.5.2.0.20221221.82457";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/transcribe-1.5.2.0.20221221.82457.tar";
+          sha256 = "0a5ld8ylsp4ahw4blxchbsynhr8ph651a1lhs0nrx6j2fh85jxqh";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/transcribe.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    transient = callPackage ({ compat
+                             , elpaBuild
+                             , emacs
+                             , fetchurl
+                             , lib }:
+      elpaBuild {
+        pname = "transient";
+        ename = "transient";
+        version = "0.4.1.0.20230602.212120";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/transient-0.4.1.0.20230602.212120.tar";
+          sha256 = "0k8f9sbx84z6gc9z41djb3yl08anlf2nq0b7sn823gskq5pna37m";
+        };
+        packageRequires = [ compat emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/transient.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    transient-cycles = callPackage ({ elpaBuild
+                                    , emacs
+                                    , fetchurl
+                                    , lib }:
+      elpaBuild {
+        pname = "transient-cycles";
+        ename = "transient-cycles";
+        version = "1.0.0.20220410.130412";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/transient-cycles-1.0.0.20220410.130412.tar";
+          sha256 = "19pxd5s4ms9izj22v5abar7g12pn72vh870pmgh80d6kd8l9ifam";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/transient-cycles.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tree-inspector = callPackage ({ elpaBuild
+                                  , emacs
+                                  , fetchurl
+                                  , lib
+                                  , treeview }:
+      elpaBuild {
+        pname = "tree-inspector";
+        ename = "tree-inspector";
+        version = "0.3.0.20230505.172252";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/tree-inspector-0.3.0.20230505.172252.tar";
+          sha256 = "0hk961pkpnyyk9jxsd52hqhhx7gvgp8680ypc2d96ylxs6mfvkjx";
+        };
+        packageRequires = [ emacs treeview ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/tree-inspector.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    trie = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA }:
+      elpaBuild {
+        pname = "trie";
+        ename = "trie";
+        version = "0.5.0.20201214.113408";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/trie-0.5.0.20201214.113408.tar";
+          sha256 = "0z7nagf0fyd0qi4fnc04b2dp03xiwaw97c8lrqd6ii2vvnbxiw84";
+        };
+        packageRequires = [ heap tNFA ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/trie.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    triples = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }:
+      elpaBuild {
+        pname = "triples";
+        ename = "triples";
+        version = "0.2.7.0.20230416.5412";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/triples-0.2.7.0.20230416.5412.tar";
+          sha256 = "01sjwnk3czmk553yz7p5aw2wy9i8q6r1cfx9crzz434r2xgssg00";
+        };
+        packageRequires = [ emacs seq ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/triples.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    typo = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "typo";
+        ename = "typo";
+        version = "1.0.1.0.20230527.83048";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/typo-1.0.1.0.20230527.83048.tar";
+          sha256 = "12flvb976krxxidb8jlkrkfq0nm57gfwcsczjk5slxvwyjf4hvi8";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/typo.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ulisp-repl = callPackage ({ elpaBuild
+                              , emacs
+                              , fetchurl
+                              , lib }:
+      elpaBuild {
+        pname = "ulisp-repl";
+        ename = "ulisp-repl";
+        version = "1.0.3.0.20230604.111559";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/ulisp-repl-1.0.3.0.20230604.111559.tar";
+          sha256 = "1lay2sqi2ncwvrzs39wjd9fl66vsnxis9q6g7cyjqi4y667jg62s";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ulisp-repl.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    undo-tree = callPackage ({ elpaBuild
+                             , emacs
+                             , fetchurl
+                             , lib
+                             , queue }:
+      elpaBuild {
+        pname = "undo-tree";
+        ename = "undo-tree";
+        version = "0.8.2.0.20220312.180415";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/undo-tree-0.8.2.0.20220312.180415.tar";
+          sha256 = "0ldvyaim7n8gs8775fv9a0q6lp67ynkapj82pnqywniqy2p2vr1m";
+        };
+        packageRequires = [ emacs queue ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/undo-tree.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    uni-confusables = callPackage ({ elpaBuild
+                                   , fetchurl
+                                   , lib }:
+      elpaBuild {
+        pname = "uni-confusables";
+        ename = "uni-confusables";
+        version = "0.3.0.20221212.230830";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/uni-confusables-0.3.0.20221212.230830.tar";
+          sha256 = "0xa7byw8b371wm35g0250mz7xvcgbdms1x32grwqp4zhm9dh7jg8";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/uni-confusables.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    uniquify-files = callPackage ({ elpaBuild
+                                  , emacs
+                                  , fetchurl
+                                  , lib }:
+      elpaBuild {
+        pname = "uniquify-files";
+        ename = "uniquify-files";
+        version = "1.0.4.0.20221221.82507";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/uniquify-files-1.0.4.0.20221221.82507.tar";
+          sha256 = "1hhf0zb85y1p1a54y8jq6jzlmdgd23rja2pp461lwf0i1wkfjibq";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/uniquify-files.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    url-http-ntlm = callPackage ({ cl-lib ? null
+                                 , elpaBuild
+                                 , fetchurl
+                                 , lib
+                                 , ntlm ? null }:
+      elpaBuild {
+        pname = "url-http-ntlm";
+        ename = "url-http-ntlm";
+        version = "2.0.4.0.20221221.82537";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/url-http-ntlm-2.0.4.0.20221221.82537.tar";
+          sha256 = "0j67dwalw22ykdkvp5qf03b54gimx855c0aasfdi271hq9hi8jm2";
+        };
+        packageRequires = [ cl-lib ntlm ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/url-http-ntlm.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    url-http-oauth = callPackage ({ elpaBuild
+                                  , fetchurl
+                                  , lib }:
+      elpaBuild {
+        pname = "url-http-oauth";
+        ename = "url-http-oauth";
+        version = "0.8.3.0.20230510.175959";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/url-http-oauth-0.8.3.0.20230510.175959.tar";
+          sha256 = "02ml5wsqzzwxaf779hkgbbdjp7hvf6x43cr1j2aciw2hn29ikbcg";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/url-http-oauth.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    url-scgi = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "url-scgi";
+        ename = "url-scgi";
+        version = "0.9.0.20230130.74744";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/url-scgi-0.9.0.20230130.74744.tar";
+          sha256 = "1y8amwx2pdcnzd0ywfxlh2wzjfb3kan9wdy5cgibzvrqgc85npxi";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/url-scgi.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    use-package = callPackage ({ bind-key
+                               , elpaBuild
+                               , emacs
+                               , fetchurl
+                               , lib }:
+      elpaBuild {
+        pname = "use-package";
+        ename = "use-package";
+        version = "2.4.5.0.20230115.133305";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/use-package-2.4.5.0.20230115.133305.tar";
+          sha256 = "1xjyhd6wkf1z4jx7ffh1y6kk8yi44h4qrckwybwfj6zhiil42cjq";
+        };
+        packageRequires = [ bind-key emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/use-package.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    validate = callPackage ({ cl-lib ? null
+                            , elpaBuild
+                            , emacs
+                            , fetchurl
+                            , lib
+                            , seq }:
+      elpaBuild {
+        pname = "validate";
+        ename = "validate";
+        version = "1.0.4.0.20180215.204244";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/validate-1.0.4.0.20180215.204244.tar";
+          sha256 = "0mmfwv5g4661r300d8lj907ynkdhjddvm5nca3s5zq7zv4ii0sd0";
+        };
+        packageRequires = [ cl-lib emacs seq ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/validate.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    valign = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "valign";
+        ename = "valign";
+        version = "3.1.1.0.20210501.211155";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/valign-3.1.1.0.20210501.211155.tar";
+          sha256 = "1k9kqfbcc3glwn3n9l4hfflzqwl144r4zrxgprha3ya04y9ka91x";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/valign.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vc-backup = callPackage ({ compat
+                             , elpaBuild
+                             , emacs
+                             , fetchurl
+                             , lib }:
+      elpaBuild {
+        pname = "vc-backup";
+        ename = "vc-backup";
+        version = "1.1.0.0.20220825.144758";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/vc-backup-1.1.0.0.20220825.144758.tar";
+          sha256 = "1mrk1f9ajdpdkqmwwha4qw4d8dxxbx3k7la31z118j04g8x5lqh4";
+        };
+        packageRequires = [ compat emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/vc-backup.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vc-got = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "vc-got";
+        ename = "vc-got";
+        version = "1.2.0.20230129.104658";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/vc-got-1.2.0.20230129.104658.tar";
+          sha256 = "0r3jny1yhl9swrpbif46mjx6c2c84pwnh4byffasmgdamic9w5w8";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/vc-got.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vc-hgcmd = callPackage ({ elpaBuild
+                            , emacs
+                            , fetchurl
+                            , lib }:
+      elpaBuild {
+        pname = "vc-hgcmd";
+        ename = "vc-hgcmd";
+        version = "1.14.1.0.20230605.161947";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/vc-hgcmd-1.14.1.0.20230605.161947.tar";
+          sha256 = "0mv2n5xhilq5vc0k4iahk3fs0skdcshvmdyynqyy6ii764zmmg87";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/vc-hgcmd.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vcard = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "vcard";
+        ename = "vcard";
+        version = "0.2.2.0.20221212.230951";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/vcard-0.2.2.0.20221212.230951.tar";
+          sha256 = "10m83a0vwjbv2jbdyhyzndc6vlaa7jm47310w7jiqz4r49835p6j";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/vcard.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vcl-mode = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "vcl-mode";
+        ename = "vcl-mode";
+        version = "1.1.0.20201127.191542";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/vcl-mode-1.1.0.20201127.191542.tar";
+          sha256 = "0ps87hxxm99wilc3ylv9i4b0035lg5i5df0i491m10z3x02i503p";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/vcl-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vdiff = callPackage ({ elpaBuild, emacs, fetchurl, hydra, lib }:
+      elpaBuild {
+        pname = "vdiff";
+        ename = "vdiff";
+        version = "0.2.4.0.20220830.105050";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/vdiff-0.2.4.0.20220830.105050.tar";
+          sha256 = "1q2jy95mdlk8cd66bbpzmqx1bgip8wr0zslgxrz6cgjcjaszpwra";
+        };
+        packageRequires = [ emacs hydra ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/vdiff.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    verilog-mode = callPackage ({ elpaBuild
+                                , fetchurl
+                                , lib }:
+      elpaBuild {
+        pname = "verilog-mode";
+        ename = "verilog-mode";
+        version = "2023.6.6.141322628.0.20230606.214619";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/verilog-mode-2023.6.6.141322628.0.20230606.214619.tar";
+          sha256 = "1gm5p32kcg9nisbic5pfnbyy5hmj598s6wma285x8hpd0fhypgn5";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/verilog-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vertico = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "vertico";
+        ename = "vertico";
+        version = "1.3.0.20230522.143108";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/vertico-1.3.0.20230522.143108.tar";
+          sha256 = "1nignd2xf7xsz01jc36bv0pa3r97xavgjivk532qyy2w0dqwg281";
+        };
+        packageRequires = [ compat emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/vertico.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vertico-posframe = callPackage ({ elpaBuild
+                                    , emacs
+                                    , fetchurl
+                                    , lib
+                                    , posframe
+                                    , vertico }:
+      elpaBuild {
+        pname = "vertico-posframe";
+        ename = "vertico-posframe";
+        version = "0.7.2.0.20230222.73835";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/vertico-posframe-0.7.2.0.20230222.73835.tar";
+          sha256 = "04dj8w4mrx5fjkzc10qqgypz6dkz17kvykrbja33yqwasp1kam1v";
+        };
+        packageRequires = [ emacs posframe vertico ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/vertico-posframe.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vigenere = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "vigenere";
+        ename = "vigenere";
+        version = "1.0.0.20221221.82600";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/vigenere-1.0.0.20221221.82600.tar";
+          sha256 = "1snis37kp1zabydrwsvb7fh15ps4cs2vhn80xhxj4dcyp597q44v";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/vigenere.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    visual-filename-abbrev = callPackage ({ elpaBuild
+                                          , emacs
+                                          , fetchurl
+                                          , lib }:
+      elpaBuild {
+        pname = "visual-filename-abbrev";
+        ename = "visual-filename-abbrev";
+        version = "1.2.0.20221221.82606";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/visual-filename-abbrev-1.2.0.20221221.82606.tar";
+          sha256 = "1jq6c1fzm6r73j6g2m7in6cly3pm9zyqldc67paqldalhg9kfda5";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/visual-filename-abbrev.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    visual-fill = callPackage ({ elpaBuild
+                               , fetchurl
+                               , lib }:
+      elpaBuild {
+        pname = "visual-fill";
+        ename = "visual-fill";
+        version = "0.1.0.20201201.173845";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/visual-fill-0.1.0.20201201.173845.tar";
+          sha256 = "10wf6w2mjmhj7blxh76j0k0czjv4ww307pa99vp9xgcg63pcbbp6";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/visual-fill.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vlf = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "vlf";
+        ename = "vlf";
+        version = "1.7.2.0.20201128.5141";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/vlf-1.7.2.0.20201128.5141.tar";
+          sha256 = "12m43ykq92hfnq91z27sabzj7gbjpl624k7acpg641909hm5nq1b";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/vlf.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vundo = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "vundo";
+        ename = "vundo";
+        version = "2.1.0.0.20230510.170718";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/vundo-2.1.0.0.20230510.170718.tar";
+          sha256 = "0q48bwaxz39w8gppsmr32rk04zh50cfz4g2rlxf5bkziqgja0yyl";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/vundo.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wcheck-mode = callPackage ({ elpaBuild
+                               , fetchurl
+                               , lib }:
+      elpaBuild {
+        pname = "wcheck-mode";
+        ename = "wcheck-mode";
+        version = "2021.0.20220101.81620";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/wcheck-mode-2021.0.20220101.81620.tar";
+          sha256 = "0bk9w274k0rfmlxv5m9mxqy7ab8zdzk0sw4baqh73hvn8z3li8sp";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/wcheck-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wconf = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "wconf";
+        ename = "wconf";
+        version = "0.2.1.0.20201202.220257";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/wconf-0.2.1.0.20201202.220257.tar";
+          sha256 = "06ghn72l2fwn0ys2iakgw1xqalip31yi0449c26rad8gaz6y7vxl";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/wconf.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    web-server = callPackage ({ cl-lib ? null
+                              , elpaBuild
+                              , emacs
+                              , fetchurl
+                              , lib }:
+      elpaBuild {
+        pname = "web-server";
+        ename = "web-server";
+        version = "0.1.2.0.20210811.22503";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/web-server-0.1.2.0.20210811.22503.tar";
+          sha256 = "0pvmlv74hy7ybnl0014ml7c314an2vc2z6fkizw06zr27x22jpvl";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/web-server.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    webfeeder = callPackage ({ elpaBuild
+                             , emacs
+                             , fetchurl
+                             , lib }:
+      elpaBuild {
+        pname = "webfeeder";
+        ename = "webfeeder";
+        version = "1.1.2.0.20210605.74155";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/webfeeder-1.1.2.0.20210605.74155.tar";
+          sha256 = "0716x9a83wv41p3hz4qllrrv2w5jrw4xvb2fhi8kxaxrjhq989d9";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/webfeeder.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    websocket = callPackage ({ cl-lib ? null
+                             , elpaBuild
+                             , fetchurl
+                             , lib }:
+      elpaBuild {
+        pname = "websocket";
+        ename = "websocket";
+        version = "1.14.0.20230304.231043";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/websocket-1.14.0.20230304.231043.tar";
+          sha256 = "03m3r7xsyhkz3zh84p4dkr6xn77ld8gdqpm6gjvcd4gfrs9i75wz";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/websocket.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    which-key = callPackage ({ elpaBuild
+                             , emacs
+                             , fetchurl
+                             , lib }:
+      elpaBuild {
+        pname = "which-key";
+        ename = "which-key";
+        version = "3.6.0.0.20230606.182727";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/which-key-3.6.0.0.20230606.182727.tar";
+          sha256 = "0r8r1y82vsxcpf6rck7ay0hksrm1cyxczyhz7dlnnja9sdr4wsfx";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/which-key.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    windower = callPackage ({ elpaBuild
+                            , emacs
+                            , fetchurl
+                            , lib }:
+      elpaBuild {
+        pname = "windower";
+        ename = "windower";
+        version = "0.0.1.0.20200212.91532";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/windower-0.0.1.0.20200212.91532.tar";
+          sha256 = "0005r5xgi7h7i0lbdxbsfs7hvdx4isan6df283xflxs0qv3hwpql";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/windower.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    windresize = callPackage ({ elpaBuild
+                              , fetchurl
+                              , lib }:
+      elpaBuild {
+        pname = "windresize";
+        ename = "windresize";
+        version = "0.1.0.20221221.82616";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/windresize-0.1.0.20221221.82616.tar";
+          sha256 = "16s4vxzjcjl5ahpfwzrr4z59mq0w0vb56ip3r5ky13xs3p5q2xl8";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/windresize.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wisi = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }:
+      elpaBuild {
+        pname = "wisi";
+        ename = "wisi";
+        version = "4.2.2.0.20230126.2042";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/wisi-4.2.2.0.20230126.2042.tar";
+          sha256 = "0b70yipm6wmz5034f5l7f78c2bgscm2c8lph75jgd5x1qwzngw47";
+        };
+        packageRequires = [ emacs seq ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/wisi.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wisitoken-grammar-mode = callPackage ({ elpaBuild
+                                          , emacs
+                                          , fetchurl
+                                          , lib
+                                          , mmm-mode
+                                          , wisi }:
+      elpaBuild {
+        pname = "wisitoken-grammar-mode";
+        ename = "wisitoken-grammar-mode";
+        version = "1.3.0.0.20230125.102656";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/wisitoken-grammar-mode-1.3.0.0.20230125.102656.tar";
+          sha256 = "1h5pnghxg01f0hgxw7284b4rm5c43r48nbsxj19dcypxrzz3w1qw";
+        };
+        packageRequires = [ emacs mmm-mode wisi ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/wisitoken-grammar-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wpuzzle = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "wpuzzle";
+        ename = "wpuzzle";
+        version = "1.1.0.20221221.82918";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/wpuzzle-1.1.0.20221221.82918.tar";
+          sha256 = "16mdd7cyzbhipr934cps8qjpgsr9wwnrd81yaca356wq0cwafhvb";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/wpuzzle.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xclip = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "xclip";
+        ename = "xclip";
+        version = "1.11.0.20221221.82941";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/xclip-1.11.0.20221221.82941.tar";
+          sha256 = "09dkxgd3bcn8pfw441jq73k49l6m467w89l2xwzb2zb24qpd78ic";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/xclip.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xeft = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "xeft";
+        ename = "xeft";
+        version = "3.3.0.20230322.153950";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/xeft-3.3.0.20230322.153950.tar";
+          sha256 = "0bnapb3kpyjlclysbs43003dzc7b2p80iqkxk42iqpwm2xyg9s8q";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/xeft.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xelb = callPackage ({ cl-generic, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "xelb";
+        ename = "xelb";
+        version = "0.18.0.20200719.0";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/xelb-0.18.0.20200719.0.tar";
+          sha256 = "195zxjkrw9rmnzprvdr21pngfkwl7lcn0bnjqzywwaq19zb4c2rs";
+        };
+        packageRequires = [ cl-generic emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/xelb.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xpm = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, queue }:
+      elpaBuild {
+        pname = "xpm";
+        ename = "xpm";
+        version = "1.0.5.0.20221221.82958";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/xpm-1.0.5.0.20221221.82958.tar";
+          sha256 = "0c1hrqb203cl44z0sasfx6d315n2cqwf3lc0l29r63lsh0sd5gfp";
+        };
+        packageRequires = [ cl-lib queue ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/xpm.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xr = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "xr";
+        ename = "xr";
+        version = "1.23.0.20230326.142354";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/xr-1.23.0.20230326.142354.tar";
+          sha256 = "0mxn1znp0f2v7xkaflska3v05sicx7ajshkvwczmcrnaizd5895z";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/xr.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xref = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "xref";
+        ename = "xref";
+        version = "1.6.3.0.20230421.72914";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/xref-1.6.3.0.20230421.72914.tar";
+          sha256 = "1wbprwfadnj6kqxh8r4kbm2lg3wvfnrywih1kgjwpail5ssbm8ix";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/xref.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xref-union = callPackage ({ elpaBuild
+                              , emacs
+                              , fetchurl
+                              , lib }:
+      elpaBuild {
+        pname = "xref-union";
+        ename = "xref-union";
+        version = "0.1.1.0.20230325.142012";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/xref-union-0.1.1.0.20230325.142012.tar";
+          sha256 = "0y879hqq9l6siiyl84k12a943j3130cdfxw34m8hhgpmxn2qccky";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/xref-union.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    yasnippet = callPackage ({ cl-lib ? null
+                             , elpaBuild
+                             , fetchurl
+                             , lib }:
+      elpaBuild {
+        pname = "yasnippet";
+        ename = "yasnippet";
+        version = "0.14.0.0.20210502.75302";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/yasnippet-0.14.0.0.20210502.75302.tar";
+          sha256 = "17xaw27b7sjpb6j4jhfdr9vgd5r6gqhavwfn2zwhqnnc4qmvnj4k";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/yasnippet.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    yasnippet-classic-snippets = callPackage ({ elpaBuild
+                                              , fetchurl
+                                              , lib
+                                              , yasnippet }:
+      elpaBuild {
+        pname = "yasnippet-classic-snippets";
+        ename = "yasnippet-classic-snippets";
+        version = "1.0.2.0.20221221.83103";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/yasnippet-classic-snippets-1.0.2.0.20221221.83103.tar";
+          sha256 = "1gy67f796pvaqckhbb9p05pn7f7d70ps7z0f1bg35156m3dfj7ff";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/yasnippet-classic-snippets.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zones = callPackage ({ elpaBuild
+                         , fetchurl
+                         , lib }:
+      elpaBuild {
+        pname = "zones";
+        ename = "zones";
+        version = "2019.7.13.0.20221212.231608";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/zones-2019.7.13.0.20221212.231608.tar";
+          sha256 = "1z7r295c2l1hxpz587szzbyxhig3b9siicwf3j1b31s8csdjzkvl";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/zones.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ztree = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "ztree";
+        ename = "ztree";
+        version = "1.0.6.0.20210415.194722";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/ztree-1.0.6.0.20210415.194722.tar";
+          sha256 = "1jcvzj0pwk4rwgp0xgzd2qlcgx0x3kg8843qsyr5banmphnmfma8";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ztree.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zuul = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }:
+      elpaBuild {
+        pname = "zuul";
+        ename = "zuul";
+        version = "0.4.0.0.20230524.131806";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/zuul-0.4.0.0.20230524.131806.tar";
+          sha256 = "0yand8b9givmwr8b3y8da4qwxq2j0kjyfzigwydf0lmc96nix777";
+        };
+        packageRequires = [ emacs project ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/zuul.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+  }
diff --git a/repos/elpa/update b/repos/elpa/update
index 65245d84d6f7..4405ffb35965 100755
--- a/repos/elpa/update
+++ b/repos/elpa/update
@@ -9,3 +9,8 @@ rm elpa-generated.nix
 
 eval $(nix-instantiate --eval --expr 'let nixpath = builtins.toString (import <nixpkgs> {}).path; in "${nixpath}/pkgs/applications/editors/emacs/elisp-packages/update-elpa"')
 env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ./test.nix -A elpaPackages
+
+rm elpa-devel-generated.nix
+
+eval $(nix-instantiate --eval --expr 'let nixpath = builtins.toString (import <nixpkgs> {}).path; in "${nixpath}/pkgs/applications/editors/emacs/elisp-packages/update-elpa-devel"')
+env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ./test.nix -A elpaDevelPackages
-- 
cgit 1.4.1


From f7761941086ebffb6f4ef232d45e7824a80acc80 Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Wed, 14 Jun 2023 15:22:35 -0700
Subject: Remove 22.11 handholding

---
 overlays/emacs.nix | 60 +++++++++++++++++++++---------------------------------
 1 file changed, 23 insertions(+), 37 deletions(-)

(limited to 'overlays')

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index d8ecc21e3945..231871677b89 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -88,43 +88,29 @@ let
         )
       ]);
 
-  emacs-git = let base = (super.lib.makeOverridable (mkGitEmacs "emacs-git" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; });
-                  # TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
-                  maybeOverridden = if (super.lib.hasAttr "treeSitter" base || super.lib.hasAttr "withTreeSitter" base) then base.override { withTreeSitter = true; } else base;
-              in
-                maybeOverridden.overrideAttrs (
-                  oa: {
-                    patches = oa.patches ++ [
-                      # XXX: #318
-                      ./bytecomp-revert.patch
-                    ]; }
-                );
-
-  emacs-pgtk = let base = super.lib.makeOverridable (mkGitEmacs "emacs-pgtk" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; withPgtk = true; };
-                   # TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
-                   maybeOverridden = if (super.lib.hasAttr "treeSitter" base || super.lib.hasAttr "withTreeSitter" base) then base.override { withTreeSitter = true; } else base;
-               in maybeOverridden.overrideAttrs (
-                 oa: {
-                   patches = oa.patches ++ [
-                     # XXX: #318
-                     ./bytecomp-revert.patch
-                   ]; }
-               );
-
-  emacs-unstable = let base = super.lib.makeOverridable (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = true; };
-                       # TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
-                       maybeOverridden = if (super.lib.hasAttr "treeSitter" base || super.lib.hasAttr "withTreeSitter" base) then base.override { withTreeSitter = true; } else base;
-                   in maybeOverridden;
-
-  emacs-unstable-pgtk = let base = super.lib.makeOverridable (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = true; withPgtk = true; };
-                            # TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
-                            maybeOverridden = if (super.lib.hasAttr "treeSitter" base || super.lib.hasAttr "withTreeSitter" base) then base.override { withTreeSitter = true; } else base;
-                        in maybeOverridden;
-
-  emacs-lsp = let base = super.lib.makeOverridable (mkGitEmacs "emacs-lsp" ../repos/emacs/emacs-lsp.json) { };
-                  # TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
-                  maybeOverridden = if (super.lib.hasAttr "treeSitter" base || super.lib.hasAttr "withTreeSitter" base) then base.override { withTreeSitter = false; } else base;
-              in maybeOverridden;
+  emacs-git = (super.lib.makeOverridable (mkGitEmacs "emacs-git" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; withTreeSitter = true; }).overrideAttrs (
+    oa: {
+      patches = oa.patches ++ [
+        # XXX: #318
+        ./bytecomp-revert.patch
+      ];
+    }
+  );
+
+  emacs-pgtk = (super.lib.makeOverridable (mkGitEmacs "emacs-pgtk" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; withTreeSitter = true; withPgtk = true; }).overrideAttrs (
+    oa: {
+      patches = oa.patches ++ [
+        # XXX: #318
+        ./bytecomp-revert.patch
+      ];
+    }
+  );
+
+  emacs-unstable = super.lib.makeOverridable (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = true; withTreeSitter = true; };
+
+  emacs-unstable-pgtk = super.lib.makeOverridable (mkGitEmacs "emacs-unstable-pgtk" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = true; withTreeSitter = true; withPgtk = true; };
+
+  emacs-lsp = super.lib.makeOverridable (mkGitEmacs "emacs-lsp" ../repos/emacs/emacs-lsp.json) { withTreeSitter = false; };
 
   emacs-git-nox = (
     (
-- 
cgit 1.4.1