From 3f7b8b9eac8a04803762d2be2bb79ee6c93ecc5e Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Fri, 17 Sep 2021 14:35:18 +0200
Subject: [PATCH 1/6] emacs.pkgs.agda2-mode: fix

---
 .../editors/emacs/elisp-packages/agda2-mode/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/agda2-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/agda2-mode/default.nix
index 9f010921d629..2533153bd447 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/agda2-mode/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/agda2-mode/default.nix
@@ -4,18 +4,18 @@
 
 trivialBuild rec {
   pname = "agda-mode";
-  version = pkgs.haskellPackages.Agda.version;
+  version = haskellPackages.Agda.version;
 
   dontUnpack = true;
 
   # already byte-compiled by Agda builder
   buildPhase = ''
-    agda=`${pkgs.haskellPackages.Agda}/bin/agda-mode locate`
+    agda=`${haskellPackages.Agda}/bin/agda-mode locate`
     cp `dirname $agda`/*.el* .
   '';
 
   meta = {
-    inherit (pkgs.haskellPackages.Agda.meta) homepage license;
+    inherit (haskellPackages.Agda.meta) homepage license;
     description = "Agda2-mode for Emacs extracted from Agda package";
     longDescription = ''
       Wrapper packages that liberates init.el from `agda-mode locate` magic.

From 5f03301dea3b585f56f747512f72d18377099ef7 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Fri, 17 Sep 2021 14:48:28 +0200
Subject: [PATCH 2/6] emacs.pkgs.ess-R-object-popup: fix

---
 .../editors/emacs/elisp-packages/ess-R-object-popup/default.nix  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix b/pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix
index 9bbe7e4ca550..fa7725fbb94c 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix
@@ -1,6 +1,7 @@
 { lib
 , trivialBuild
 , fetchFromGitHub
+, emacs
 }:
 
 trivialBuild rec {

From df30b5d8ebfb2e3909475c7081c78fc3fafcd038 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Fri, 17 Sep 2021 15:15:55 +0200
Subject: [PATCH 3/6] emacs.pkgs.evil-markdown: fix

---
 .../editors/emacs/elisp-packages/evil-markdown/default.nix     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix b/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix
index 22f8ae64d9c0..58c542a57f4f 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix
@@ -2,7 +2,6 @@
 , trivialBuild
 , fetchFromGitHub
 , emacs
-, emacsPackages
 }:
 
 trivialBuild rec {
@@ -20,7 +19,7 @@ trivialBuild rec {
     emacs
   ] ++ propagatedUserEnvPkgs;
 
-  propagatedUserEnvPkgs = with emacsPackages; [
+  propagatedUserEnvPkgs = with emacs.pkgs; [
     evil
     markdown-mode
   ];

From 3342128e06b66534436444dfdef285815a2581de Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Fri, 17 Sep 2021 15:25:57 +0200
Subject: [PATCH 4/6] emacs.pkgs.git-undo: fix

---
 .../editors/emacs/elisp-packages/git-undo/default.nix            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix b/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix
index 7c45b11c840d..8b353409c372 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix
@@ -2,6 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , emacs
+, trivialBuild
 }:
 
 trivialBuild {

From b8ffae12a01a8e06fa51ae34b0b012526145acfc Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Fri, 17 Sep 2021 15:34:43 +0200
Subject: [PATCH 5/6] emacs.pkgs.isearch-prop: fix

---
 .../editors/emacs/elisp-packages/isearch-prop/default.nix        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix b/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix
index 6b298cee4891..067d6f4481f2 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix
@@ -1,5 +1,6 @@
 { lib
 , stdenv
+, fetchFromGitHub
 , trivialBuild
 , emacs
 }:

From 3a25a2e3f7494f0eac262f8a934679465a50c844 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Fri, 17 Sep 2021 15:35:44 +0200
Subject: [PATCH 6/6] emacs.pkgs.youtube-dl: fix

---
 .../editors/emacs/elisp-packages/youtube-dl/default.nix          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix b/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix
index 065f76552b14..b0df381b5f95 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, trivialBuild
 , emacs
 }: