diff --git a/CHANGELOG.md b/CHANGELOG.md index 5341762..818df2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## [0.2.8] 2019-12-00 +## Changed +* Fixed message in `niv init` with custom `sources.json` + ## [0.2.7] 2019-12-08 ## Added * Support for custom path `sources.json` with `--sources-json` diff --git a/README.md b/README.md index f49a0bd..8c54e6b 100644 --- a/README.md +++ b/README.md @@ -201,10 +201,10 @@ niv - dependency manager for Nix projects version: 0.2.7 -Usage: niv [-s|--sources-json FILE] COMMAND +Usage: niv [-s|--sources-file FILE] COMMAND Available options: - -s,--sources-json FILE Use FILE instead of nix/sources.json + -s,--sources-file FILE Use FILE instead of nix/sources.json -h,--help Show this help text Available commands: diff --git a/src/Niv/Cli.hs b/src/Niv/Cli.hs index 953a608..2eaf622 100644 --- a/src/Niv/Cli.hs +++ b/src/Niv/Cli.hs @@ -69,7 +69,7 @@ cli = do ] parseFindSourcesJson = AtPath <$> Opts.strOption ( - Opts.long "sources-json" <> + Opts.long "sources-file" <> Opts.short 's' <> Opts.metavar "FILE" <> Opts.help "Use FILE instead of nix/sources.json" @@ -154,7 +154,7 @@ cmdInit = do , "You are using a custom path for sources.json." ] , " You need to configure the sources.nix to use " <> tbold (T.pack fp) <> ":" - , tbold " import sources.nix { sourcesJson = PATH ; }; " + , tbold " import sources.nix { sourcesFile = PATH ; }; " , T.unwords [ " where", tbold "PATH", "is the relative path from sources.nix to" , tbold (T.pack fp) <> "." ]