diff options
| author | Peter Simons <simons@cryp.to> | 2012-03-25 19:33:48 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-03-25 19:33:48 +0000 |
| commit | a058381657cb9173867aa1846cc4dbf5b61916e1 (patch) | |
| tree | c58e404cb9e295759474806fa42d7d28cb9179d1 /pkgs | |
| parent | 48ce33903a0af6ed7acb566ff4be4069009a65c1 (diff) | |
| download | nixpkgs-a058381657cb9173867aa1846cc4dbf5b61916e1.tar nixpkgs-a058381657cb9173867aa1846cc4dbf5b61916e1.tar.gz nixpkgs-a058381657cb9173867aa1846cc4dbf5b61916e1.tar.bz2 nixpkgs-a058381657cb9173867aa1846cc4dbf5b61916e1.tar.lz nixpkgs-a058381657cb9173867aa1846cc4dbf5b61916e1.tar.xz nixpkgs-a058381657cb9173867aa1846cc4dbf5b61916e1.tar.zst nixpkgs-a058381657cb9173867aa1846cc4dbf5b61916e1.zip | |
haskell-ghc-mod: updated to version 1.10.11
This expression can now be generated by cabal2nix. Note that it doesn't propagate Emacs and haskell-mode, though, these dependencies must be installed by the user in addition to ghc-mod. To active ghc-mod, add the following snippet to your ~/.emacs file: (autoload 'ghc-init "ghc" nil t) (add-hook 'haskell-mode-hook (lambda () (ghc-init))) svn path=/nixpkgs/trunk/; revision=33410
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/haskell/ghc-mod/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 2 |
2 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index d8d8fe5a02e..68af9388bed 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -1,14 +1,18 @@ -{ cabal, attoparsec, attoparsecEnumerator, ghcPaths, hlint, regexPosix, emacsPackages }: +{ cabal, Cabal, emacs, filepath, ghcPaths, ghcSybUtils, hlint +, ioChoice, regexPosix, syb, transformers +}: cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "1.10.5"; - sha256 = "0hbimrrlasa2rkmdz9d4fcyk70fynmwx0zqyl470hrwz8d8v73rc"; + version = "1.10.11"; + sha256 = "0s2amrikrlcgiy9iw6f1s43k2lzy9jaiddky078qp1pbk68dhbk9"; + isLibrary = false; + isExecutable = true; buildDepends = [ - attoparsec attoparsecEnumerator ghcPaths hlint regexPosix + Cabal filepath ghcPaths ghcSybUtils hlint ioChoice regexPosix syb + transformers ]; - propagatedBuildInputs = [emacsPackages.emacs emacsPackages.haskellMode]; - isExecutable = true; + buildTools = [ emacs ]; postInstall = '' cd $out/share/$pname-$version make @@ -20,7 +24,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://www.mew.org/~kazu/proj/ghc-mod/"; - description = "Happy Haskell programming on Emacs"; + description = "Happy Haskell programming on Emacs/Vim"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9da648faddb..fe02ffcffe3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -706,7 +706,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ghcEvents = callPackage ../development/libraries/haskell/ghc-events {}; ghcMod = callPackage ../development/libraries/haskell/ghc-mod { - emacsPackages = pkgs.emacs23Packages; + inherit (pkgs) emacs; }; ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {}; |