public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9279 from oxij/haskell-related-emacs 

Somewhat trivial Haskell-, Agda-, and emacs-related fixes
This commit is contained in:
Peter Simons 2015-08-16 21:02:17 +02:00
parent 5079b4f27b 7a73622116
commit bc3b49ea6f
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/top-level/all-packages.nix
View File

@ -8514,7 +8514,7 @@ let
agda = callPackage ../build-support/agda { agda = callPackage ../build-support/agda {
glibcLocales = if pkgs.stdenv.isLinux then pkgs.glibcLocales else null; glibcLocales = if pkgs.stdenv.isLinux then pkgs.glibcLocales else null;
extension = self : super : { }; extension = self : super : { };
inherit (haskell.packages.ghc784) Agda; inherit (haskellPackages) Agda;
inherit writeScriptBin; inherit writeScriptBin;
}; };
@ -11289,9 +11289,7 @@ let
}; };
external = { external = {
# FIXME: revert when Agda and ghc-mod are fixed on 7.10 inherit (haskellPackages) ghc-mod structured-haskell-mode Agda;
inherit (haskell.packages.ghc784) ghc-mod Agda;
inherit (haskellPackages) structured-haskell-mode;
}; };
}; };

1
pkgs/top-level/emacs-packages.nix
View File

@ -597,6 +597,7 @@ let self = _self // overrides;
pname = "ghc"; pname = "ghc";
version = external.ghc-mod.version; version = external.ghc-mod.version;
src = external.ghc-mod.src; src = external.ghc-mod.src;
packageRequires = [ haskell-mode ];
propagatedUserEnvPkgs = [ external.ghc-mod ]; propagatedUserEnvPkgs = [ external.ghc-mod ];
fileSpecs = [ "elisp/*.el" ]; fileSpecs = [ "elisp/*.el" ];
meta = { license = bsd3; }; meta = { license = bsd3; };