diff --git a/pkgs/applications/editors/emacs-modes/haskell/builder.sh b/pkgs/applications/editors/emacs-modes/haskell/builder.sh deleted file mode 100644 index 2d154031994..00000000000 --- a/pkgs/applications/editors/emacs-modes/haskell/builder.sh +++ /dev/null @@ -1,6 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/emacs/site-lisp -tar zxvf $src -cp haskell-mode*/*.el $out/emacs/site-lisp -cp haskell-mode*/*.hs $out/emacs/site-lisp diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix index 644c485b947..30c68a045c4 100644 --- a/pkgs/applications/editors/emacs-modes/haskell/default.nix +++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix @@ -1,8 +1,17 @@ -{stdenv, fetchurl}: stdenv.mkDerivation { - name = "haskell-mode-1.45"; - builder = ./builder.sh; - src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/haskell-mode-1.45.tar.gz; - md5 = "c609998580cdb9ca8888c7d47d22ca3b"; +{stdenv, fetchurl, emacs}: + +stdenv.mkDerivation rec +{ + name = "haskell-mode-2.4"; + src = fetchurl + { + url = "http://www.iro.umontreal.ca/~monnier/elisp/${name}.tar.gz"; + sha256 = "1s2dd0clwm0qaq7z43vxx437l48c88yrd3z1a6qhbq8aak9y8jc5"; }; + buildInputs = [emacs]; + installCommand = + '' + ensureDir "$out/share/emacs/site-lisp" + cp *.el *.elc *.hs "$out/share/emacs/site-lisp/" + ''; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e56480b4f30..ebc133de717 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5977,7 +5977,7 @@ let pkgs = rec { }; haskellMode = import ../applications/editors/emacs-modes/haskell { - inherit fetchurl stdenv; + inherit fetchurl stdenv emacs; }; hello = import ../applications/misc/hello/ex-2 {