Merge pull request #535 from fosskers/colin/rio

RIO

.gitignore

@@ -1,13 +1,15 @@
-dist/
-dist-newstyle/
+*.dump-hi
 *.hi
 *.o
+*.prof
+*.svg
+*.txt
 .cabal-sandbox
-cabal.sandbox.config
-build/
 .stack-work/*
-*.svg
-*.prof
+AUR-SECURITY.*
+TAGS
+build/
+cabal.sandbox.config
+dist-newstyle/
+dist/
 flames
-*.txt
-*.dump-hi

.travis.yml

@@ -13,7 +13,7 @@ addons:
 # The different configurations we want to test. You could also do things like
 # change flags or use --stack-yaml to point to a different file.
 env:
-- ARGS="--resolver lts-14.3"
+- ARGS="--resolver lts-14.23"
 
 before_install:
 # Download and unpack the stack executable

aur-security/Main.hs

@@ -1,7 +1,5 @@
 {-# LANGUAGE BangPatterns          #-}
 {-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE LambdaCase            #-}
-{-# LANGUAGE NamedFieldPuns        #-}
 {-# LANGUAGE NoImplicitPrelude     #-}
 {-# LANGUAGE TupleSections         #-}
 

aur/lib/Linux/Arch/Aur.hs

@@ -23,7 +23,6 @@ module Linux.Arch.Aur
   ) where
 
 import Control.Applicative ((<|>))
-import Control.Monad (mzero)
 import Data.Aeson
 import Data.Proxy
 import Data.Text (Text)
@@ -40,14 +39,12 @@ data RPCResp = RPCResp
   , _results     :: [AurInfo] } deriving (Show)
 
 instance FromJSON RPCResp where
-  parseJSON (Object v) = RPCResp
+  parseJSON = withObject "RPCResp" $ \v -> RPCResp
     <$> v .: "version"
     <*> v .: "type"
     <*> v .: "resultcount"
     <*> v .: "results"
 
-  parseJSON _ = mzero
-
 -- | All relevant information about an AUR package.
 data AurInfo = AurInfo
   { aurIdOf          :: Int
@@ -73,7 +70,7 @@ data AurInfo = AurInfo
   , keywordsOf       :: [Text] } deriving (Eq,Show)
 
 instance FromJSON AurInfo where
-    parseJSON (Object v) = AurInfo
+    parseJSON = withObject "AurInfo" $ \v -> AurInfo
       <$> v .:  "ID"
       <*> v .:  "Name"
       <*> v .:  "PackageBaseID"
@@ -96,8 +93,6 @@ instance FromJSON AurInfo where
       <*> v .:? "License"     .!= []
       <*> v .:? "Keywords"    .!= []
 
-    parseJSON _ = mzero
-
 instance ToJSON AurInfo where
   toJSON ai = object
     [ "ID" .= aurIdOf ai

aura/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Aura Changelog
 
+## 2.0.4 (2020-02-08)
+
+- Removed `fused-effects` dependency in favour of `rio` to simplify code.
+
 ## 2.0.3
 
 - Updated Spanish translations. Thanks to Max Ferrer!

aura/aura.cabal

@@ -1,6 +1,6 @@
 cabal-version:      2.2
 name:               aura
-version:            2.0.3
+version:            2.0.4
 synopsis:
   A secure package manager for Arch Linux and the AUR, written in Haskell.
 
@@ -12,7 +12,7 @@ description:
   AUR package managers.
 
 category:           System
-homepage:           https://github.com/aurapm/aura
+homepage:           https://github.com/fosskers/aura
 author:             Colin Woodbury
 maintainer:         [email protected]
 license:            GPL-3.0-only
@@ -34,22 +34,21 @@ common commons
     -funclutter-valid-hole-fits
 
   build-depends:
-    , base          >=4.12 && <5
-    , base-prelude  >=1.2  && <1.4
-    , bytestring    ^>=0.10
-    , containers    ^>=0.6
-    , microlens     ^>=0.4
-    , paths         ^>=0.2
-    , text          ^>=1.2
-    , versions      ^>=3.5
+    , base        >=4.12   && <5
+    , bytestring  ^>=0.10
+    , containers  ^>=0.6
+    , microlens   ^>=0.4
+    , paths       ^>=0.2
+    , rio         ^>=0.1.13
+    , text        ^>=1.2
+    , versions    ^>=3.5
 
 common libexec
   build-depends:
     , errors                       ^>=2.3
-    , fused-effects                >=0.4 && <1.1
     , http-client                  >=0.5 && <0.7
     , nonempty-containers          ^>=0.3
-    , prettyprinter                >=1.2 && < 1.6
+    , prettyprinter                >=1.2 && <1.6
     , prettyprinter-ansi-terminal  ^>=1.1
     , transformers                 ^>=0.5
     , typed-process                ^>=0.2
@@ -93,9 +92,8 @@ library
     , algebraic-graphs  >=0.1  && <0.5
     , aur               ^>=6.3
     , compactable       ^>=0.1
-    , directory         ^>=1.3
     , filepath          ^>=1.4
-    , generic-lens      >=1.1 && < 1.3
+    , generic-lens      >=1.1  && <1.3
     , http-types        >=0.9  && <0.13
     , language-bash     ^>=0.8
     , megaparsec        ^>=7
@@ -106,7 +104,7 @@ library
     , semigroupoids     >=5.2  && <5.4
     , stm               ^>=2.5
     , these             ^>=1.0
-    , time              >=1.8 && < 1.10
+    , time              >=1.8  && <1.10
     , unliftio          ^>=0.2
 
 executable aura
@@ -121,7 +119,7 @@ executable aura
   build-depends:
     , aura
     , http-client-tls       ^>=0.3
-    , optparse-applicative  >=0.14 && < 0.16
+    , optparse-applicative  >=0.14 && <0.16
     , pretty-simple         >=2.1  && <3.3
 
 test-suite aura-test