diff options
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/emacs-packages.nix | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4609c181417..19353eab4e95 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8514,7 +8514,7 @@ let agda = callPackage ../build-support/agda { glibcLocales = if pkgs.stdenv.isLinux then pkgs.glibcLocales else null; extension = self : super : { }; - inherit (haskell.packages.ghc784) Agda; + inherit (haskellPackages) Agda; inherit writeScriptBin; }; @@ -11289,9 +11289,7 @@ let }; external = { - # FIXME: revert when Agda and ghc-mod are fixed on 7.10 - inherit (haskell.packages.ghc784) ghc-mod Agda; - inherit (haskellPackages) structured-haskell-mode; + inherit (haskellPackages) ghc-mod structured-haskell-mode Agda; }; }; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 0adddf3d5d03..c5bb3a5f047f 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -597,6 +597,7 @@ let self = _self // overrides; pname = "ghc"; version = external.ghc-mod.version; src = external.ghc-mod.src; + packageRequires = [ haskell-mode ]; propagatedUserEnvPkgs = [ external.ghc-mod ]; fileSpecs = [ "elisp/*.el" ]; meta = { license = bsd3; }; |