From 9bf2f6be8c65fcc2b11879fbc95a97b44ae00c19 Mon Sep 17 00:00:00 2001
From: silverraven691 <83398574+silverraven691@users.noreply.github.com>
Date: Wed, 15 Jun 2022 17:17:06 +0200
Subject: [PATCH] Build images for channel nixos-22.05 (#44)

+  Stop building images for nixos-20.09
---
 .github/workflows/nix.yml | 2 +-
 .gitlab-ci.yml            | 4 ++--
 README.md                 | 2 +-
 shell.nix                 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index 1c5052c..d346994 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -16,9 +16,9 @@ jobs:
       matrix:
         channel:
           - nixos-unstable
-          - nixos-20.09
           - nixos-21.05
           - nixos-21.11
+          - nixos-22.05
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ef45cb..28b97e4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,13 +3,13 @@ stages:
 
 build:
   stage: build
-  image: nixpkgs/nix:nixos-21.05
+  image: nixpkgs/nix:nixos-21.11
   script: nix-shell --run ./ci.sh
   parallel:
     matrix:
       - NIXPKGS_CHANNEL: nixos-unstable
         IMAGE_TAG: latest
       - NIXPKGS_CHANNEL:
-          - nixos-20.09
           - nixos-21.05
           - nixos-21.11
+          - nixos-22.05
diff --git a/README.md b/README.md
index badea39..a7c444c 100644
--- a/README.md
+++ b/README.md
@@ -40,9 +40,9 @@ nixpkgs channel describes.
 | Channel        | Image Tag   | Description                                       |
 | ---            | ---         | ---                                               |
 | nixos-unstable | latest      | latest and greatest, major versions might change  |
+| nixos-22.05    | nixos-22.05 | only minor versions that include security updates |
 | nixos-21.11    | nixos-21.11 | only minor versions that include security updates |
 | nixos-21.05    | nixos-21.05 | only minor versions that include security updates |
-| nixos-20.09    | nixos-20.09 | only minor versions that include security updates |
 
 ## List of images
 
diff --git a/shell.nix b/shell.nix
index 9f06818..9687749 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,5 +1,5 @@
 let
-  nixpkgs = builtins.fetchTarball "channel:nixos-20.09";
+  nixpkgs = builtins.fetchTarball "channel:nixos-22.05";
   pkgs = import nixpkgs { config = { }; overlays = [ ]; };
 in
 with pkgs;