diff options
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 43270465775e..2d0d0ec101db 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -603,6 +603,14 @@ self: super: { # Fine-tune the build. structured-haskell-mode = (overrideCabal super.structured-haskell-mode (drv: { + src = pkgs.fetchFromGitHub { + owner = "chrisdone"; + repo = "structured-haskell-mode"; + rev = "bd08a0b2297667e2ac7896e3b480033ae5721d4d"; + sha256 = "14rl739z19ns31h9fj48sx9ppca4g4mqkc7ccpacagwwf55m259c"; + }; + version = "20170523-git"; + editedCabalFile = null; # Statically linked Haskell libraries make the tool start-up much faster, # which is important for use in Emacs. enableSharedExecutables = false; @@ -610,22 +618,22 @@ self: super: { # cannot easily byte-compile these files, unfortunately, because they # depend on a new version of haskell-mode that we don't have yet. postInstall = '' - local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-"*"/elisp" ) - mkdir -p $out/share/emacs - ln -s $lispdir $out/share/emacs/site-lisp + local lispdir=( "$data/share/${self.ghc.name}/"*"/${drv.pname}-"*"/elisp" ) + mkdir -p $data/share/emacs + ln -s $lispdir $data/share/emacs/site-lisp ''; })).override { haskell-src-exts = self.haskell-src-exts_1_19_1; }; - # # Make elisp files available at a location where people expect it. + # Make elisp files available at a location where people expect it. hindent = (overrideCabal super.hindent (drv: { # We cannot easily byte-compile these files, unfortunately, because they # depend on a new version of haskell-mode that we don't have yet. postInstall = '' - local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-${drv.version}/elisp" ) - mkdir -p $out/share/emacs - ln -s $lispdir $out/share/emacs/site-lisp + local lispdir=( "$data/share/${self.ghc.name}/"*"/${drv.pname}-"*"/elisp" ) + mkdir -p $data/share/emacs + ln -s $lispdir $data/share/emacs/site-lisp ''; doCheck = false; # https://github.com/chrisdone/hindent/issues/299 })).override { @@ -865,9 +873,6 @@ self: super: { # https://github.com/diagrams/diagrams-solve/issues/4 diagrams-solve = dontCheck super.diagrams-solve; - # Needs a newer version of ghc-events. - threadscope = super.threadscope.override { ghc-events = self.ghc-events_0_6_0; }; - # version 1.3.1.2 does not compile: syb >=0.1.0.2 && <0.7 ChasingBottoms = doJailbreak super.ChasingBottoms; |