Merge remote-tracking branch 'origin/master' into agenix

This commit is contained in:
Eelco Dolstra 2025-11-19 13:36:23 +01:00
commit 543fe09b7e
2 changed files with 95 additions and 91 deletions

6
ci.sh
View file

@ -1,7 +1,11 @@
#!/usr/bin/env bash
# Test that the flake-registry.json format is valid
# Test that the flake-registry.json format is sorted & valid
set -euo pipefail
cd "$(dirname "$0")"
# Ensure current flake-registry.json file is sorted.
nix registry list --tarball-ttl 0 --flake-registry "$PWD/flake-registry.json" \
| grep -- '^global ' | LC_ALL=C sort -u -c
nix run --flake-registry "$PWD/flake-registry.json" nixpkgs#hello

View file

@ -11,6 +11,17 @@
"type": "github"
}
},
{
"from": {
"id": "agenix",
"type": "indirect"
},
"to": {
"owner": "ryantm",
"repo": "agenix",
"type": "github"
}
},
{
"from": {
"id": "arion",
@ -34,6 +45,17 @@
"type": "github"
}
},
{
"from": {
"id": "bundlers",
"type": "indirect"
},
"to": {
"owner": "NixOS",
"repo": "bundlers",
"type": "github"
}
},
{
"from": {
"id": "cachix",
@ -135,23 +157,12 @@
},
{
"from": {
"id": "gemini",
"id": "helix",
"type": "indirect"
},
"to": {
"owner": "nix-community",
"repo": "flake-gemini",
"type": "github"
}
},
{
"from": {
"id": "hercules-ci-effects",
"type": "indirect"
},
"to": {
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"owner": "helix-editor",
"repo": "helix",
"type": "github"
}
},
@ -166,6 +177,17 @@
"type": "github"
}
},
{
"from": {
"id": "hercules-ci-effects",
"type": "indirect"
},
"to": {
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"type": "github"
}
},
{
"from": {
"id": "home-manager",
@ -201,12 +223,23 @@
},
{
"from": {
"id": "nimble",
"id": "ngipkgs",
"type": "indirect"
},
"to": {
"owner": "nix-community",
"repo": "flake-nimble",
"owner": "ngi-nix",
"repo": "ngipkgs",
"type": "github"
}
},
{
"from": {
"id": "nickel",
"type": "indirect"
},
"to": {
"owner": "tweag",
"repo": "nickel",
"type": "github"
}
},
@ -227,11 +260,22 @@
"type": "indirect"
},
"to": {
"owner": "LnL7",
"owner": "nix-darwin",
"repo": "nix-darwin",
"type": "github"
}
},
{
"from": {
"id": "nix-serve",
"type": "indirect"
},
"to": {
"owner": "edolstra",
"repo": "nix-serve",
"type": "github"
}
},
{
"from": {
"id": "nixops",
@ -243,6 +287,17 @@
"type": "github"
}
},
{
"from": {
"id": "nixos-anywhere",
"type": "indirect"
},
"to": {
"owner": "nix-community",
"repo": "nixos-anywhere",
"type": "github"
}
},
{
"from": {
"id": "nixos-hardware",
@ -276,17 +331,6 @@
"type": "github"
}
},
{
"from": {
"id": "nur",
"type": "indirect"
},
"to": {
"owner": "nix-community",
"repo": "NUR",
"type": "github"
}
},
{
"from": {
"id": "nixpkgs",
@ -301,12 +345,12 @@
},
{
"from": {
"id": "templates",
"id": "nur",
"type": "indirect"
},
"to": {
"owner": "NixOS",
"repo": "templates",
"owner": "nix-community",
"repo": "NUR",
"type": "github"
}
},
@ -332,39 +376,6 @@
"type": "github"
}
},
{
"from": {
"id": "nix-serve",
"type": "indirect"
},
"to": {
"owner": "edolstra",
"repo": "nix-serve",
"type": "github"
}
},
{
"from": {
"id": "nickel",
"type": "indirect"
},
"to": {
"owner": "tweag",
"repo": "nickel",
"type": "github"
}
},
{
"from": {
"id": "bundlers",
"type": "indirect"
},
"to": {
"owner": "NixOS",
"repo": "bundlers",
"type": "github"
}
},
{
"from": {
"id": "pridefetch",
@ -376,6 +387,17 @@
"type": "github"
}
},
{
"from": {
"id": "sops-nix",
"type": "indirect"
},
"to": {
"owner": "Mic92",
"repo": "sops-nix",
"type": "github"
}
},
{
"from": {
"id": "systems",
@ -389,34 +411,12 @@
},
{
"from": {
"id": "helix",
"id": "templates",
"type": "indirect"
},
"to": {
"owner": "helix-editor",
"repo": "helix",
"type": "github"
}
},
{
"from": {
"id": "agenix",
"type": "indirect"
},
"to": {
"owner": "ryantm",
"repo": "agenix",
"type": "github"
}
},
{
"from": {
"id": "sops-nix",
"type": "indirect"
},
"to": {
"owner": "Mic92",
"repo": "sops-nix",
"owner": "NixOS",
"repo": "templates",
"type": "github"
}
}