From e32f5376a8d0bd151fbf61b508555705ea446a2e Mon Sep 17 00:00:00 2001
From: Dusk Banks <me@bb010g.com>
Date: Sun, 29 Oct 2023 16:07:04 -0700
Subject: [PATCH] style: ensure flake registry remains sorted

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 | 118 ++++++++++++++++++++++----------------------
 2 files changed, 64 insertions(+), 60 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",
@@ -378,34 +378,34 @@
     },
     {
       "from": {
-        "id": "systems",
+        "id": "sops-nix",
         "type": "indirect"
       },
       "to": {
-        "owner": "nix-systems",
-        "repo": "default",
+        "owner": "Mic92",
+        "repo": "sops-nix",
         "type": "github"
       }
     },
     {
       "from": {
-        "id": "helix",
+        "id": "systems",
         "type": "indirect"
       },
       "to": {
-        "owner": "helix-editor",
-        "repo": "helix",
+        "owner": "nix-systems",
+        "repo": "default",
         "type": "github"
       }
     },
     {
       "from": {
-        "id": "sops-nix",
+        "id": "templates",
         "type": "indirect"
       },
       "to": {
-        "owner": "Mic92",
-        "repo": "sops-nix",
+        "owner": "NixOS",
+        "repo": "templates",
         "type": "github"
       }
     }