From 7fbfc8ae9b84600834b4ab76f5af7bff217827e0 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 12 Jul 2015 02:48:13 +0200 Subject: [PATCH 1/3] Fix failing build: updated optparse --- scat.cabal | 2 +- src/Scat/Options.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scat.cabal b/scat.cabal index 3633e77..e8413e8 100644 --- a/scat.cabal +++ b/scat.cabal @@ -70,7 +70,7 @@ executable scat build-depends: base >=4.5 && <5 , scrypt == 0.5.* , bytestring - , optparse-applicative >= 0.5 && <0.10 + , optparse-applicative >= 0.5 , mtl , vector == 0.10.* , ansi-terminal >= 0.6.1 diff --git a/src/Scat/Options.hs b/src/Scat/Options.hs index a8d7cfb..64da707 100644 --- a/src/Scat/Options.hs +++ b/src/Scat/Options.hs @@ -84,7 +84,7 @@ options = Options <> metavar "SCHEMA" <> value "safe" <> showDefault) - <*> optional (option + <*> optional (option auto (short 'n' <> long "size" <> help "Size parameter" From 348bac06785228229d762640a670f5b8e232c63b Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 21 Nov 2015 13:02:30 +0100 Subject: [PATCH 2/3] Update a dependency --- scat.cabal | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scat.cabal b/scat.cabal index e8413e8..b94ab37 100644 --- a/scat.cabal +++ b/scat.cabal @@ -10,7 +10,7 @@ name: scat -- PVP summary: +-+------- breaking API changes -- | | +----- non-breaking API additions -- | | | +--- code changes with no API change -version: 1.1.0.1 +version: 1.1.0.2 -- A short (one-line) description of the package. synopsis: Generates unique passwords for various websites from a single password. @@ -72,7 +72,7 @@ executable scat , bytestring , optparse-applicative >= 0.5 , mtl - , vector == 0.10.* + , vector == 0.11.* , ansi-terminal >= 0.6.1 test-suite scat-tests @@ -84,5 +84,5 @@ test-suite scat-tests , bytestring , optparse-applicative >= 0.5 , mtl - , vector == 0.10.* + , vector == 0.11.* , ansi-terminal >= 0.6.1 From d6d640104f42c845df8d2690997ffc10ad13c58c Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 21 Nov 2015 13:07:39 +0100 Subject: [PATCH 3/3] Fix redundant import warnings --- src/Main.hs | 2 +- src/Scat/Builder.hs | 2 -- src/Scat/Schemas.hs | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Main.hs b/src/Main.hs index cb3aa80..49837ba 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -3,7 +3,7 @@ -- | Password scatterer. module Main (main) where -import Data.ByteString (ByteString, unpack) +import Data.ByteString (ByteString) import qualified Data.ByteString.Char8 as C import System.IO import System.Exit diff --git a/src/Scat/Builder.hs b/src/Scat/Builder.hs index 49caa25..38228b2 100644 --- a/src/Scat/Builder.hs +++ b/src/Scat/Builder.hs @@ -33,8 +33,6 @@ module Scat.Builder ) where import Data.Char (ord, chr) -import Data.Monoid -import Control.Applicative import Control.Monad import Control.Arrow (second) import Data.Vector (Vector) diff --git a/src/Scat/Schemas.hs b/src/Scat/Schemas.hs index 4cb129c..c8942d5 100644 --- a/src/Scat/Schemas.hs +++ b/src/Scat/Schemas.hs @@ -33,11 +33,10 @@ module Scat.Schemas ) where import Data.Ratio ((%)) +import Data.Monoid ((<>)) import Data.List (intercalate, (\\)) import Data.Vector (Vector) import qualified Data.Vector as V -import Data.Monoid -import Control.Applicative import Control.Monad (replicateM) import System.IO