ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

haskell-ghc-mod: don't hard-code a specific version of emacsPackages into the expression itself

Browse Source 
Instead, one of the available version is chosen in haskell-packages.nix, when
the expression is instantiated.

Also updated the meta section.

svn path=/nixpkgs/trunk/; revision=31856
This commit is contained in:
Peter Simons 2012-01-26 14:20:11 +00:00
parent adc8828c96
commit 4752d7201c
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/haskell/ghc-mod/default.nix
View File

@ -1,4 +1,4 @@
{ cabal, attoparsec, attoparsecEnumerator, ghcPaths, hlint, regexPosix, emacs, emacs23Packages }: { cabal, attoparsec, attoparsecEnumerator, ghcPaths, hlint, regexPosix, emacsPackages }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "ghc-mod"; pname = "ghc-mod";
@ -7,8 +7,7 @@ cabal.mkDerivation (self: {
buildDepends = [ buildDepends = [
attoparsec attoparsecEnumerator ghcPaths hlint regexPosix attoparsec attoparsecEnumerator ghcPaths hlint regexPosix
]; ];
# buildTools = [emacs emacs23]; propagatedBuildInputs = [emacsPackages.emacs emacsPackages.haskellMode];
propagatedBuildInputs = [emacs emacs23Packages.haskellMode];
isExecutable = true; isExecutable = true;
postInstall = '' postInstall = ''
cd $out/share/$pname-$version cd $out/share/$pname-$version
@ -20,11 +19,14 @@ cabal.mkDerivation (self: {
''; '';
meta = { meta = {
homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
description = "Happy Haskell programming on Emacs"; description = "Happy Haskell programming on Emacs";
license = self.stdenv.lib.licenses.bsd3; license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms; platforms = self.ghc.meta.platforms;
maintainers = [ maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.bluescreen303 self.stdenv.lib.maintainers.bluescreen303
self.stdenv.lib.maintainers.simons
]; ];
}; };
}) })

4
pkgs/top-level/haskell-packages.nix
View File

@ -683,7 +683,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
ghcEvents = callPackage ../development/libraries/haskell/ghc-events {}; ghcEvents = callPackage ../development/libraries/haskell/ghc-events {};
ghcMod = callPackage ../development/libraries/haskell/ghc-mod {}; ghcMod = callPackage ../development/libraries/haskell/ghc-mod {
emacsPackages = pkgs.emacs23Packages;
};
ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {}; ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {};