From ea271bdc05810171a52548c4ae28d4823c09d34e Mon Sep 17 00:00:00 2001
From: Ivan Petkov <ivanppetkov@gmail.com>
Date: Fri, 2 Dec 2022 04:12:55 +0000
Subject: [PATCH] ci: test against 22.11 and stop testing 22.05 (#179)

---
 .github/workflows/test.yml | 14 +++++++-------
 CHANGELOG.md               |  5 +++++
 checks/default.nix         |  4 ++--
 checks/nextest.nix         | 14 ++++----------
 4 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f88e4f0..797b807 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -30,9 +30,9 @@ jobs:
         include:
             # Latest and greatest release of Nix
           - install_url: https://nixos.org/nix/install
-            # The 22.05 branch ships with Nix 2.8.1
-          - install_url: https://releases.nixos.org/nix/nix-2.8.1/install
-            nixpkgs-override: "--override-input nixpkgs github:NixOS/nixpkgs/release-22.05"
+            # The 22.11 branch ships with Nix 2.11.0
+          - install_url: https://releases.nixos.org/nix/nix-2.11.0/install
+            nixpkgs-override: "--override-input nixpkgs github:NixOS/nixpkgs/release-22.11"
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
@@ -58,13 +58,13 @@ jobs:
             # Latest and greatest release of Nix
             install_url: https://nixos.org/nix/install
           - os: ubuntu-latest
-            # The 22.05 branch ships with Nix 2.8.1
-            install_url: https://releases.nixos.org/nix/nix-2.8.1/install
-            nixpkgs-override: "--override-input nixpkgs github:NixOS/nixpkgs/release-22.05"
+            # The 22.11 branch ships with Nix 2.11.0
+            install_url: https://releases.nixos.org/nix/nix-2.11.0/install
+            nixpkgs-override: "--override-input nixpkgs github:NixOS/nixpkgs/release-22.11"
           - os: macos-12
             # Latest and greatest release of Nix
             install_url: https://nixos.org/nix/install
-            nixpkgs-override: "--override-input nixpkgs github:NixOS/nixpkgs/nixpkgs-22.05-darwin"
+            nixpkgs-override: "--override-input nixpkgs github:NixOS/nixpkgs/nixpkgs-22.11-darwin"
 
     runs-on: ${{ matrix.os }}
     steps:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0facb5..3ae808a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+### Changed
+* **Breaking**: dropped compatibility for Nix versions below 2.11.0
+* **Breaking**: dropped compatibility for nixpkgs-22.05. nixpkgs-22.11 and
+  nixpkgs-unstable are fully supported
+
 ## [0.10.0] - 2022-12-01
 
 ### Added
diff --git a/checks/default.nix b/checks/default.nix
index a0b1902..6375926 100644
--- a/checks/default.nix
+++ b/checks/default.nix
@@ -335,10 +335,10 @@ in
     pname = "workspace-hack";
   };
 
-  workspaceInheritance = lib.optionalAttrs (lib.versionAtLeast pkgs.cargo.version "1.64.0") (myLib.buildPackage {
+  workspaceInheritance = myLib.buildPackage {
     src = myLib.cleanCargoSource ./workspace-inheritance;
     pname = "workspace-inheritance";
-  });
+  };
 
   workspaceRoot = myLib.buildPackage {
     src = myLib.cleanCargoSource ./workspace-root;
diff --git a/checks/nextest.nix b/checks/nextest.nix
index 00d3179..6450e3c 100644
--- a/checks/nextest.nix
+++ b/checks/nextest.nix
@@ -1,15 +1,8 @@
-{ cargo-nextest
-, cargoNextest
-, lib
+{ cargoNextest
 , runCommand
 }:
 
 let
-  # cargo-nextest version in the stable-22.05 branch is too old
-  nextestSupportsArchives = lib.versionAtLeast
-    cargo-nextest.version
-    "0.9.15";
-
   nextestSimple = cargoNextest {
     src = ./simple;
     pname = "nextest-simple";
@@ -34,10 +27,11 @@ let
 in
 runCommand "nextestTests"
 {
-  buildInputs = [ nextestSimple ] ++ (lib.optionals nextestSupportsArchives [
+  buildInputs = [
+    nextestSimple
     nextestPartitionsCount
     nextestPartitionsHash
-  ]);
+  ];
 } ''
   mkdir -p $out
 ''