chore: Update default NixOS channel to nixos-20.09

6 files changed, 8 insertions, 8 deletions

diff --git a/tools/nixery/.github/workflows/build-and-test.yaml b/tools/nixery/.github/workflows/build-and-test.yaml
index 86a2c43637..4563239a85 100644
--- a/tools/nixery/.github/workflows/build-and-test.yaml
+++ b/tools/nixery/.github/workflows/build-and-test.yaml
@@ -6,7 +6,7 @@ on:
       - master
   pull_request: {}
 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:
   build-and-test:
     runs-on: ubuntu-latest
diff --git a/tools/nixery/docs/src/caching.md b/tools/nixery/docs/src/caching.md
index 05ea6d89b6..05ea68ef60 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-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`)
 
 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 185c846308..5f6dcb7e36 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
-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
 `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 9c20e3f2cd..4ffb8c4d4b 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-20.03` or
+1. Specify an upstream Nix/NixOS channel[^1], such as `nixos-20.09` 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-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_PKGS_REPO`: URL of a git repository containing a package set (uses
diff --git a/tools/nixery/nixpkgs-pin.nix b/tools/nixery/nixpkgs-pin.nix
index ea1b37bfe7..ffedc92ed3 100644
--- a/tools/nixery/nixpkgs-pin.nix
+++ b/tools/nixery/nixpkgs-pin.nix
@@ -1,4 +1,4 @@
 import (builtins.fetchTarball {
-  url = "https://github.com/NixOS/nixpkgs-channels/archive/0a40a3999eb4d577418515da842a2622a64880c5.tar.gz";
-  sha256 = "1j8gy2d61lmrp5gzi1a2jmb2v2pbk4b9666y8pf1pjg3jiqkzf7m";
+  url = "https://github.com/NixOS/nixpkgs/archive/4263ba5e133cc3fc699c1152ab5ee46ef668e675.tar.gz";
+  sha256 = "1nzqrdw0lhbldbs9r651zmgqpwhjhh9sssykhcl2155kgsfsrk7i";
 }) {}
diff --git a/tools/nixery/prepare-image/prepare-image.nix b/tools/nixery/prepare-image/prepare-image.nix
index 7b73b92bfd..316bfbbf27 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-20.03",
+  srcArgs ? "nixos-20.09",
   system ? "x86_64-linux",
   importArgs ? { },
   # Path to load-pkgs.nix