ghoscht/arion
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #160 from hercules-ci/update

Browse source 
Update
This commit is contained in:
Robert Hensing 2022-06-07 01:05:55 +02:00 committed by GitHub
commit f4cd854c8e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
nix/ci.nix
View file

@ -5,14 +5,15 @@ let
in in
dimension "Nixpkgs version" { dimension "Nixpkgs version" {
# avoid bitrotting the docker support (as opposed to podman)
"nixos-20_09" = { "nixos-20_09" = {
nixpkgsSource = "nixos-20.09"; nixpkgsSource = "nixos-20.09";
enableDoc = true; enableDoc = true;
dockerSupportsSystemd = true; dockerSupportsSystemd = true;
nixosHasPodmanDockerSocket = false; nixosHasPodmanDockerSocket = false;
}; };
"nixos-21_05" = { "nixos-22_05" = {
nixpkgsSource = "nixos-21.05"; nixpkgsSource = "nixos-22.05";
enableDoc = true; enableDoc = true;
}; };
"nixos-unstable" = { "nixos-unstable" = {

16
nix/sources.json
View file

@ -23,16 +23,16 @@
"url": "https://github.com/NixOS/nixpkgs/archive/0cfe5377e8993052f9b0dd56d058f8008af45bd9.tar.gz", "url": "https://github.com/NixOS/nixpkgs/archive/0cfe5377e8993052f9b0dd56d058f8008af45bd9.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"nixos-21.05": { "nixos-22.05": {
"branch": "nixos-21.05", "branch": "nixos-22.05",
"description": "Nix Packages collection", "description": "Nix Packages collection",
"homepage": null, "homepage": null,
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "297970378b9437541c065f3fef26871397edd2d4", "rev": "a634c8f6c1fbf9b9730e01764999666f3436f10a",
"sha256": "1q5dnylr4w1xqn3qxx7hn0pn01pcwdmsy70cjs01dn8b50ppc93g", "sha256": "1d40v43x972li5fg7jadxkj341li41mf2cl6vv7xi6j80rkq45q4",
"type": "tarball", "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/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"nixos-unstable": { "nixos-unstable": {
@ -41,10 +41,10 @@
"homepage": "https://github.com/NixOS/nixpkgs", "homepage": "https://github.com/NixOS/nixpkgs",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "35f40b20607428901e8edace7d4643d4ac11e876", "rev": "14aa201b658f43546b00153bb2ada7206ba8dd26",
"sha256": "0w1ivhzszggq2j4fxbhdppvzj07zkginfnqdpkl6mdzvpwhy8f0d", "sha256": "0xn43gdn3rfys1d8ni3y6x7vxyc263qsbhfsjwc5x7pcd3dfrcjw",
"type": "tarball", "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/<owner>/<repo>/archive/<rev>.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
"version": "" "version": ""
}, },