public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskell-ghc-mod: update to version 5.0.1.1

Browse Source
This commit is contained in:
Peter Simons 2014-08-24 19:38:48 +02:00
parent 9d4faaddbc
commit c6107230dc
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix → pkgs/development/libraries/haskell/ghc-mod/5.0.1.1.nix
View File

@ -2,14 +2,14 @@
{ cabal, Cabal, convertible, deepseq, djinnGhc, doctest, emacs { cabal, Cabal, convertible, deepseq, djinnGhc, doctest, emacs
, filepath, ghcPaths, ghcSybUtils, haskellSrcExts, hlint, hspec , filepath, ghcPaths, ghcSybUtils, haskellSrcExts, hlint, hspec
, ioChoice, monadControl, monadJournal, mtl, split, syb, text, time , ioChoice, makeWrapper, monadControl, monadJournal, mtl, split
, transformers, transformersBase, makeWrapper , syb, text, time, transformers, transformersBase
}: }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "ghc-mod"; pname = "ghc-mod";
version = "5.0.1"; version = "5.0.1.1";
sha256 = "01awsi5rfzq6433shfvvnr69ifxb7h8v90mlknxv3dl34zmrhv19"; sha256 = "0qyl1653dj14ap3035kjj7xl8rsmgpwh32bj2lnwrmdm2223m8a3";
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
buildDepends = [ buildDepends = [
@ -25,8 +25,6 @@ cabal.mkDerivation (self: {
buildTools = [ emacs makeWrapper ]; buildTools = [ emacs makeWrapper ];
doCheck = false; doCheck = false;
configureFlags = "--datasubdir=${self.pname}-${self.version}"; configureFlags = "--datasubdir=${self.pname}-${self.version}";
# The method used below to wrap ghc-mod and ghc-modi was borrowed from the
# wrapper for haddock.
postInstall = '' postInstall = ''
cd $out/share/$pname-$version cd $out/share/$pname-$version
make make
@ -34,7 +32,6 @@ cabal.mkDerivation (self: {
cd .. cd ..
ensureDir "$out/share/emacs" ensureDir "$out/share/emacs"
mv $pname-$version emacs/site-lisp mv $pname-$version emacs/site-lisp
wrapProgram $out/bin/ghc-mod --add-flags \ wrapProgram $out/bin/ghc-mod --add-flags \
"\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"-g -package-db -g\")" "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"-g -package-db -g\")"
wrapProgram $out/bin/ghc-modi --add-flags \ wrapProgram $out/bin/ghc-modi --add-flags \

10
pkgs/top-level/haskell-packages.nix
View File

@ -899,14 +899,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
ghcjsCodemirror = callPackage ../development/libraries/haskell/ghcjs-codemirror {}; ghcjsCodemirror = callPackage ../development/libraries/haskell/ghcjs-codemirror {};
ghcMod_4_1_6 = callPackage ../development/libraries/haskell/ghc-mod/4.1.6.nix { ghcMod_4_1_6 = callPackage ../development/libraries/haskell/ghc-mod/4.1.6.nix { inherit (pkgs) emacs; };
inherit (pkgs) emacs; ghcMod_5_0_1_1 = callPackage ../development/libraries/haskell/ghc-mod/5.0.1.1.nix { inherit (pkgs) emacs; };
};
ghcMod_5_0_1 = callPackage ../development/libraries/haskell/ghc-mod/5.0.1.nix {
inherit (pkgs) emacs;
};
ghcMod = self.ghcMod_4_1_6; ghcMod = self.ghcMod_4_1_6;
ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {}; ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {};