From 2521c74b8bc3da3762cc9adf69b834fd1853b96c Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Mon, 13 Jul 2020 19:34:02 +0200 Subject: [PATCH] Change default repo to NixOS/nixpkgs Also use defaultNixpkgsUser and defaultNixpkgsRepo in the options parser --- README.md | 2 +- src/Niv/Cli.hs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e5daafa..082f7b0 100644 --- a/README.md +++ b/README.md @@ -359,7 +359,7 @@ Available options: --no-nixpkgs Don't add a nixpkgs entry to sources.json. -b,--nixpkgs-branch ARG The nixpkgs branch to use. (default: "release-19.09") --nixpkgs OWNER/REPO Use a custom nixpkgs repository from - GitHub. (default: NixOS/nixpkgs-channels) + GitHub. (default: NixOS/nixpkgs) -h,--help Show this help text ``` diff --git a/src/Niv/Cli.hs b/src/Niv/Cli.hs index 7630148..4f86bf2 100644 --- a/src/Niv/Cli.hs +++ b/src/Niv/Cli.hs @@ -109,7 +109,7 @@ instance Show Nixpkgs where -- | The default nixpkgs defaultNixpkgsRepo, defaultNixpkgsUser :: T.Text -defaultNixpkgsRepo = "nixpkgs-channels" +defaultNixpkgsRepo = "nixpkgs" defaultNixpkgsUser = "NixOS" parseCmdInit :: Opts.ParserInfo (NIO ()) @@ -139,7 +139,7 @@ parseCmdInit = Opts.info (cmdInit <$> parseNixpkgs <**> Opts.helper) $ mconcat d Opts.showDefault <> Opts.help "Use a custom nixpkgs repository from GitHub." <> Opts.metavar "OWNER/REPO" <> - Opts.value (Nixpkgs "NixOS" "nixpkgs-channels") + Opts.value (Nixpkgs defaultNixpkgsUser defaultNixpkgsRepo) )) desc = [ Opts.fullDesc