Author: simons
Date: Tue Jan 24 22:06:33 2012
New Revision: 31826
URL: https://nixos.org/websvn/nix/?rev=31826&sc=1
Log:
haskell-ghc-mod: revert updated to version 1.0.7
The check-in accidentally overwrote Emacs-specific extensions of the expression.
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-mod/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-mod/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-mod/default.nix
Tue Jan 24 21:13:42 2012 (r31825)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-mod/default.nix
Tue Jan 24 22:06:33 2012 (r31826)
@@ -1,26 +1,30 @@
-{ cabal, attoparsec, attoparsecEnumerator, enumerator, ghcPaths
-, hlint, regexPosix, transformers
-}:
+{ cabal, attoparsec, attoparsecEnumerator, ghcPaths, hlint, regexPosix, emacs,
emacs23Packages }:
cabal.mkDerivation (self: {
pname = "ghc-mod";
- version = "1.0.7";
- sha256 = "1l490cspz4cym9cwdjr4xz7080f30sl5cm6fslb51ayy2k37zfcx";
- isLibrary = false;
- isExecutable = true;
+ version = "1.0.6";
+ sha256 = "c075314de03209827a0e59ee3e63a4d21bc8edb024a1e36721eea248805b38ba";
buildDepends = [
- attoparsec attoparsecEnumerator enumerator ghcPaths hlint
- regexPosix transformers
+ attoparsec attoparsecEnumerator ghcPaths hlint regexPosix
];
+# buildTools = [emacs emacs23];
+ propagatedBuildInputs = [emacs emacs23Packages.haskellMode];
+ isExecutable = true;
+ postInstall = ''
+ cd $out/share/$pname-$version
+ make
+ rm Makefile
+ cd ..
+ ensureDir "$out/share/emacs"
+ mv $pname-$version emacs/site-lisp
+ '';
+
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
];
};
})
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
