From b141d4a90f1cab4f46bd9aa45e129a70d1e2423f Mon Sep 17 00:00:00 2001
From: Fiscal Velvet Poet <fiscalvelvetpoet@jfdic.org>
Date: Wed, 5 Apr 2023 15:55:44 +1000
Subject: [PATCH] ragenix: replaced agenix with ragenix

progresses #11
---
 flake.lock  | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 flake.nix   |  5 ++-
 outputs.nix |  4 +--
 shell.nix   |  4 +--
 4 files changed, 98 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index 7d0fd74..0a827df 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,17 +2,18 @@
   "nodes": {
     "agenix": {
       "inputs": {
-        "darwin": [],
+        "darwin": "darwin",
         "nixpkgs": [
+          "ragenix",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1680281360,
-        "narHash": "sha256-XdLTgAzjJNDhAG2V+++0bHpSzfvArvr2pW6omiFfEJk=",
+        "lastModified": 1677126346,
+        "narHash": "sha256-4s+PPGC1M07QsPyeye5drc2JLa1lhDnCV3XAsG8+pH4=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "e64961977f60388dd0b49572bb0fc453b871f896",
+        "rev": "c2a71c83c70844c5e31db69347e86af080bcdad0",
         "type": "github"
       },
       "original": {
@@ -43,6 +44,29 @@
         "type": "github"
       }
     },
+    "darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "ragenix",
+          "agenix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1673295039,
+        "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
+        "owner": "lnl7",
+        "repo": "nix-darwin",
+        "rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lnl7",
+        "ref": "master",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -59,6 +83,21 @@
         "type": "github"
       }
     },
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1676283394,
+        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "hakyll-skeleton": {
       "flake": false,
       "locked": {
@@ -210,6 +249,29 @@
         "type": "github"
       }
     },
+    "ragenix": {
+      "inputs": {
+        "agenix": "agenix",
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1677625082,
+        "narHash": "sha256-62xmRPfjZgDn8AgEhb6eRoJrTxGeM8HfhfF+PkJokok=",
+        "owner": "yaxitech",
+        "repo": "ragenix",
+        "rev": "6f2dacf3d6af36228a8fad3b136990a6b6dfe30b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "yaxitech",
+        "repo": "ragenix",
+        "type": "github"
+      }
+    },
     "resrok-web": {
       "flake": false,
       "locked": {
@@ -229,18 +291,43 @@
     },
     "root": {
       "inputs": {
-        "agenix": "agenix",
         "colmena": "colmena",
         "hakyll-skeleton": "hakyll-skeleton",
         "jfdic-web": "jfdic-web",
         "nix": "nix",
         "nixpkgs": "nixpkgs_3",
         "nixpkgsUnstable": "nixpkgsUnstable",
+        "ragenix": "ragenix",
         "resrok-web": "resrok-web",
         "utils": "utils_2",
         "voc-web": "voc-web"
       }
     },
+    "rust-overlay": {
+      "inputs": {
+        "flake-utils": [
+          "ragenix",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "ragenix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1676687290,
+        "narHash": "sha256-DP0CJ7qtUXf+mmMglJL1yANizzV1O4UfQ9NrKgy7O04=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "bdccd5e973d45159f7d13f7c65a4271dc02cf6d4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "stable": {
       "locked": {
         "lastModified": 1653087707,
diff --git a/flake.nix b/flake.nix
index b3e3744..93c4f10 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,10 +2,9 @@
   description = "jfdic-ops deployment";
 
   inputs = {
-    agenix = {
-      url = "github:ryantm/agenix";
+    ragenix = {
+      url = "github:yaxitech/ragenix";
       inputs.nixpkgs.follows = "nixpkgs";
-      inputs.darwin.follows = ""; # skip Darwin dependencies
     };
     hakyll-skeleton = {
       flake = false;
diff --git a/outputs.nix b/outputs.nix
index 1419a3e..621f4aa 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -2,7 +2,7 @@
   self,
   hakyll-skeleton,
   jfdic-web,
-  agenix,
+  ragenix,
   colmena,
   nix,
   nixpkgs,
@@ -18,7 +18,7 @@ in {
   devShell =
     pkgs.callPackage
     ./shell.nix {
-      inherit (agenix.packages."${pkgs.system}") agenix;
+      inherit (ragenix.packages."${pkgs.system}") ragenix;
       inherit (colmena.packages."${pkgs.system}") colmena;
       inherit (nix.packages."${pkgs.system}") nix;
       inherit (nixpkgsUnstable.legacyPackages."${pkgs.system}") alejandra;
diff --git a/shell.nix b/shell.nix
index c1e274f..15644ed 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,6 +1,6 @@
 {
   pkgs ? import <nixpkgs> {},
-  agenix,
+  ragenix,
   alejandra,
   mkShell,
   colmena,
@@ -9,7 +9,7 @@
 with pkgs;
   mkShell {
     buildInputs = [
-      agenix # CLI management of secrets encrypted via existing SSH keys
+      ragenix # CLI management of secrets encrypted via existing SSH keys
       alejandra # The Uncompromising Nix Code Formatter
       colmena # simple, stateless NixOS deployment tool
       nix # Powerful package manager, makes packaging reliable & reproducible