From 6d2e07173cd3ff6d35bc69f5dcd59a01ede06a38 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 1 Jun 2022 00:14:25 +0200 Subject: [PATCH] Test with NixOS 22.05 --- nix/ci.nix | 5 +++-- nix/sources.json | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/nix/ci.nix b/nix/ci.nix index d545ef6..5dacffd 100644 --- a/nix/ci.nix +++ b/nix/ci.nix @@ -5,14 +5,15 @@ let in dimension "Nixpkgs version" { + # avoid bitrotting the docker support (as opposed to podman) "nixos-20_09" = { nixpkgsSource = "nixos-20.09"; enableDoc = true; dockerSupportsSystemd = true; nixosHasPodmanDockerSocket = false; }; - "nixos-21_05" = { - nixpkgsSource = "nixos-21.05"; + "nixos-22_05" = { + nixpkgsSource = "nixos-22.05"; enableDoc = true; }; "nixos-unstable" = { diff --git a/nix/sources.json b/nix/sources.json index d73c3d0..cd9ff8d 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -23,16 +23,16 @@ "url": "https://github.com/NixOS/nixpkgs/archive/0cfe5377e8993052f9b0dd56d058f8008af45bd9.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, - "nixos-21.05": { - "branch": "nixos-21.05", + "nixos-22.05": { + "branch": "nixos-22.05", "description": "Nix Packages collection", "homepage": null, "owner": "NixOS", "repo": "nixpkgs", - "rev": "297970378b9437541c065f3fef26871397edd2d4", - "sha256": "1q5dnylr4w1xqn3qxx7hn0pn01pcwdmsy70cjs01dn8b50ppc93g", + "rev": "a634c8f6c1fbf9b9730e01764999666f3436f10a", + "sha256": "1d40v43x972li5fg7jadxkj341li41mf2cl6vv7xi6j80rkq45q4", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/297970378b9437541c065f3fef26871397edd2d4.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/a634c8f6c1fbf9b9730e01764999666f3436f10a.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixos-unstable": {