Merge pull request #138279 from helsinki-systems/fix/agda2-mode

emacs.pkgs.*: fix to unblock channel

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.

pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix

@@ -1,6 +1,7 @@
 { lib
 , trivialBuild
 , fetchFromGitHub
+, emacs
 }:
 
 trivialBuild rec {

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
   ];

pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix

@@ -2,6 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , emacs
+, trivialBuild
 }:
 
 trivialBuild {

pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix

@@ -1,5 +1,6 @@
 { lib
 , stdenv
+, fetchFromGitHub
 , trivialBuild
 , emacs
 }:

pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix

@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, trivialBuild
 , emacs
 }: