Merge pull request #37 from serokell/gromak/#36-new-resolver

[#36] Switch to lts-15.13

Author: gromakovsky

nix/sources.json

@@ -5,10 +5,10 @@
         "homepage": "https://input-output-hk.github.io/haskell.nix",
         "owner": "input-output-hk",
         "repo": "haskell.nix",
-        "rev": "0933c58908816bca525fbf8873abdbc3e072a87e",
-        "sha256": "1shgaaqj0j2d5f7967xssp69nn6dv34dfvkvqkiakb99ggycgdyg",
+        "rev": "db409cf3a0b10a7309a8102bb6a00d8870b9c67e",
+        "sha256": "0j4grhzfrd966cwni9glycdjivzmb45dga4hqhwniajc6kdyj0h4",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/haskell.nix/archive/0933c58908816bca525fbf8873abdbc3e072a87e.tar.gz",
+        "url": "https://github.com/input-output-hk/haskell.nix/archive/db409cf3a0b10a7309a8102bb6a00d8870b9c67e.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {

package.yaml

@@ -33,7 +33,6 @@ default-extensions:
   - FunctionalDependencies
   - GeneralizedNewtypeDeriving
   - LambdaCase
-  - MonadFailDesugaring
   - MultiParamTypeClasses
   - MultiWayIf
   - NamedFieldPuns
@@ -74,6 +73,7 @@ dependencies:
   - http-types
   - lens
   - pretty-terminal
+  - modern-uri
   - mtl
   - o-clock
   - optparse-applicative

src/Xrefcheck/Core.hs

@@ -1,4 +1,4 @@
-{- SPDX-FileCopyrightText: 2018-2019 Serokell <https://serokell.io>
+{- SPDX-FileCopyrightText: 2018-2020 Serokell <https://serokell.io>
  -
  - SPDX-License-Identifier: MPL-2.0
  -}
@@ -9,7 +9,6 @@
 
 module Xrefcheck.Core where
 
-import Control.DeepSeq (NFData)
 import Control.Lens (makeLenses, (%=))
 import Data.Char (isAlphaNum)
 import qualified Data.Char as C

src/Xrefcheck/Verify.hs

@@ -23,20 +23,21 @@ module Xrefcheck.Verify
     ) where
 
 import Control.Concurrent.Async (forConcurrently, withAsync)
-import Control.Monad.Except (ExceptT, MonadError (..))
+import Control.Monad.Except (MonadError (..))
 import qualified Data.Map as M
 import qualified Data.Text as T
 import Data.Text.Metrics (damerauLevenshteinNorm)
 import Fmt (Buildable (..), blockListF', listF, (+|), (|+))
 import qualified GHC.Exts as Exts
 import Network.HTTP.Client (HttpException (..), HttpExceptionContent (..), responseStatus)
 import Network.HTTP.Req (GET (..), HEAD (..), HttpException (..), NoReqBody (..), defaultHttpConfig,
-                         ignoreResponse, parseUrl, req, runReq)
+                         ignoreResponse, req, runReq, useURI)
 import Network.HTTP.Types.Status (Status, statusCode, statusMessage)
 import System.Console.Pretty (Style (..), style)
 import System.Directory (canonicalizePath, doesDirectoryExist, doesFileExist)
 import System.FilePath (takeDirectory, (</>))
 import qualified System.FilePath.Glob as Glob
+import Text.URI (mkURI)
 import Time (RatioNat, Second, Time (..), ms, threadDelay, timeout)
 
 import Xrefcheck.Config
@@ -94,6 +95,7 @@ data VerifyError
     | AnchorDoesNotExist Text [Anchor]
     | AmbiguousAnchorRef FilePath Text (NonEmpty Anchor)
     | ExternalResourceInvalidUri
+    | ExternalResourceUnknownProtocol
     | ExternalResourceUnavailable Status
     | ExternalResourceSomeError Text
     deriving (Show)
@@ -113,6 +115,8 @@ instance Buildable VerifyError where
             "   Use of such anchors is discouraged because referenced object\n\
             \   can change silently whereas the document containing it evolves.\n"
         ExternalResourceInvalidUri ->
+            "⛂  Invalid url\n"
+        ExternalResourceUnknownProtocol ->
             "⛂  Bad url (expected 'http' or 'https')\n"
         ExternalResourceUnavailable status ->
             "⛂  Resource unavailable (" +| statusCode status |+ " " +|
@@ -257,8 +261,10 @@ checkExternalResource VerifyConfig{..} link
 
     makeRequest :: _ => method -> RatioNat -> IO (Either VerifyError ())
     makeRequest method timeoutFrac = runExceptT $ do
-        parsedUrl <- parseUrl (encodeUtf8 link)
-                   & maybe (throwError ExternalResourceInvalidUri) pure
+        uri <- mkURI link
+             & maybe (throwError ExternalResourceInvalidUri) pure
+        parsedUrl <- useURI uri
+                   & maybe (throwError ExternalResourceUnknownProtocol) pure
         let reqLink = case parsedUrl of
                 Left (url, option) ->
                     runReq defaultHttpConfig $

stack.yaml

@@ -1,8 +1,8 @@
-# SPDX-FileCopyrightText: 2018-2019 Serokell <https://serokell.io>
+# SPDX-FileCopyrightText: 2018-2020 Serokell <https://serokell.io>
 #
 # SPDX-License-Identifier: MPL-2.0
 
-resolver: lts-14.16
+resolver: lts-15.13
 
 packages:
 - .
@@ -11,5 +11,5 @@ extra-deps:
 - pretty-terminal-0.1.0.0
 - roman-numerals-0.5.1.5
 - aeson-options-0.1.0
-- o-clock-1.1.0
 - with-utf8-1.0.0.0
+- th-utilities-0.2.4.0@sha256:ba19cd8441aa43dbaed40e9055bb5a7cbd7cf9e154f5253c6bf9293af8b1f96b,1869

stack.yaml.lock

@@ -25,23 +25,23 @@ packages:
       sha256: 4a3ddbdaa61d788155aac6e7601d429a8820441f7b5e31d417b2dbdbf9748be2
   original:
     hackage: aeson-options-0.1.0
-- completed:
-    hackage: o-clock-1.1.0@sha256:941ac2bc1732e6622b165831c4badb1a8e846f451620bd028064339f5b284224,5043
-    pantry-tree:
-      size: 1043
-      sha256: 177f9923edf9494c6a1bb1c02bbf38e6bd3675e2245effaeaa9a7f76c893d7a6
-  original:
-    hackage: o-clock-1.1.0
 - completed:
     hackage: with-utf8-1.0.0.0@sha256:686e47588986d8080451b4e617118b579487dd4e085bba7bb36fac4198c90ae6,2480
     pantry-tree:
       size: 905
       sha256: 39176872f0dde9f9e09c9cb9496e2b7b10fa17cb9a6eca8d40ca4b2dcaaacc11
   original:
     hackage: with-utf8-1.0.0.0
+- completed:
+    hackage: th-utilities-0.2.4.0@sha256:ba19cd8441aa43dbaed40e9055bb5a7cbd7cf9e154f5253c6bf9293af8b1f96b,1869
+    pantry-tree:
+      size: 882
+      sha256: 8c577d112a8398a5542aa4205b2e8a470a66d57590e6606d752d71e75d7425ea
+  original:
+    hackage: th-utilities-0.2.4.0@sha256:ba19cd8441aa43dbaed40e9055bb5a7cbd7cf9e154f5253c6bf9293af8b1f96b,1869
 snapshots:
 - completed:
-    size: 524804
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/14/16.yaml
-    sha256: 4d1519a4372d051d47a5eae2241cf3fb54e113d7475f89707ddb6ec06add2888
-  original: lts-14.16
+    size: 496112
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/15/13.yaml
+    sha256: 75a1a0f870e1876898b117b0e443f911b3fa2985bfabb53158c81ab5765beda5
+  original: lts-15.13

xrefcheck.nix

@@ -5,7 +5,7 @@
 { static ? false }:
 let
   sources = import ./nix/sources.nix;
-  nixpkgs = import sources.nixpkgs (import sources."haskell.nix");
+  nixpkgs = import sources.nixpkgs (import sources."haskell.nix" {}).nixpkgsArgs;
   pkgs = if static then nixpkgs.pkgsCross.musl64 else nixpkgs;
   project = pkgs.haskell-nix.stackProject {
     src = pkgs.haskell-nix.haskellLib.cleanGit { src = ./.; };
@@ -15,6 +15,7 @@ let
         configureFlags = with pkgs;
           lib.optionals static [
             "--ghc-option=-optl=-L${zlib.static}/lib"
+            "--ghc-option=-optl=-L${nixpkgs.pkgsStatic.numactl}/lib"
           ];
       };
     }];