nmattia/niv
1
1
Fork 0
mirror of https://github.com/nmattia/niv.git synced 2024-09-18 19:07:19 +03:00
Code Issues Projects Releases Wiki Activity

init at 19.09

Browse Source
This commit is contained in:
Christian Kampka 2019-12-16 14:30:44 +01:00
parent 6f03879b8a
commit ec254c6853
No known key found for this signature in database
GPG Key ID: B88E140DB4FE1AA5
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -96,7 +96,7 @@ initialized with niv and nixpkgs:
"nixpkgs": {
"url": "https://github.com/NixOS/nixpkgs-channels/archive/109a28ab954a0ad129f7621d468f829981b8b96c.tar.gz",
"owner": "NixOS",
"branch": "nixos-19.03",
"branch": "nixos-19.09",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
"repo": "nixpkgs-channels",
"sha256": "12wnxla7ld4cgpdndaipdh3j4zdalifk287ihxhnmrzrghjahs3q",
@ -133,7 +133,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 19.03 when the command was run. Run the following command to
present on nixpkgs 19.09 when the command was run. Run the following command to
update it:
``` shell
@ -143,7 +143,7 @@ $ niv update nixpkgs
To change the branch being tracked run this command:
``` shell
$ niv update nixpkgs -b nixos-19.03 # equivalent to --branch nixos-19.03
$ niv update nixpkgs -b nixos-19.09 # equivalent to --branch nixos-19.09
```
#### Importing packages from GitHub
@ -224,7 +224,7 @@ Available commands:
Examples:
niv add stedolan/jq
niv add NixOS/nixpkgs-channels -n nixpkgs -b nixos-19.03
niv add NixOS/nixpkgs-channels -n nixpkgs -b nixos-19.09
niv add my-package -v alpha-0.1 -t http://example.com/archive/<version>.zip
Usage: niv add PACKAGE [-n|--name NAME] ([-a|--attribute KEY=VAL] |

6
README.tpl.md
View File

@ -96,7 +96,7 @@ initialized with niv and nixpkgs:
"nixpkgs": {
"url": "https://github.com/NixOS/nixpkgs-channels/archive/109a28ab954a0ad129f7621d468f829981b8b96c.tar.gz",
"owner": "NixOS",
"branch": "nixos-19.03",
"branch": "nixos-19.09",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
"repo": "nixpkgs-channels",
"sha256": "12wnxla7ld4cgpdndaipdh3j4zdalifk287ihxhnmrzrghjahs3q",
@ -133,7 +133,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 19.03 when the command was run. Run the following command to
present on nixpkgs 19.09 when the command was run. Run the following command to
update it:
``` shell
@ -143,7 +143,7 @@ $ niv update nixpkgs
To change the branch being tracked run this command:
``` shell
$ niv update nixpkgs -b nixos-19.03 # equivalent to --branch nixos-19.03
$ niv update nixpkgs -b nixos-19.09 # equivalent to --branch nixos-19.09
```
#### Importing packages from GitHub

2
nix/sources.json
View File

@ -1,6 +1,6 @@
{
"nixpkgs": {
"branch": "nixos-19.03",
"branch": "nixos-19.09",
"description": "Nixpkgs/NixOS branches that track the Nixpkgs/NixOS channels",
"homepage": "https://github.com/NixOS/nixpkgs",
"owner": "NixOS",

4
src/Niv/Cli.hs
View File

@ -125,7 +125,7 @@ cmdInit = do
, ( pathNixSourcesJson fsj
, \path -> do
createFile path initNixSourcesJsonContent
-- Imports @niv@ and @nixpkgs@ (19.03)
-- Imports @niv@ and @nixpkgs@ (19.09)
say "Importing 'niv' ..."
cmdAdd (updateCmd githubCmd) (PackageName "niv")
(specToFreeAttrs $ PackageSpec $ HMS.fromList
@ -138,7 +138,7 @@ cmdInit = do
(specToFreeAttrs $ PackageSpec $ HMS.fromList
[ "owner" .= ("NixOS" :: T.Text)
, "repo" .= ("nixpkgs-channels" :: T.Text)
, "branch" .= ("nixos-19.03" :: T.Text)
, "branch" .= ("nixos-19.09" :: T.Text)
]
)
, \path _content -> dontCreateFile path)

2
src/Niv/GitHub/Cmd.hs
View File

@ -109,7 +109,7 @@ describeGitHub = mconcat
"Examples:" Opts.<$$>
"" Opts.<$$>
" niv add stedolan/jq" Opts.<$$>
" niv add NixOS/nixpkgs-channels -n nixpkgs -b nixos-19.03" Opts.<$$>
" niv add NixOS/nixpkgs-channels -n nixpkgs -b nixos-19.09" Opts.<$$>
" niv add my-package -v alpha-0.1 -t http://example.com/archive/<version>.zip"
]

2
tests/github/default.nix
View File

@ -71,7 +71,7 @@ pkgs.runCommand "test"
mkdir -p mock/repos/NixOS/nixpkgs-channels
cp ${./data/repos/NixOS/nixpkgs-channels/repository.json} mock/repos/NixOS/nixpkgs-channels/index.html
mkdir -p mock/repos/NixOS/nixpkgs-channels/commits
cat ${./data/repos/NixOS/nixpkgs-channels/commits.json} | jq -j '.[0] | .sha' > mock/repos/NixOS/nixpkgs-channels/commits/nixos-19.03
cat ${./data/repos/NixOS/nixpkgs-channels/commits.json} | jq -j '.[0] | .sha' > mock/repos/NixOS/nixpkgs-channels/commits/nixos-19.09
mkdir -p mock/NixOS/nixpkgs-channels/archive
cp ${./data/archives + "/${nixpkgs-channels_HEAD}.tar.gz"} \
mock/NixOS/nixpkgs-channels/archive/${nixpkgs-channels_HEAD}.tar.gz

2
tests/github/expected/niv-init.json
View File

@ -12,7 +12,7 @@
"url_template": "http://localhost:3333/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs": {
"branch": "nixos-19.03",
"branch": "nixos-19.09",
"description": "Nixpkgs/NixOS branches that track the Nixpkgs/NixOS channels",
"homepage": null,
"owner": "NixOS",