diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2015-08-16 17:24:42 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2015-08-16 18:00:54 +0000 |
| commit | 2f7a75f74a60d3f37f66745a1cfdd4c40352b758 (patch) | |
| tree | 77777bde8c33a411af822a104a3c00abccbffe1b /pkgs/top-level | |
| parent | 8914e1af6d1becc92eae50eedfd5dccfeacb876d (diff) | |
carefully revert e749f1ef61afcf3457574b57f4177543a82e78f1 and 8f1d2564356afdd10a587a4f80a07d53058eff57
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23413feea8126..acf9f628bbf04 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8512,7 +8512,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; }; @@ -11287,9 +11287,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; }; }; |