diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-01 11:25:41 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-01 11:25:41 +0200 |
| commit | 06fc1ec34dbae8bba4673475e64a8241026089f6 (patch) | |
| tree | 3e70796a291acc704ef5382f5af4866cab64e537 /pkgs/applications/editors/emacs-modes | |
| parent | 89f8af55f11b01e68cbfc6d10537413140261721 (diff) | |
| parent | ce623950ada9e1ef721760f05b9e3a14604fd764 (diff) | |
| download | nixpkgs-06fc1ec34dbae8bba4673475e64a8241026089f6.tar nixpkgs-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.gz nixpkgs-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.bz2 nixpkgs-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.lz nixpkgs-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.xz nixpkgs-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.zst nixpkgs-06fc1ec34dbae8bba4673475e64a8241026089f6.zip | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/servers/serfdom/default.nix
Diffstat (limited to 'pkgs/applications/editors/emacs-modes')
| -rw-r--r-- | pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix b/pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix index a832c7d5942..a9c2478d451 100644 --- a/pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix +++ b/pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix @@ -1,15 +1,16 @@ -{ cabal, emacs, haskellSrcExts }: +{ cabal, emacs, haskellMode, haskellSrcExts }: cabal.mkDerivation (self: { pname = "structured-haskell-mode"; - version = "1.0.2"; - sha256 = "1lwdhlr38y5hdr78nplplr3q0hrjhryw378f1857qh0lvp03gwl2"; + version = "1.0.3"; + sha256 = "0axmw8bj51q8v0wd4jp6giw9dnv0mp7kp8yd16s4nm4hcqgrh5h2"; isLibrary = false; isExecutable = true; - buildDepends = [ haskellSrcExts ]; + buildDepends = [ haskellSrcExts haskellMode ]; buildTools = [ emacs ]; postInstall = '' - emacs -L elisp --batch -f batch-byte-compile "elisp/"*.el + emacs -L elisp -L ${haskellMode}/share/emacs/site-lisp \ + --batch -f batch-byte-compile "elisp/"*.el install -d $out/share/emacs/site-lisp install "elisp/"*.el "elisp/"*.elc $out/share/emacs/site-lisp ''; |