about summary refs log tree commit diff
path: root/tools
diff options
context:
space:
mode:
authorRaphael Borun Das Gupta <git@raphael.dasgupta.ch>2020-04-30T23·38+0200
committerVincent Ambo <mail@tazj.in>2020-05-01T10·58+0100
commitbdda24a77287e09cb855eee7019148ee8bbd1cd9 (patch)
tree8591e8e90135c0889c83efc9b65f8d05f87436e3 /tools
parent215df37187501523bb3bf348b7bbd76a01692f19 (diff)
chore(nix): update channel 19.03 -> 20.03
Use a NixOS / NixPkgs release that's actually being supported
and regularly updated.
Diffstat (limited to 'tools')
-rw-r--r--tools/nixery/docs/src/caching.md2
-rw-r--r--tools/nixery/docs/src/nixery.md2
-rw-r--r--tools/nixery/docs/src/run-your-own.md4
-rw-r--r--tools/nixery/prepare-image/prepare-image.nix2
4 files changed, 5 insertions, 5 deletions
diff --git a/tools/nixery/docs/src/caching.md b/tools/nixery/docs/src/caching.md
index b07d9e22f046..05ea6d89b655 100644
--- a/tools/nixery/docs/src/caching.md
+++ b/tools/nixery/docs/src/caching.md
@@ -29,7 +29,7 @@ Manifest caching *only* 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 NixOS channel (e.g. `NIXERY_CHANNEL=nixos-19.03`)
+* package source specification is a NixOS channel (e.g. `NIXERY_CHANNEL=nixos-20.03`)
 * 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
diff --git a/tools/nixery/docs/src/nixery.md b/tools/nixery/docs/src/nixery.md
index 6cc16431c9e8..185c84630889 100644
--- a/tools/nixery/docs/src/nixery.md
+++ b/tools/nixery/docs/src/nixery.md
@@ -54,7 +54,7 @@ own instance of Nixery.
 ### Which revision of `nixpkgs` is used for the builds?
 
 The instance at `nixery.dev` tracks a recent NixOS channel, currently NixOS
-19.03. The channel is updated several times a day.
+20.03. The channel is updated several times a day.
 
 Private registries might be configured to track a different channel (such as
 `nixos-unstable`) or even track a git repository with custom packages.
diff --git a/tools/nixery/docs/src/run-your-own.md b/tools/nixery/docs/src/run-your-own.md
index ffddec32db5f..9c20e3f2cde7 100644
--- a/tools/nixery/docs/src/run-your-own.md
+++ b/tools/nixery/docs/src/run-your-own.md
@@ -44,7 +44,7 @@ be performed for trivial things.
 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:
 
-1. Specify an upstream Nix/NixOS channel[^1], such as `nixos-19.03` or
+1. Specify an upstream Nix/NixOS channel[^1], such as `nixos-20.03` or
    `nixos-unstable`.
 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
@@ -73,7 +73,7 @@ You must set *all* of these:
 * `BUCKET`: [Google Cloud Storage][gcs] bucket to store & serve image layers
 * `PORT`: HTTP port on which Nixery should listen
 
-You may set *one* of these, if unset Nixery defaults to `nixos-19.03`:
+You may set *one* of these, if unset Nixery defaults to `nixos-20.03`:
 
 * `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
diff --git a/tools/nixery/prepare-image/prepare-image.nix b/tools/nixery/prepare-image/prepare-image.nix
index 4393f2b859a6..7b73b92bfd9b 100644
--- a/tools/nixery/prepare-image/prepare-image.nix
+++ b/tools/nixery/prepare-image/prepare-image.nix
@@ -24,7 +24,7 @@
 {
   # Description of the package set to be used (will be loaded by load-pkgs.nix)
   srcType ? "nixpkgs",
-  srcArgs ? "nixos-19.03",
+  srcArgs ? "nixos-20.03",
   system ? "x86_64-linux",
   importArgs ? { },
   # Path to load-pkgs.nix