From c6107230dc4a3975ae8c9086850a5b3c0e25a9f2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 19:38:48 +0200 Subject: [PATCH] haskell-ghc-mod: update to version 5.0.1.1 --- .../haskell/ghc-mod/{5.0.1.nix => 5.0.1.1.nix} | 11 ++++------- pkgs/top-level/haskell-packages.nix | 10 ++-------- 2 files changed, 6 insertions(+), 15 deletions(-) rename pkgs/development/libraries/haskell/ghc-mod/{5.0.1.nix => 5.0.1.1.nix} (84%) diff --git a/pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix b/pkgs/development/libraries/haskell/ghc-mod/5.0.1.1.nix similarity index 84% rename from pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix rename to pkgs/development/libraries/haskell/ghc-mod/5.0.1.1.nix index 1151cdfa51d..3eefe056218 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/5.0.1.1.nix @@ -2,14 +2,14 @@ { cabal, Cabal, convertible, deepseq, djinnGhc, doctest, emacs , filepath, ghcPaths, ghcSybUtils, haskellSrcExts, hlint, hspec -, ioChoice, monadControl, monadJournal, mtl, split, syb, text, time -, transformers, transformersBase, makeWrapper +, ioChoice, makeWrapper, monadControl, monadJournal, mtl, split +, syb, text, time, transformers, transformersBase }: cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "5.0.1"; - sha256 = "01awsi5rfzq6433shfvvnr69ifxb7h8v90mlknxv3dl34zmrhv19"; + version = "5.0.1.1"; + sha256 = "0qyl1653dj14ap3035kjj7xl8rsmgpwh32bj2lnwrmdm2223m8a3"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -25,8 +25,6 @@ cabal.mkDerivation (self: { buildTools = [ emacs makeWrapper ]; doCheck = false; 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 = '' cd $out/share/$pname-$version make @@ -34,7 +32,6 @@ cabal.mkDerivation (self: { cd .. ensureDir "$out/share/emacs" mv $pname-$version emacs/site-lisp - wrapProgram $out/bin/ghc-mod --add-flags \ "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"-g -package-db -g\")" wrapProgram $out/bin/ghc-modi --add-flags \ diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 66245c72e36..d5a94dcabeb 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -899,14 +899,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in ghcjsCodemirror = callPackage ../development/libraries/haskell/ghcjs-codemirror {}; - ghcMod_4_1_6 = callPackage ../development/libraries/haskell/ghc-mod/4.1.6.nix { - inherit (pkgs) emacs; - }; - - ghcMod_5_0_1 = callPackage ../development/libraries/haskell/ghc-mod/5.0.1.nix { - inherit (pkgs) emacs; - }; - + ghcMod_4_1_6 = callPackage ../development/libraries/haskell/ghc-mod/4.1.6.nix { inherit (pkgs) emacs; }; + ghcMod_5_0_1_1 = callPackage ../development/libraries/haskell/ghc-mod/5.0.1.1.nix { inherit (pkgs) emacs; }; ghcMod = self.ghcMod_4_1_6; ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {};