diff options
author | Franck Cuny <franck@fcuny.net> | 2023-07-05 11:11:17 -0700 |
---|---|---|
committer | Franck Cuny <franck@fcuny.net> | 2023-07-05 11:11:17 -0700 |
commit | d98ef0932d304e6d62988b5c661d71d92dec4305 (patch) | |
tree | ab4a8aaf9c184832083af80a561e371719ec5187 | |
parent | update nixos and home-manager to 23.05 (diff) | |
download | world-d98ef0932d304e6d62988b5c661d71d92dec4305.tar.gz |
add x509-info back to the list of tools
-rw-r--r-- | flake.lock | 194 | ||||
-rw-r--r-- | flake.nix | 4 | ||||
-rw-r--r-- | home/profiles/workstation.nix | 2 | ||||
-rw-r--r-- | nix/mkHomeManagerConfiguration.nix | 1 |
4 files changed, 196 insertions, 5 deletions
diff --git a/flake.lock b/flake.lock index 5c1d5dc..4068ee2 100644 --- a/flake.lock +++ b/flake.lock @@ -46,6 +46,30 @@ "type": "github" } }, + "crane_2": { + "inputs": { + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_5", + "nixpkgs": [ + "x509-tools", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_3" + }, + "locked": { + "lastModified": 1667522439, + "narHash": "sha256-1tDYoumL5337T4BkC87iRXbAfeyeeOXa5WAbeP/ENqQ=", + "owner": "ipetkov", + "repo": "crane", + "rev": "b70e77d2e2d480a3a0bce3ecd2d981679588b23f", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -120,6 +144,22 @@ "type": "github" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -186,6 +226,36 @@ "type": "github" } }, + "flake-utils_5": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "futils": { "inputs": { "systems": "systems_2" @@ -382,13 +452,28 @@ "type": "github" } }, + "nixpkgs_5": { + "locked": { + "lastModified": 1667877958, + "narHash": "sha256-InhzugdvWBvvR5/6hVDRngkSOeqjcw0SI9brZtY5y+g=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1d29ae3a66395506fd85655a8d74279ad4f9098f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "locked": { - "lastModified": 1688571065, - "narHash": "sha256-zHWAa7c4bBY0TS8vtT2/aIHxFQPi3u8niNSXLiJ/8Qk=", + "lastModified": 1688579144, + "narHash": "sha256-uNU+nIx3qP6AhYk8isu8esTrFoKSIwlhp1HaxFc8p2Q=", "owner": "nix-community", "repo": "NUR", - "rev": "5fa21967065f59569c821da4d92416a9f2e98d2f", + "rev": "de3e5795a3d67bff9bc7e16a45830bdf49755e99", "type": "github" }, "original": { @@ -451,6 +536,31 @@ "type": "github" } }, + "pre-commit-hooks_3": { + "inputs": { + "flake-utils": [ + "x509-tools", + "flake-utils" + ], + "nixpkgs": [ + "x509-tools", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1667760143, + "narHash": "sha256-+X5CyeNEKp41bY/I1AJgW/fn69q5cLJ1bgiaMMCKB3M=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "06f48d63d473516ce5b8abe70d15be96a0147fcd", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -463,7 +573,8 @@ "nur": "nur", "pre-commit-hooks": "pre-commit-hooks", "rust": "rust", - "sendsms": "sendsms" + "sendsms": "sendsms", + "x509-tools": "x509-tools" } }, "rust": { @@ -539,6 +650,58 @@ "type": "github" } }, + "rust-overlay_3": { + "inputs": { + "flake-utils": [ + "x509-tools", + "crane", + "flake-utils" + ], + "nixpkgs": [ + "x509-tools", + "crane", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1667487142, + "narHash": "sha256-bVuzLs1ZVggJAbJmEDVO9G6p8BH3HRaolK70KXvnWnU=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "cf668f737ac986c0a89e83b6b2e3c5ddbd8cf33b", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_4": { + "inputs": { + "flake-utils": [ + "x509-tools", + "flake-utils" + ], + "nixpkgs": [ + "x509-tools", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1667875464, + "narHash": "sha256-0rO2Pzn//ANT3AphpEUantCbm86XcmKNEKhM73LFr04=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "9235990723630e1a55e1ed6bca5954e4e31cfbd7", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "sendsms": { "inputs": { "crane": "crane", @@ -606,6 +769,29 @@ "repo": "default", "type": "github" } + }, + "x509-tools": { + "inputs": { + "crane": "crane_2", + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_5", + "pre-commit-hooks": "pre-commit-hooks_3", + "rust-overlay": "rust-overlay_4" + }, + "locked": { + "lastModified": 1668381652, + "narHash": "sha256-xdrF/ZOpq3lAxJgVtNapMSkTpDFB63V0ILJGrMQaEWI=", + "ref": "main", + "rev": "aed3af92f4e82124aa410feb352ff027b932b93c", + "revCount": 28, + "type": "git", + "url": "https://git.fcuny.net/fcuny/x509-info" + }, + "original": { + "ref": "main", + "type": "git", + "url": "https://git.fcuny.net/fcuny/x509-info" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 8b10f42..2ae5d62 100644 --- a/flake.nix +++ b/flake.nix @@ -42,6 +42,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + x509-tools = { + url = "git+https://git.fcuny.net/fcuny/x509-info?ref=main"; + }; + pre-commit-hooks = { type = "github"; owner = "cachix"; diff --git a/home/profiles/workstation.nix b/home/profiles/workstation.nix index 74c927f..cb895c6 100644 --- a/home/profiles/workstation.nix +++ b/home/profiles/workstation.nix @@ -64,7 +64,7 @@ in restic-nas # tools from external repositories - # x509-info + x509-info # gh-ssh-keys # masked-emails ]; diff --git a/nix/mkHomeManagerConfiguration.nix b/nix/mkHomeManagerConfiguration.nix index 38bc19f..61913c3 100644 --- a/nix/mkHomeManagerConfiguration.nix +++ b/nix/mkHomeManagerConfiguration.nix @@ -36,6 +36,7 @@ inputs.home-manager.lib.homeManagerConfiguration { inputs.nur.overlay inputs.naersk.overlay inputs.rust.overlays.default + inputs.x509-tools.overlay (final: prev: { tools = import "${self}/tools" { pkgs = prev; inherit naersk; }; |