From 9c69f7bd2363e71fe5cd7f608113290c7614dcdd Mon Sep 17 00:00:00 2001 From: bb010g Date: Mon, 15 Jan 2024 00:53:46 -0800 Subject: [PATCH 1/6] style: ensure flake registry remains sorted (#50) Additionally, ensure the latest contents of `flake-registry.json` are used when running `ci.sh`. Without `--tarball-ttl 0`, old contents can be reused across multiple runs. This shouldn't be an issue in CI, but it's helpful when running `ci.sh` manually, during development. --- ci.sh | 6 ++- flake-registry.json | 128 ++++++++++++++++++++++---------------------- 2 files changed, 69 insertions(+), 65 deletions(-) diff --git a/ci.sh b/ci.sh index 5fc54dc..f6a4ccb 100755 --- a/ci.sh +++ b/ci.sh @@ -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 diff --git a/flake-registry.json b/flake-registry.json index 1d02181..d83ace9 100644 --- a/flake-registry.json +++ b/flake-registry.json @@ -34,6 +34,17 @@ "type": "github" } }, + { + "from": { + "id": "bundlers", + "type": "indirect" + }, + "to": { + "owner": "NixOS", + "repo": "bundlers", + "type": "github" + } + }, { "from": { "id": "cachix", @@ -146,12 +157,12 @@ }, { "from": { - "id": "hercules-ci-effects", + "id": "helix", "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", @@ -199,6 +221,17 @@ "type": "github" } }, + { + "from": { + "id": "nickel", + "type": "indirect" + }, + "to": { + "owner": "tweag", + "repo": "nickel", + "type": "github" + } + }, { "from": { "id": "nimble", @@ -232,6 +265,17 @@ "type": "github" } }, + { + "from": { + "id": "nix-serve", + "type": "indirect" + }, + "to": { + "owner": "edolstra", + "repo": "nix-serve", + "type": "github" + } + }, { "from": { "id": "nixops", @@ -276,17 +320,6 @@ "type": "github" } }, - { - "from": { - "id": "nur", - "type": "indirect" - }, - "to": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, { "from": { "id": "nixpkgs", @@ -301,12 +334,12 @@ }, { "from": { - "id": "templates", + "id": "nur", "type": "indirect" }, "to": { - "owner": "NixOS", - "repo": "templates", + "owner": "nix-community", + "repo": "NUR", "type": "github" } }, @@ -332,39 +365,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 +376,17 @@ "type": "github" } }, + { + "from": { + "id": "sops-nix", + "type": "indirect" + }, + "to": { + "owner": "Mic92", + "repo": "sops-nix", + "type": "github" + } + }, { "from": { "id": "systems", @@ -389,23 +400,12 @@ }, { "from": { - "id": "helix", + "id": "templates", "type": "indirect" }, "to": { - "owner": "helix-editor", - "repo": "helix", - "type": "github" - } - }, - { - "from": { - "id": "sops-nix", - "type": "indirect" - }, - "to": { - "owner": "Mic92", - "repo": "sops-nix", + "owner": "NixOS", + "repo": "templates", "type": "github" } } From 3cbe1fbc2642c6c75c7371cb381b01f15d23ca6d Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Tue, 21 May 2024 09:54:15 +0200 Subject: [PATCH 2/6] Remove stale gemini flake --- flake-registry.json | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/flake-registry.json b/flake-registry.json index d83ace9..8e5d435 100644 --- a/flake-registry.json +++ b/flake-registry.json @@ -144,17 +144,6 @@ "type": "github" } }, - { - "from": { - "id": "gemini", - "type": "indirect" - }, - "to": { - "owner": "nix-community", - "repo": "flake-gemini", - "type": "github" - } - }, { "from": { "id": "helix", From ffa18e30e421152fe187ea03bbc7d35461df98d1 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Tue, 21 May 2024 09:54:27 +0200 Subject: [PATCH 3/6] Remove stale nimble flake --- flake-registry.json | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/flake-registry.json b/flake-registry.json index 8e5d435..4267917 100644 --- a/flake-registry.json +++ b/flake-registry.json @@ -221,17 +221,6 @@ "type": "github" } }, - { - "from": { - "id": "nimble", - "type": "indirect" - }, - "to": { - "owner": "nix-community", - "repo": "flake-nimble", - "type": "github" - } - }, { "from": { "id": "nix", From 2abd944ce3d63a618f9b3f0ee87dc9d87cb3b197 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Sat, 28 Sep 2024 17:20:11 +0700 Subject: [PATCH 4/6] Add nixos-anywhere --- flake-registry.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/flake-registry.json b/flake-registry.json index 4267917..946e94d 100644 --- a/flake-registry.json +++ b/flake-registry.json @@ -265,6 +265,17 @@ "type": "github" } }, + { + "from": { + "id": "nixos-anywhere", + "type": "indirect" + }, + "to": { + "owner": "nix-community", + "repo": "nixos-anywhere", + "type": "github" + } + }, { "from": { "id": "nixos-hardware", From 57beffaaa7f915b704a7d29cf4831cf45abbfc9f Mon Sep 17 00:00:00 2001 From: Kerstin Date: Tue, 11 Feb 2025 17:15:04 +0100 Subject: [PATCH 5/6] add ngipkgs --- flake-registry.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/flake-registry.json b/flake-registry.json index 946e94d..0b934f8 100644 --- a/flake-registry.json +++ b/flake-registry.json @@ -210,6 +210,17 @@ "type": "github" } }, + { + "from": { + "id": "ngipkgs", + "type": "indirect" + }, + "to": { + "owner": "ngi-nix", + "repo": "ngipkgs", + "type": "github" + } + }, { "from": { "id": "nickel", From ae201fc750c73e0ba87dd9d65196e0f916caa1f2 Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Fri, 11 Apr 2025 14:59:48 -0300 Subject: [PATCH 6/6] Update nix-darwin owner --- flake-registry.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake-registry.json b/flake-registry.json index 946e94d..0b771ba 100644 --- a/flake-registry.json +++ b/flake-registry.json @@ -238,7 +238,7 @@ "type": "indirect" }, "to": { - "owner": "LnL7", + "owner": "nix-darwin", "repo": "nix-darwin", "type": "github" }