diff options
-rw-r--r-- | trivmix.cabal | 2 | ||||
-rw-r--r-- | trivmix.nix | 2 | ||||
-rw-r--r-- | trivmix/Trivmix.hs | 25 |
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 | ||
4 | name: trivmix | 4 | name: trivmix |
5 | version: 2.6.0 | 5 | version: 2.6.1 |
6 | -- synopsis: | 6 | -- synopsis: |
7 | -- description: | 7 | -- description: |
8 | license: PublicDomain | 8 | license: 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 | ||
7 | cabal.mkDerivation (self: { | 7 | cabal.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 | ||
48 | optionParser :: Parser Options | 48 | optionParser :: Parser Options |
49 | optionParser = Options <$> | 49 | optionParser = 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 | ||