Author: simons
Date: Thu Jan 26 14:20:11 2012
New Revision: 31856
URL: https://nixos.org/websvn/nix/?rev=31856&sc=1
Log:
haskell-ghc-mod: don't hard-code a specific version of emacsPackages into the
expression itself
Instead, one of the available version is chosen in haskell-packages.nix, when
the expression is instantiated.
Also updated the meta section.
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-mod/default.nix
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-mod/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-mod/default.nix
Thu Jan 26 14:20:06 2012 (r31855)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-mod/default.nix
Thu Jan 26 14:20:11 2012 (r31856)
@@ -1,4 +1,4 @@
-{ cabal, attoparsec, attoparsecEnumerator, ghcPaths, hlint, regexPosix, emacs,
emacs23Packages }:
+{ cabal, attoparsec, attoparsecEnumerator, ghcPaths, hlint, regexPosix,
emacsPackages }:
cabal.mkDerivation (self: {
pname = "ghc-mod";
@@ -7,8 +7,7 @@
buildDepends = [
attoparsec attoparsecEnumerator ghcPaths hlint regexPosix
];
-# buildTools = [emacs emacs23];
- propagatedBuildInputs = [emacs emacs23Packages.haskellMode];
+ propagatedBuildInputs = [emacsPackages.emacs emacsPackages.haskellMode];
isExecutable = true;
postInstall = ''
cd $out/share/$pname-$version
@@ -20,11 +19,14 @@
'';
meta = {
+ homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";;
description = "Happy Haskell programming on Emacs";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
+ self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.bluescreen303
+ self.stdenv.lib.maintainers.simons
];
};
})
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Thu Jan 26 14:20:06
2012 (r31855)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Thu Jan 26 14:20:11
2012 (r31856)
@@ -683,7 +683,9 @@
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 {};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
