summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2015-06-21 21:20:28 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2015-06-21 21:20:28 +0200
commit26303e51d4270f296880b8daf1107444bd22e35d (patch)
tree5e50f172cbd6b63279b3cfd08f81a7d81d33e566
parent16a31c4a91bcb0eefa6266b69350bd9874f3e929 (diff)
downloadtrivmix-26303e51d4270f296880b8daf1107444bd22e35d.tar
trivmix-26303e51d4270f296880b8daf1107444bd22e35d.tar.gz
trivmix-26303e51d4270f296880b8daf1107444bd22e35d.tar.bz2
trivmix-26303e51d4270f296880b8daf1107444bd22e35d.tar.xz
trivmix-26303e51d4270f296880b8daf1107444bd22e35d.zip
Better docs
-rw-r--r--trivmix.cabal2
-rw-r--r--trivmix.nix2
-rw-r--r--trivmix/Trivmix.hs25
3 files changed, 15 insertions, 14 deletions
diff --git a/trivmix.cabal b/trivmix.cabal
index 3dd339a..fd96124 100644
--- a/trivmix.cabal
+++ b/trivmix.cabal
@@ -2,7 +2,7 @@
2-- documentation, see http://haskell.org/cabal/users-guide/ 2-- documentation, see http://haskell.org/cabal/users-guide/
3 3
4name: trivmix 4name: trivmix
5version: 2.6.0 5version: 2.6.1
6-- synopsis: 6-- synopsis:
7-- description: 7-- description:
8license: PublicDomain 8license: PublicDomain
diff --git a/trivmix.nix b/trivmix.nix
index 82d4781..be0b676 100644
--- a/trivmix.nix
+++ b/trivmix.nix
@@ -6,7 +6,7 @@
6 6
7cabal.mkDerivation (self: { 7cabal.mkDerivation (self: {
8 pname = "trivmix"; 8 pname = "trivmix";
9 version = "2.6.0"; 9 version = "2.6.1";
10 src = ./.; 10 src = ./.;
11 isLibrary = true; 11 isLibrary = true;
12 isExecutable = true; 12 isExecutable = true;
diff --git a/trivmix/Trivmix.hs b/trivmix/Trivmix.hs
index 9f0cf22..8cfa1b6 100644
--- a/trivmix/Trivmix.hs
+++ b/trivmix/Trivmix.hs
@@ -46,26 +46,27 @@ data Options = Options
46 } 46 }
47 47
48optionParser :: Parser Options 48optionParser :: Parser Options
49optionParser = Options <$> 49optionParser = Options
50 (fromMaybe "in" <$> optional (strOption ( long "input" 50 <$> strOption ( long "input"
51 <> metavar "STRING" 51 <> metavar "STRING"
52 ) 52 <> value "in"
53 ) 53 <> showDefault
54 ) 54 )
55 <*> (fromMaybe "out" <$> optional (strOption ( long "output" 55 <*> strOption ( long "output"
56 <> metavar "STRING" 56 <> metavar "STRING"
57 ) 57 <> value "out"
58 ) 58 <> showDefault
59 ) 59 )
60 <*> strOption ( long "client" 60 <*> strOption ( long "client"
61 <> metavar "STRING" 61 <> metavar "STRING"
62 ) 62 )
63 <*> optional ( strOption ( long "run" 63 <*> optional ( strOption ( long "run"
64 <> metavar "FILE" 64 <> metavar "FILE"
65 <> help "Execute a file once setup of jacks is done (use this to autoconnect)"
65 ) 66 )
66 ) 67 )
67 <*> some (strArgument ( metavar "FILE..." 68 <*> some (strArgument ( metavar "FILE..."
68 <> help "Files that contain levels to assume and synchronize" 69 <> help "Files that contain levels to assume and synchronize — For deterministic behaviour use flock(2)"
69 ) 70 )
70 ) 71 )
71 72