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..6b3e284 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": { @@ -41,10 +41,10 @@ "homepage": "https://github.com/NixOS/nixpkgs", "owner": "hercules-ci", "repo": "nixpkgs", - "rev": "35f40b20607428901e8edace7d4643d4ac11e876", - "sha256": "0w1ivhzszggq2j4fxbhdppvzj07zkginfnqdpkl6mdzvpwhy8f0d", + "rev": "14aa201b658f43546b00153bb2ada7206ba8dd26", + "sha256": "0xn43gdn3rfys1d8ni3y6x7vxyc263qsbhfsjwc5x7pcd3dfrcjw", "type": "tarball", - "url": "https://github.com/hercules-ci/nixpkgs/archive/35f40b20607428901e8edace7d4643d4ac11e876.tar.gz", + "url": "https://github.com/hercules-ci/nixpkgs/archive/14aa201b658f43546b00153bb2ada7206ba8dd26.tar.gz", "url_template": "https://github.com///archive/.tar.gz", "version": "" },