haskell: Add hoogle-5.0.14 for hie-hoogle.

5.0.14 is actually the version of hoogle in the stackage LTS we're tracking, but due to NixOS/cabal2nix@5c816fd that isn't respected.
NixOS · Jan 3, 2018 · 707cfbf · 707cfbf · shlevy · Jan 3, 2018
1 parent d2e8c20
commit 707cfbf
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 2 deletions.
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2688,6 +2688,7 @@ extra-packages:
   - happy <1.19.6                       # newer versions break Agda
   - haskell-gi-overloading == 0.0       # gi-* packages use this dependency to disable overloading support
   - haskell-src-exts == 1.19.*          # required by hindent and structured-haskell-mode
+  - hoogle == 5.0.14                    # required by hie-hoogle
   - hpack == 0.20.*                     # required by stack-1.6.1
   - inline-c < 0.6                      # required on GHC 8.0.x
   - inline-c-cpp < 0.2                  # required on GHC 8.0.x

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -101685,6 +101685,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hoogle_5_0_14" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, cmdargs, conduit
+     , conduit-extra, connection, containers, deepseq, directory, extra
+     , filepath, haskell-src-exts, http-conduit, http-types, js-flot
+     , js-jquery, mmap, network, network-uri, old-locale, process
+     , process-extras, QuickCheck, resourcet, stdenv, storable-tuple
+     , tar, template-haskell, text, time, transformers, uniplate
+     , utf8-string, vector, wai, wai-logger, warp, warp-tls, zlib
+     }:
+     mkDerivation {
+       pname = "hoogle";
+       version = "5.0.14";
+       sha256 = "e7cfa9ca7496d7a30b476f3502c0dfa38671d4235042bb46806568602e97bbf8";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base binary bytestring cmdargs conduit conduit-extra
+         connection containers deepseq directory extra filepath
+         haskell-src-exts http-conduit http-types js-flot js-jquery mmap
+         network network-uri old-locale process process-extras QuickCheck
+         resourcet storable-tuple tar template-haskell text time
+         transformers uniplate utf8-string vector wai wai-logger warp
+         warp-tls zlib
+       ];
+       executableHaskellDepends = [ base ];
+       testTarget = "--test-option=--no-net";
+       homepage = "http://hoogle.haskell.org/";
+       description = "Haskell API Search";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hoogle" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, cmdargs, conduit
      , conduit-extra, connection, containers, deepseq, directory, extra

diff --git a/pkgs/development/haskell-modules/hie-packages.nix b/pkgs/development/haskell-modules/hie-packages.nix
@@ -28,6 +28,7 @@ let src = pkgs.fetchFromGitHub
       };
     cabal-helper = self.cabal-helper_hie;
     haddock-library = self.haddock-library_1_4_4;
+    hoogle = self.hoogle_5_0_14;
     ghc-dump-tree = self.ghc-dump-tree_hie;
     ghc-mod = self.ghc-mod_hie;
     HaRe = self.HaRe_hie;
@@ -259,7 +260,7 @@ in
          homepage = "http://github.com/githubuser/haskell-ide-engine#readme";
          description = "Provide a common engine to power any Haskell IDE";
          license = stdenv.lib.licenses.bsd3;
-      }) {};
+      }) { inherit hoogle; };
     hie-apply-refact = callPackage
       ({ mkDerivation, aeson, apply-refact, base, either, extra, ghc-mod
        , ghc-mod-core, haskell-src-exts, hie-base, hie-plugin-api, hlint
@@ -435,7 +436,7 @@ in
          ];
          description = "Haskell IDE Hoogle plugin";
          license = stdenv.lib.licenses.bsd3;
-       }) { inherit ghc-mod; };
+       }) { inherit ghc-mod hoogle; };
     hie-plugin-api = callPackage
       ({ mkDerivation, aeson, base, containers, Diff, directory, either
        , filepath, fingertree, ghc, ghc-mod-core, haskell-lsp, hie-base