ragenix: replaced agenix with ragenix

progresses #11
This commit is contained in:
Fiscal Velvet Poet 2023-04-05 15:55:44 +10:00
parent ace344f27e
commit b141d4a90f
Signed by: fiscalvelvetpoet
GPG key ID: D8EBFD58B023BD47
4 changed files with 98 additions and 12 deletions

View file

@ -2,17 +2,18 @@
"nodes": { "nodes": {
"agenix": { "agenix": {
"inputs": { "inputs": {
"darwin": [], "darwin": "darwin",
"nixpkgs": [ "nixpkgs": [
"ragenix",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1680281360, "lastModified": 1677126346,
"narHash": "sha256-XdLTgAzjJNDhAG2V+++0bHpSzfvArvr2pW6omiFfEJk=", "narHash": "sha256-4s+PPGC1M07QsPyeye5drc2JLa1lhDnCV3XAsG8+pH4=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "e64961977f60388dd0b49572bb0fc453b871f896", "rev": "c2a71c83c70844c5e31db69347e86af080bcdad0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -43,6 +44,29 @@
"type": "github" "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-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -59,6 +83,21 @@
"type": "github" "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": { "hakyll-skeleton": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -210,6 +249,29 @@
"type": "github" "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": { "resrok-web": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -229,18 +291,43 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix",
"colmena": "colmena", "colmena": "colmena",
"hakyll-skeleton": "hakyll-skeleton", "hakyll-skeleton": "hakyll-skeleton",
"jfdic-web": "jfdic-web", "jfdic-web": "jfdic-web",
"nix": "nix", "nix": "nix",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"nixpkgsUnstable": "nixpkgsUnstable", "nixpkgsUnstable": "nixpkgsUnstable",
"ragenix": "ragenix",
"resrok-web": "resrok-web", "resrok-web": "resrok-web",
"utils": "utils_2", "utils": "utils_2",
"voc-web": "voc-web" "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": { "stable": {
"locked": { "locked": {
"lastModified": 1653087707, "lastModified": 1653087707,

View file

@ -2,10 +2,9 @@
description = "jfdic-ops deployment"; description = "jfdic-ops deployment";
inputs = { inputs = {
agenix = { ragenix = {
url = "github:ryantm/agenix"; url = "github:yaxitech/ragenix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.darwin.follows = ""; # skip Darwin dependencies
}; };
hakyll-skeleton = { hakyll-skeleton = {
flake = false; flake = false;

View file

@ -2,7 +2,7 @@
self, self,
hakyll-skeleton, hakyll-skeleton,
jfdic-web, jfdic-web,
agenix, ragenix,
colmena, colmena,
nix, nix,
nixpkgs, nixpkgs,
@ -18,7 +18,7 @@ in {
devShell = devShell =
pkgs.callPackage pkgs.callPackage
./shell.nix { ./shell.nix {
inherit (agenix.packages."${pkgs.system}") agenix; inherit (ragenix.packages."${pkgs.system}") ragenix;
inherit (colmena.packages."${pkgs.system}") colmena; inherit (colmena.packages."${pkgs.system}") colmena;
inherit (nix.packages."${pkgs.system}") nix; inherit (nix.packages."${pkgs.system}") nix;
inherit (nixpkgsUnstable.legacyPackages."${pkgs.system}") alejandra; inherit (nixpkgsUnstable.legacyPackages."${pkgs.system}") alejandra;

View file

@ -1,6 +1,6 @@
{ {
pkgs ? import <nixpkgs> {}, pkgs ? import <nixpkgs> {},
agenix, ragenix,
alejandra, alejandra,
mkShell, mkShell,
colmena, colmena,
@ -9,7 +9,7 @@
with pkgs; with pkgs;
mkShell { mkShell {
buildInputs = [ 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 alejandra # The Uncompromising Nix Code Formatter
colmena # simple, stateless NixOS deployment tool colmena # simple, stateless NixOS deployment tool
nix # Powerful package manager, makes packaging reliable & reproducible nix # Powerful package manager, makes packaging reliable & reproducible