Skip to content
Permalink
Browse files

update default nixpkgs to 19.03

  • Loading branch information...
yorickvP committed Aug 27, 2019
1 parent 8b7b704 commit f7688ef5d9f9e3623ea7689859dd73adaa768ddf
Showing with 28 additions and 31 deletions.
  1. +3 −3 README.md
  2. +2 −2 README.tpl.md
  3. +19 −22 site/niv.svg
  4. +3 −3 src/Niv/Cli.hs
  5. +1 −1 tests/expected/niv-init.json
@@ -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",
@@ -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
@@ -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] |
@@ -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",
@@ -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

Large diffs are not rendered by default.

@@ -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
@@ -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"
]

@@ -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",

0 comments on commit f7688ef

Please sign in to comment.
You can’t perform that action at this time.