Skip to content

Commit

Permalink
update default nixpkgs to 19.03
Browse files Browse the repository at this point in the history
  • Loading branch information
yorickvP committed Aug 27, 2019
1 parent 8b7b704 commit f7688ef
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 31 deletions.
6 changes: 3 additions & 3 deletions README.md
Expand Up @@ -83,7 +83,7 @@ initialized with niv and nixpkgs:
"nixpkgs": {
"url": "https://github.com/NixOS/nixpkgs-channels/archive/109a28ab954a0ad129f7621d468f829981b8b96c.tar.gz",
"owner": "NixOS",
"branch": "nixos-18.09",
"branch": "nixos-19.03",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
"repo": "nixpkgs-channels",
"sha256": "12wnxla7ld4cgpdndaipdh3j4zdalifk287ihxhnmrzrghjahs3q",
Expand Down Expand Up @@ -120,7 +120,7 @@ import sources.nixpkgs # and use them again!
#### Tracking a nixpkgs branch

The `init` command sets the `nix/sources.json` file to track the latest commit
present on nixpkgs 18.09 when the command was run. Run the following command to
present on nixpkgs 19.03 when the command was run. Run the following command to
update it:

``` shell
Expand Down Expand Up @@ -208,7 +208,7 @@ Available commands:
Examples:
niv add stedolan/jq
niv add NixOS/nixpkgs-channels -n nixpkgs -b nixos-18.09
niv add NixOS/nixpkgs-channels -n nixpkgs -b nixos-19.03
niv add my-package -v alpha-0.1 -t http://example.com/archive/<version>.zip
Usage: niv add [-n|--name NAME] PACKAGE ([-a|--attribute KEY=VAL] |
Expand Down
4 changes: 2 additions & 2 deletions README.tpl.md
Expand Up @@ -83,7 +83,7 @@ initialized with niv and nixpkgs:
"nixpkgs": {
"url": "https://github.com/NixOS/nixpkgs-channels/archive/109a28ab954a0ad129f7621d468f829981b8b96c.tar.gz",
"owner": "NixOS",
"branch": "nixos-18.09",
"branch": "nixos-19.03",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
"repo": "nixpkgs-channels",
"sha256": "12wnxla7ld4cgpdndaipdh3j4zdalifk287ihxhnmrzrghjahs3q",
Expand Down Expand Up @@ -120,7 +120,7 @@ import sources.nixpkgs # and use them again!
#### Tracking a nixpkgs branch

The `init` command sets the `nix/sources.json` file to track the latest commit
present on nixpkgs 18.09 when the command was run. Run the following command to
present on nixpkgs 19.03 when the command was run. Run the following command to
update it:

``` shell
Expand Down
41 changes: 19 additions & 22 deletions site/niv.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions src/Niv/Cli.hs
Expand Up @@ -182,14 +182,14 @@ cmdInit = do
, ( pathNixSourcesJson
, \path -> do
createFile path initNixSourcesJsonContent
-- Imports @niv@ and @nixpkgs@ (18.09)
-- Imports @niv@ and @nixpkgs@ (19.03)
putStrLn "Importing 'niv' ..."
cmdAdd Nothing (PackageName "nmattia/niv", PackageSpec HMS.empty)
putStrLn "Importing 'nixpkgs' ..."
cmdAdd
(Just (PackageName "nixpkgs"))
( PackageName "NixOS/nixpkgs-channels"
, PackageSpec (HMS.singleton "branch" "nixos-18.09"))
, PackageSpec (HMS.singleton "branch" "nixos-19.03"))
, \path _content -> dontCreateFile path)
] $ \(path, onCreate, onUpdate) -> do
exists <- Dir.doesFileExist path
Expand Down Expand Up @@ -227,7 +227,7 @@ parseCmdAdd =
"Examples:" Opts.<$$>
"" Opts.<$$>
" niv add stedolan/jq" Opts.<$$>
" niv add NixOS/nixpkgs-channels -n nixpkgs -b nixos-18.09" Opts.<$$>
" niv add NixOS/nixpkgs-channels -n nixpkgs -b nixos-19.03" Opts.<$$>
" niv add my-package -v alpha-0.1 -t http://example.com/archive/<version>.zip"
]

Expand Down
2 changes: 1 addition & 1 deletion tests/expected/niv-init.json
Expand Up @@ -12,7 +12,7 @@
"url_template": "http://localhost:3333/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs": {
"branch": "nixos-18.09",
"branch": "nixos-19.03",
"description": "Nixpkgs/NixOS branches that track the Nixpkgs/NixOS channels",
"homepage": null,
"owner": "NixOS",
Expand Down

0 comments on commit f7688ef

Please sign in to comment.