rnhmjoj/scat
1
0
Fork 0
mirror of https://github.com/redelmann/scat synced 2025-01-10 06:34:20 +01:00
Code Issues Releases Wiki Activity

Merge pull request #3 from rnhmjoj/master

Browse Source 
Fix failing build: updated optparse
This commit is contained in:
redelmann 2015-11-23 21:43:00 +01:00
commit 44fcd65bd1
5 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scat.cabal
View File

@ -10,7 +10,7 @@ name: scat
-- PVP summary: +-+------- breaking API changes -- PVP summary: +-+------- breaking API changes
-- | | +----- non-breaking API additions -- | | +----- non-breaking API additions
-- | | | +--- code changes with no API change -- | | | +--- code changes with no API change
version: 1.1.0.1 version: 1.1.0.2
-- A short (one-line) description of the package. -- A short (one-line) description of the package.
synopsis: Generates unique passwords for various websites from a single password. synopsis: Generates unique passwords for various websites from a single password.
@ -70,9 +70,9 @@ executable scat
build-depends: base >=4.5 && <5 build-depends: base >=4.5 && <5
, scrypt == 0.5.* , scrypt == 0.5.*
, bytestring , bytestring
, optparse-applicative >= 0.5 && <0.10 , optparse-applicative >= 0.5
, mtl , mtl
, vector == 0.10.* , vector == 0.11.*
, ansi-terminal >= 0.6.1 , ansi-terminal >= 0.6.1
test-suite scat-tests test-suite scat-tests
@ -84,5 +84,5 @@ test-suite scat-tests
, bytestring , bytestring
, optparse-applicative >= 0.5 , optparse-applicative >= 0.5
, mtl , mtl
, vector == 0.10.* , vector == 0.11.*
, ansi-terminal >= 0.6.1 , ansi-terminal >= 0.6.1

2
src/Main.hs
View File

@ -3,7 +3,7 @@
-- | Password scatterer. -- | Password scatterer.
module Main (main) where module Main (main) where
import Data.ByteString (ByteString, unpack) import Data.ByteString (ByteString)
import qualified Data.ByteString.Char8 as C import qualified Data.ByteString.Char8 as C
import System.IO import System.IO
import System.Exit import System.Exit

2
src/Scat/Builder.hs
View File

@ -33,8 +33,6 @@ module Scat.Builder
) where ) where
import Data.Char (ord, chr) import Data.Char (ord, chr)
import Data.Monoid
import Control.Applicative
import Control.Monad import Control.Monad
import Control.Arrow (second) import Control.Arrow (second)
import Data.Vector (Vector) import Data.Vector (Vector)

2
src/Scat/Options.hs
View File

@ -84,7 +84,7 @@ options = Options
<> metavar "SCHEMA" <> metavar "SCHEMA"
<> value "safe" <> value "safe"
<> showDefault) <> showDefault)
<*> optional (option <*> optional (option auto
(short 'n' (short 'n'
<> long "size" <> long "size"
<> help "Size parameter" <> help "Size parameter"

3
src/Scat/Schemas.hs
View File

@ -33,11 +33,10 @@ module Scat.Schemas
) where ) where
import Data.Ratio ((%)) import Data.Ratio ((%))
import Data.Monoid ((<>))
import Data.List (intercalate, (\\)) import Data.List (intercalate, (\\))
import Data.Vector (Vector) import Data.Vector (Vector)
import qualified Data.Vector as V import qualified Data.Vector as V
import Data.Monoid
import Control.Applicative
import Control.Monad (replicateM) import Control.Monad (replicateM)
import System.IO import System.IO