mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Update default NixOS channel to nixos-20.09

Browse source
This commit is contained in:
Vincent Ambo 2021-04-23 11:00:06 +02:00 committed by Vincent Ambo
parent 8a1add9ef8
commit 7520f2cb96
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/nixery/.github/workflows/build-and-test.yaml vendored
View file

@ -6,7 +6,7 @@ on:
- master - master
pull_request: {} pull_request: {}
env: env:
NIX_PATH: "nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/0a40a3999eb4d577418515da842a2622a64880c5.tar.gz" NIX_PATH: "nixpkgs=https://github.com/NixOS/nixpkgs/archive/4263ba5e133cc3fc699c1152ab5ee46ef668e675.tar.gz"
jobs: jobs:
build-and-test: build-and-test:
runs-on: ubuntu-latest runs-on: ubuntu-latest

2
tools/nixery/docs/src/caching.md
View file

@ -29,7 +29,7 @@ Manifest caching *only* applies in the following cases:
Manifest caching *never* applies in the following cases: Manifest caching *never* applies in the following cases:
* package source specification is a local file path (i.e. `NIXERY_PKGS_PATH`) * package source specification is a local file path (i.e. `NIXERY_PKGS_PATH`)
* package source specification is a NixOS channel (e.g. `NIXERY_CHANNEL=nixos-20.03`) * package source specification is a NixOS channel (e.g. `NIXERY_CHANNEL=nixos-20.09`)
* package source specification is a git branch or tag (e.g. `staging`, `master` or `latest`) * package source specification is a git branch or tag (e.g. `staging`, `master` or `latest`)
It is thus always preferable to request images from a fully-pinned package It is thus always preferable to request images from a fully-pinned package

2
tools/nixery/docs/src/nixery.md
View file

@ -54,7 +54,7 @@ own instance of Nixery.
### Which revision of `nixpkgs` is used for the builds? ### Which revision of `nixpkgs` is used for the builds?
The instance at `nixery.dev` tracks a recent NixOS channel, currently NixOS The instance at `nixery.dev` tracks a recent NixOS channel, currently NixOS
20.03. The channel is updated several times a day. 20.09. The channel is updated several times a day.
Private registries might be configured to track a different channel (such as Private registries might be configured to track a different channel (such as
`nixos-unstable`) or even track a git repository with custom packages. `nixos-unstable`) or even track a git repository with custom packages.

4
tools/nixery/docs/src/run-your-own.md
View file

@ -44,7 +44,7 @@ be performed for trivial things.
However if you are running a private Nixery, chances are high that you intend to However if you are running a private Nixery, chances are high that you intend to
use it with your own packages. There are three options available: use it with your own packages. There are three options available:
1. Specify an upstream Nix/NixOS channel[^1], such as `nixos-20.03` or 1. Specify an upstream Nix/NixOS channel[^1], such as `nixos-20.09` or
`nixos-unstable`. `nixos-unstable`.
2. Specify your own git-repository with a custom package set[^2]. This makes it 2. Specify your own git-repository with a custom package set[^2]. This makes it
possible to pull different tags, branches or commits by modifying the image possible to pull different tags, branches or commits by modifying the image
@ -73,7 +73,7 @@ You must set *all* of these:
* `BUCKET`: [Google Cloud Storage][gcs] bucket to store & serve image layers * `BUCKET`: [Google Cloud Storage][gcs] bucket to store & serve image layers
* `PORT`: HTTP port on which Nixery should listen * `PORT`: HTTP port on which Nixery should listen
You may set *one* of these, if unset Nixery defaults to `nixos-20.03`: You may set *one* of these, if unset Nixery defaults to `nixos-20.09`:
* `NIXERY_CHANNEL`: The name of a Nix/NixOS channel to use for building * `NIXERY_CHANNEL`: The name of a Nix/NixOS channel to use for building
* `NIXERY_PKGS_REPO`: URL of a git repository containing a package set (uses * `NIXERY_PKGS_REPO`: URL of a git repository containing a package set (uses

4
tools/nixery/nixpkgs-pin.nix
View file

@ -1,4 +1,4 @@
import (builtins.fetchTarball { import (builtins.fetchTarball {
url = "https://github.com/NixOS/nixpkgs-channels/archive/0a40a3999eb4d577418515da842a2622a64880c5.tar.gz"; url = "https://github.com/NixOS/nixpkgs/archive/4263ba5e133cc3fc699c1152ab5ee46ef668e675.tar.gz";
sha256 = "1j8gy2d61lmrp5gzi1a2jmb2v2pbk4b9666y8pf1pjg3jiqkzf7m"; sha256 = "1nzqrdw0lhbldbs9r651zmgqpwhjhh9sssykhcl2155kgsfsrk7i";
}) {} }) {}

2
tools/nixery/prepare-image/prepare-image.nix
View file

@ -24,7 +24,7 @@
{ {
# Description of the package set to be used (will be loaded by load-pkgs.nix) # Description of the package set to be used (will be loaded by load-pkgs.nix)
srcType ? "nixpkgs", srcType ? "nixpkgs",
srcArgs ? "nixos-20.03", srcArgs ? "nixos-20.09",
system ? "x86_64-linux", system ? "x86_64-linux",
importArgs ? { }, importArgs ? { },
# Path to load-pkgs.nix # Path to load-pkgs.nix