From 8b89517325f26da224ca32212cc692dddb8ad63a Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Thu, 20 Jul 2023 13:48:15 +1000 Subject: [PATCH 01/47] nix: basic working flake --- .envrc | 2 + .gitignore | 1 - flake.lock | 148 ++++++++++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 12 +++++ outputs.nix | 20 +++++++ shell.nix | 14 +++++ 6 files changed, 196 insertions(+), 1 deletion(-) create mode 100644 .envrc create mode 100644 flake.lock create mode 100644 flake.nix create mode 100644 outputs.nix create mode 100644 shell.nix diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..005a801 --- /dev/null +++ b/.envrc @@ -0,0 +1,2 @@ +use flake +watch_file flake.nix diff --git a/.gitignore b/.gitignore index b1e513a..b30a22a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ *.swp .direnv -.envrc Deployments/syncserver.nix examples result diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..ba7fbd3 --- /dev/null +++ b/flake.lock @@ -0,0 +1,148 @@ +{ + "nodes": { + "lowdown-src": { + "flake": false, + "locked": { + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "type": "github" + }, + "original": { + "owner": "kristapsdz", + "repo": "lowdown", + "type": "github" + } + }, + "nix": { + "inputs": { + "lowdown-src": "lowdown-src", + "nixpkgs": "nixpkgs", + "nixpkgs-regression": "nixpkgs-regression" + }, + "locked": { + "lastModified": 1677045134, + "narHash": "sha256-jUc2ccTR8f6MGY2pUKgujm+lxSPNGm/ZAP+toX+nMNc=", + "owner": "NixOS", + "repo": "nix", + "rev": "4acc684ef7b3117c6d6ac12837398a0008a53d85", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "2.13.3", + "repo": "nix", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1670461440, + "narHash": "sha256-jy1LB8HOMKGJEGXgzFRLDU1CBGL0/LlkolgnqIsF0D8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "04a75b2eecc0acf6239acf9dd04485ff8d14f425", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.11-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-regression": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, + "nixpkgsUnstable": { + "locked": { + "lastModified": 1689679375, + "narHash": "sha256-LHUC52WvyVDi9PwyL1QCpaxYWBqp4ir4iL6zgOkmcb8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "684c17c429c42515bafb3ad775d2a710947f3d67", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1689680872, + "narHash": "sha256-brNix2+ihJSzCiKwLafbyejrHJZUP0Fy6z5+xMOC27M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "08700de174bc6235043cb4263b643b721d936bdb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nix": "nix", + "nixpkgs": "nixpkgs_2", + "nixpkgsUnstable": "nixpkgsUnstable", + "utils": "utils" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..0ad1d6d --- /dev/null +++ b/flake.nix @@ -0,0 +1,12 @@ +{ + description = "mio-ops deployment"; + + inputs = { + nix.url = "github:NixOS/nix/?ref=2.13.3"; + nixpkgs.url = github:NixOS/nixpkgs/?ref=nixos-23.05; + nixpkgsUnstable.url = github:NixOS/nixpkgs/?ref=nixos-unstable; + utils.url = "github:numtide/flake-utils"; + }; + + outputs = {...} @ args: import ./outputs.nix args; +} diff --git a/outputs.nix b/outputs.nix new file mode 100644 index 0000000..68c116c --- /dev/null +++ b/outputs.nix @@ -0,0 +1,20 @@ +{ + self, + nix, + nixpkgs, + nixpkgsUnstable, + utils, + ... +} @ inputs: +(utils.lib.eachDefaultSystem (system: let + pkgs = nixpkgs.legacyPackages."${system}"; +in { + devShell = + pkgs.callPackage + ./shell.nix { + inherit (nix.packages."${pkgs.system}") nix; + inherit (nixpkgsUnstable.legacyPackages."${pkgs.system}") alejandra; + }; +})) +// { +} diff --git a/shell.nix b/shell.nix new file mode 100644 index 0000000..8361334 --- /dev/null +++ b/shell.nix @@ -0,0 +1,14 @@ +{ + pkgs ? import {}, + mkShell, + nix, +}: +with pkgs; + mkShell { + buildInputs = [ + alejandra # The Uncompromising Nix Code Formatter + nix # Powerful package manager, makes packaging reliable & reproducible + tea # Gitea official CLI client + treefmt # one CLI to format the code tree + ]; + } From cda712cdf320952b74dfe1ebbaead62fda026e89 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Thu, 20 Jul 2023 20:57:19 +1000 Subject: [PATCH 02/47] nix: remove niv --- nix/sources.json | 107 ----------------------------------- nix/sources.nix | 141 ----------------------------------------------- 2 files changed, 248 deletions(-) delete mode 100644 nix/sources.json delete mode 100644 nix/sources.nix diff --git a/nix/sources.json b/nix/sources.json deleted file mode 100644 index de58cc7..0000000 --- a/nix/sources.json +++ /dev/null @@ -1,107 +0,0 @@ -{ - "cardano-node": { - "branch": "refs/tags/1.35.7", - "description": "The core component that is used to participate in a Cardano decentralised blockchain.", - "homepage": "https://cardano.org", - "owner": "input-output-hk", - "repo": "cardano-node", - "rev": "f0b4ac897dcbefba9fa0d247b204a24543cf55f6", - "sha256": "0s2jkj4mwl03hxg4ff9kyw41s32xbf31rnhag2m1qrglgsh8wzw9", - "type": "tarball", - "url": "https://github.com/input-output-hk/cardano-node/archive/f0b4ac897dcbefba9fa0d247b204a24543cf55f6.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "daedalus": { - "branch": "release/5.2.0", - "description": "The open source cryptocurrency wallet for ada, built to grow with the community", - "homepage": "https://daedaluswallet.io/", - "owner": "input-output-hk", - "repo": "daedalus", - "rev": "2990f5a44189097b3de2e7e7a19caa8062a8ae7b", - "sha256": "1w2w7qfashbqimcywzvhh0z5jrlfaja04sgi6p5hp08adwad6r92", - "type": "tarball", - "url": "https://github.com/input-output-hk/daedalus/archive/2990f5a44189097b3de2e7e7a19caa8062a8ae7b.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "iohk-nix": { - "branch": "master", - "description": "nix scripts shared across projects", - "homepage": null, - "owner": "input-output-hk", - "repo": "iohk-nix", - "rev": "df1da282f996ec46b33379407df99613a1fbafdd", - "sha256": "0vpcyrswxkynn2q37qsrhvf62whk2ijpcwqnamxcchcq6lwfpn0l", - "type": "tarball", - "url": "https://github.com/input-output-hk/iohk-nix/archive/df1da282f996ec46b33379407df99613a1fbafdd.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "mcwhirter-io": { - "branch": "nixos-23.11", - "rev": "2ca0244e2ff130ca851bb2487b03b606b701286a", - "sha256": "1alh4z2qpnh1wv3mclnmh8f3cqnks4h6hcrq1kwl5xz4xs2pc1ss", - "type": "tarball", - "url": "https://reciproka.dev/sercanto/mcwhirter.io/archive/2ca0244e2ff130ca851bb2487b03b606b701286a.tar.gz", - "url_template": "https://reciproka.dev/sercanto/mcwhirter.io/archive/.tar.gz" - }, - "niv": { - "branch": "master", - "description": "Easy dependency management for Nix projects", - "homepage": "https://github.com/nmattia/niv", - "owner": "nmattia", - "repo": "niv", - "rev": "82e5cd1ad3c387863f0545d7591512e76ab0fc41", - "sha256": "090l219mzc0gi33i3psgph6s2pwsc8qy4lyrqjdj4qzkvmaj65a7", - "type": "tarball", - "url": "https://github.com/nmattia/niv/archive/82e5cd1ad3c387863f0545d7591512e76ab0fc41.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "nixos-23.05": { - "branch": "nixos-23.05", - "description": "Nix Packages collection & NixOS", - "homepage": "", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", - "sha256": "05cbl1k193c9la9xhlz4y6y8ijpb2mkaqrab30zij6z4kqgclsrd", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/70bdadeb94ffc8806c0570eb5c2695ad29f0e421.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "nixos2111": { - "branch": "nixos-21.11", - "description": "Nix Packages collection", - "homepage": "", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "63198c9ccefdbd337cef0d85db0ea2689f4ce418", - "sha256": "05gc6xyv8a2dppngm1q44j85j769lr90lg20s6jv62gfg344i50r", - "type": "tarball", - "url": "https://github.com/nixos/nixpkgs/archive/63198c9ccefdbd337cef0d85db0ea2689f4ce418.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "nixpkgs": { - "branch": "nixos-24.05", - "builtin": false, - "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to", - "homepage": "https://github.com/NixOS/nixpkgs", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421", - "sha256": "1qwbrn2cb1x9clkhqmdnx5r8v11168p3nx14h3r9wcml0bgblpvr", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/6e99f2a27d600612004fbd2c3282d614bfee6421.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "nixpkgsUnstable": { - "branch": "nixos-unstable", - "description": "Nix Packages collection", - "homepage": "", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", - "sha256": "1dmng7f5rv4hgd0b61chqx589ra7jajsrzw21n8gp8makw5khvb2", - "type": "tarball", - "url": "https://github.com/nixos/nixpkgs/archive/12228ff1752d7b7624a54e9c1af4b222b3c1073b.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - } -} diff --git a/nix/sources.nix b/nix/sources.nix deleted file mode 100644 index fae06a4..0000000 --- a/nix/sources.nix +++ /dev/null @@ -1,141 +0,0 @@ -# This file has been generated by Niv. -let - # - # The fetchers. fetch_ fetches specs of type . - # - fetch_file = pkgs: spec: - if spec.builtin or true - then builtins_fetchurl {inherit (spec) url sha256;} - else pkgs.fetchurl {inherit (spec) url sha256;}; - - fetch_tarball = pkgs: spec: - if spec.builtin or true - then builtins_fetchTarball {inherit (spec) url sha256;} - else pkgs.fetchzip {inherit (spec) url sha256;}; - - fetch_git = spec: - builtins.fetchGit { - url = spec.repo; - inherit (spec) rev ref; - }; - - fetch_builtin-tarball = spec: - builtins.trace '' - WARNING: - The niv type "builtin-tarball" will soon be deprecated. You should - instead use `builtin = true`. - - $ niv modify -a type=tarball -a builtin=true - '' - builtins_fetchTarball {inherit (spec) url sha256;}; - - fetch_builtin-url = spec: - builtins.trace '' - WARNING: - The niv type "builtin-url" will soon be deprecated. You should - instead use `builtin = true`. - - $ niv modify -a type=file -a builtin=true - '' (builtins_fetchurl {inherit (spec) url sha256;}); - - # - # Various helpers - # - - # The set of packages used when specs are fetched using non-builtins. - mkPkgs = sources: let - sourcesNixpkgs = - import (builtins_fetchTarball {inherit (sources.nixpkgs) url sha256;}) - {}; - hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath; - hasThisAsNixpkgsPath = == ./.; - in - if builtins.hasAttr "nixpkgs" sources - then sourcesNixpkgs - else if hasNixpkgsPath && !hasThisAsNixpkgsPath - then import {} - else - abort '' - Please specify either (through -I or NIX_PATH=nixpkgs=...) or - add a package called "nixpkgs" to your sources.json. - ''; - - # The actual fetching function. - fetch = pkgs: name: spec: - if !builtins.hasAttr "type" spec - then abort "ERROR: niv spec ${name} does not have a 'type' attribute" - else if spec.type == "file" - then fetch_file pkgs spec - else if spec.type == "tarball" - then fetch_tarball pkgs spec - else if spec.type == "git" - then fetch_git spec - else if spec.type == "builtin-tarball" - then fetch_builtin-tarball spec - else if spec.type == "builtin-url" - then fetch_builtin-url spec - else - abort - "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}"; - - # Ports of functions for older nix versions - - # a Nix version of mapAttrs if the built-in doesn't exist - mapAttrs = - builtins.mapAttrs - or (f: set: - with builtins; - listToAttrs (map (attr: { - name = attr; - value = f attr set.${attr}; - }) (attrNames set))); - - # fetchTarball version that is compatible between all the versions of Nix - builtins_fetchTarball = { - url, - sha256, - } @ attrs: let - inherit (builtins) lessThan nixVersion fetchTarball; - in - if lessThan nixVersion "1.12" - then fetchTarball {inherit url;} - else fetchTarball attrs; - - # fetchurl version that is compatible between all the versions of Nix - builtins_fetchurl = { - url, - sha256, - } @ attrs: let - inherit (builtins) lessThan nixVersion fetchurl; - in - if lessThan nixVersion "1.12" - then fetchurl {inherit url;} - else fetchurl attrs; - - # Create the final "sources" from the config - mkSources = config: - mapAttrs (name: spec: - if builtins.hasAttr "outPath" spec - then - abort - "The values in sources.json should not have an 'outPath' attribute" - else spec // {outPath = fetch config.pkgs name spec;}) - config.sources; - - # The "config" used by the fetchers - mkConfig = { - sourcesFile ? ./sources.json, - sources ? builtins.fromJSON (builtins.readFile sourcesFile), - pkgs ? mkPkgs sources, - }: rec { - # The sources, i.e. the attribute set of spec name to spec - inherit sources; - - # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers - inherit pkgs; - }; -in - mkSources (mkConfig {}) - // { - __functor = _: settings: mkSources (mkConfig settings); - } From 7d2188e298bfa49efc8095702e61842b9647b8cf Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Thu, 3 Aug 2023 21:06:32 +1000 Subject: [PATCH 03/47] shell: fixed alejandra --- shell.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/shell.nix b/shell.nix index 8361334..31f04ef 100644 --- a/shell.nix +++ b/shell.nix @@ -1,6 +1,7 @@ { pkgs ? import {}, mkShell, + alejandra, nix, }: with pkgs; From 623bbcca575f4eb20a549ff9961f3cec0275f472 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Thu, 3 Aug 2023 21:18:05 +1000 Subject: [PATCH 04/47] daedalus: converted to flake --- flake.lock | 481 +++++++++++++++++++++++++++++++++++++++++- flake.nix | 1 + outputs.nix | 1 + profiles/daedalus.nix | 4 +- 4 files changed, 478 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index ba7fbd3..a16897c 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,182 @@ { "nodes": { + "blank": { + "locked": { + "lastModified": 1625557891, + "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", + "owner": "divnix", + "repo": "blank", + "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "blank", + "type": "github" + } + }, + "daedalus": { + "inputs": { + "nixpkgs": [ + "daedalus", + "tullia", + "nixpkgs" + ], + "tullia": "tullia" + }, + "locked": { + "lastModified": 1673276601, + "narHash": "sha256-ImXTFG8KgQvLNfFpApRUjmZZPoBwf+5ZjXhBrRw+XPA=", + "owner": "input-output-hk", + "repo": "daedalus", + "rev": "2990f5a44189097b3de2e7e7a19caa8062a8ae7b", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "5.2.0", + "repo": "daedalus", + "type": "github" + } + }, + "devshell": { + "inputs": { + "flake-utils": [ + "daedalus", + "tullia", + "std", + "flake-utils" + ], + "nixpkgs": [ + "daedalus", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1663445644, + "narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=", + "owner": "numtide", + "repo": "devshell", + "rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "dmerge": { + "inputs": { + "nixlib": [ + "daedalus", + "tullia", + "std", + "nixpkgs" + ], + "yants": [ + "daedalus", + "tullia", + "std", + "yants" + ] + }, + "locked": { + "lastModified": 1659548052, + "narHash": "sha256-fzI2gp1skGA8mQo/FBFrUAtY0GQkAIAaV/V127TJPyY=", + "owner": "divnix", + "repo": "data-merge", + "rev": "d160d18ce7b1a45b88344aa3f13ed1163954b497", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "data-merge", + "type": "github" + } + }, + "flake-compat": { + "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": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "gomod2nix": { + "inputs": { + "nixpkgs": "nixpkgs", + "utils": "utils" + }, + "locked": { + "lastModified": 1655245309, + "narHash": "sha256-d/YPoQ/vFn1+GTmSdvbSBSTOai61FONxB4+Lt6w/IVI=", + "owner": "tweag", + "repo": "gomod2nix", + "rev": "40d32f82fc60d66402eb0972e6e368aeab3faf58", + "type": "github" + }, + "original": { + "owner": "tweag", + "repo": "gomod2nix", + "type": "github" + } + }, "lowdown-src": { "flake": false, "locked": { @@ -16,10 +193,50 @@ "type": "github" } }, + "mdbook-kroki-preprocessor": { + "flake": false, + "locked": { + "lastModified": 1661755005, + "narHash": "sha256-1TJuUzfyMycWlOQH67LR63/ll2GDZz25I3JfScy/Jnw=", + "owner": "JoelCourtney", + "repo": "mdbook-kroki-preprocessor", + "rev": "93adb5716d035829efed27f65f2f0833a7d3e76f", + "type": "github" + }, + "original": { + "owner": "JoelCourtney", + "repo": "mdbook-kroki-preprocessor", + "type": "github" + } + }, + "n2c": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": [ + "daedalus", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1665039323, + "narHash": "sha256-SAh3ZjFGsaCI8FRzXQyp56qcGdAqgKEfJWPCQ0Sr7tQ=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "b008fe329ffb59b67bf9e7b08ede6ee792f2741a", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, "nix": { "inputs": { "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_5", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { @@ -37,18 +254,107 @@ "type": "github" } }, + "nix-nomad": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": [ + "daedalus", + "tullia", + "nix2container", + "flake-utils" + ], + "gomod2nix": "gomod2nix", + "nixpkgs": [ + "daedalus", + "tullia", + "nixpkgs" + ], + "nixpkgs-lib": [ + "daedalus", + "tullia", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1658277770, + "narHash": "sha256-T/PgG3wUn8Z2rnzfxf2VqlR1CBjInPE0l1yVzXxPnt0=", + "owner": "tristanpemble", + "repo": "nix-nomad", + "rev": "054adcbdd0a836ae1c20951b67ed549131fd2d70", + "type": "github" + }, + "original": { + "owner": "tristanpemble", + "repo": "nix-nomad", + "type": "github" + } + }, + "nix2container": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1658567952, + "narHash": "sha256-XZ4ETYAMU7XcpEeAFP3NOl9yDXNuZAen/aIJ84G+VgA=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "60bb43d405991c1378baf15a40b5811a53e32ffa", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, + "nixago": { + "inputs": { + "flake-utils": [ + "daedalus", + "tullia", + "std", + "flake-utils" + ], + "nixago-exts": [ + "daedalus", + "tullia", + "std", + "blank" + ], + "nixpkgs": [ + "daedalus", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1661824785, + "narHash": "sha256-/PnwdWoO/JugJZHtDUioQp3uRiWeXHUdgvoyNbXesz8=", + "owner": "nix-community", + "repo": "nixago", + "rev": "8c1f9e5f1578d4b2ea989f618588d62a335083c3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixago", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1670461440, - "narHash": "sha256-jy1LB8HOMKGJEGXgzFRLDU1CBGL0/LlkolgnqIsF0D8=", + "lastModified": 1653581809, + "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "04a75b2eecc0acf6239acf9dd04485ff8d14f425", + "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11-small", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -86,6 +392,69 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1654807842, + "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1653920503, + "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "a634c8f6c1fbf9b9730e01764999666f3436f10a", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-22.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1665087388, + "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1670461440, + "narHash": "sha256-jy1LB8HOMKGJEGXgzFRLDU1CBGL0/LlkolgnqIsF0D8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "04a75b2eecc0acf6239acf9dd04485ff8d14f425", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.11-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1689680872, "narHash": "sha256-brNix2+ihJSzCiKwLafbyejrHJZUP0Fy6z5+xMOC27M=", @@ -103,10 +472,49 @@ }, "root": { "inputs": { + "daedalus": "daedalus", "nix": "nix", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_6", "nixpkgsUnstable": "nixpkgsUnstable", - "utils": "utils" + "utils": "utils_2" + } + }, + "std": { + "inputs": { + "blank": "blank", + "devshell": "devshell", + "dmerge": "dmerge", + "flake-utils": "flake-utils_2", + "makes": [ + "daedalus", + "tullia", + "std", + "blank" + ], + "mdbook-kroki-preprocessor": "mdbook-kroki-preprocessor", + "microvm": [ + "daedalus", + "tullia", + "std", + "blank" + ], + "n2c": "n2c", + "nixago": "nixago", + "nixpkgs": "nixpkgs_4", + "yants": "yants" + }, + "locked": { + "lastModified": 1665513321, + "narHash": "sha256-D6Pacw9yf/HMs84KYuCxHXnNDL7v43gtcka5URagFqE=", + "owner": "divnix", + "repo": "std", + "rev": "94a90eedb9cfc115b12ae8f6622d9904788559e4", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "std", + "type": "github" } }, "systems": { @@ -124,7 +532,43 @@ "type": "github" } }, + "tullia": { + "inputs": { + "nix-nomad": "nix-nomad", + "nix2container": "nix2container", + "nixpkgs": "nixpkgs_3", + "std": "std" + }, + "locked": { + "lastModified": 1668711738, + "narHash": "sha256-CBjky16o9pqsGE1bWu6nRlRajgSXMEk+yaFQLibqXcE=", + "owner": "input-output-hk", + "repo": "tullia", + "rev": "ead1f515c251f0e060060ef0e2356a51d3dfe4b0", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "tullia", + "type": "github" + } + }, "utils": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_2": { "inputs": { "systems": "systems" }, @@ -141,6 +585,29 @@ "repo": "flake-utils", "type": "github" } + }, + "yants": { + "inputs": { + "nixpkgs": [ + "daedalus", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660507851, + "narHash": "sha256-BKjq7JnVuUR/xDtcv6Vm9GYGKAblisXrAgybor9hT/s=", + "owner": "divnix", + "repo": "yants", + "rev": "0b895ca02a8fa72bad50b454cb3e7d8a66407c96", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "yants", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 0ad1d6d..94f1bc7 100644 --- a/flake.nix +++ b/flake.nix @@ -2,6 +2,7 @@ description = "mio-ops deployment"; inputs = { + daedalus.url = "github:input-output-hk/daedalus/?ref=5.2.0"; nix.url = "github:NixOS/nix/?ref=2.13.3"; nixpkgs.url = github:NixOS/nixpkgs/?ref=nixos-23.05; nixpkgsUnstable.url = github:NixOS/nixpkgs/?ref=nixos-unstable; diff --git a/outputs.nix b/outputs.nix index 68c116c..0157017 100644 --- a/outputs.nix +++ b/outputs.nix @@ -1,5 +1,6 @@ { self, + daedalus, nix, nixpkgs, nixpkgsUnstable, diff --git a/profiles/daedalus.nix b/profiles/daedalus.nix index 56d209e..5878066 100644 --- a/profiles/daedalus.nix +++ b/profiles/daedalus.nix @@ -2,11 +2,11 @@ { config, pkgs, + daedalus, lib, ... }: let - sources = import ../nix/sources.nix; - daedalusProject = import sources.daedalus {}; + daedalusProject = import daedalus.daedalus {}; daedalusMainnet = daedalusProject.daedalus; #daedalusFlight = daedalusProject.daedalus {--argstr cluster mainnet_flight -o daedalusFlight}; in { From a782c104bf7a8cb200e1b2a1b67387d20a7fb78f Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Thu, 3 Aug 2023 21:29:09 +1000 Subject: [PATCH 05/47] cardano-node: converted to flake --- flake.lock | 6121 ++++++++++++++++++++++++++++++++++++- flake.nix | 2 + profiles/cardano-node.nix | 10 +- 3 files changed, 6071 insertions(+), 62 deletions(-) diff --git a/flake.lock b/flake.lock index a16897c..47d0ce8 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,135 @@ { "nodes": { + "CHaP": { + "flake": false, + "locked": { + "lastModified": 1679700859, + "narHash": "sha256-64JxqIahZtC9y8u6mKdbYHFBF8rNUtpa+iSHkqjCrnQ=", + "owner": "input-output-hk", + "repo": "cardano-haskell-packages", + "rev": "9b4110ed6d295014d29c307f93d4865443958370", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "repo", + "repo": "cardano-haskell-packages", + "type": "github" + } + }, + "CHaP_2": { + "flake": false, + "locked": { + "lastModified": 1679650731, + "narHash": "sha256-KpH4VFrHHRWAG3ZAuSck62GN3ffoP7fbQ7R3AZ3L/hU=", + "owner": "input-output-hk", + "repo": "cardano-haskell-packages", + "rev": "c9755b5bb60318fc914139118ed6386d81555755", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "repo", + "repo": "cardano-haskell-packages", + "type": "github" + } + }, + "HTTP": { + "flake": false, + "locked": { + "lastModified": 1451647621, + "narHash": "sha256-oHIyw3x0iKBexEo49YeUDV1k74ZtyYKGR2gNJXXRxts=", + "owner": "phadej", + "repo": "HTTP", + "rev": "9bc0996d412fef1787449d841277ef663ad9a915", + "type": "github" + }, + "original": { + "owner": "phadej", + "repo": "HTTP", + "type": "github" + } + }, + "HTTP_2": { + "flake": false, + "locked": { + "lastModified": 1451647621, + "narHash": "sha256-oHIyw3x0iKBexEo49YeUDV1k74ZtyYKGR2gNJXXRxts=", + "owner": "phadej", + "repo": "HTTP", + "rev": "9bc0996d412fef1787449d841277ef663ad9a915", + "type": "github" + }, + "original": { + "owner": "phadej", + "repo": "HTTP", + "type": "github" + } + }, + "HTTP_3": { + "flake": false, + "locked": { + "lastModified": 1451647621, + "narHash": "sha256-oHIyw3x0iKBexEo49YeUDV1k74ZtyYKGR2gNJXXRxts=", + "owner": "phadej", + "repo": "HTTP", + "rev": "9bc0996d412fef1787449d841277ef663ad9a915", + "type": "github" + }, + "original": { + "owner": "phadej", + "repo": "HTTP", + "type": "github" + } + }, + "HTTP_4": { + "flake": false, + "locked": { + "lastModified": 1451647621, + "narHash": "sha256-oHIyw3x0iKBexEo49YeUDV1k74ZtyYKGR2gNJXXRxts=", + "owner": "phadej", + "repo": "HTTP", + "rev": "9bc0996d412fef1787449d841277ef663ad9a915", + "type": "github" + }, + "original": { + "owner": "phadej", + "repo": "HTTP", + "type": "github" + } + }, + "HTTP_5": { + "flake": false, + "locked": { + "lastModified": 1451647621, + "narHash": "sha256-oHIyw3x0iKBexEo49YeUDV1k74ZtyYKGR2gNJXXRxts=", + "owner": "phadej", + "repo": "HTTP", + "rev": "9bc0996d412fef1787449d841277ef663ad9a915", + "type": "github" + }, + "original": { + "owner": "phadej", + "repo": "HTTP", + "type": "github" + } + }, + "HTTP_6": { + "flake": false, + "locked": { + "lastModified": 1451647621, + "narHash": "sha256-oHIyw3x0iKBexEo49YeUDV1k74ZtyYKGR2gNJXXRxts=", + "owner": "phadej", + "repo": "HTTP", + "rev": "9bc0996d412fef1787449d841277ef663ad9a915", + "type": "github" + }, + "original": { + "owner": "phadej", + "repo": "HTTP", + "type": "github" + } + }, "blank": { "locked": { "lastModified": 1625557891, @@ -15,6 +145,736 @@ "type": "github" } }, + "blank_2": { + "locked": { + "lastModified": 1625557891, + "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", + "owner": "divnix", + "repo": "blank", + "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "blank", + "type": "github" + } + }, + "blank_3": { + "locked": { + "lastModified": 1625557891, + "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", + "owner": "divnix", + "repo": "blank", + "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "blank", + "type": "github" + } + }, + "blank_4": { + "locked": { + "lastModified": 1625557891, + "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", + "owner": "divnix", + "repo": "blank", + "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "blank", + "type": "github" + } + }, + "blank_5": { + "locked": { + "lastModified": 1625557891, + "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", + "owner": "divnix", + "repo": "blank", + "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "blank", + "type": "github" + } + }, + "blank_6": { + "locked": { + "lastModified": 1625557891, + "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", + "owner": "divnix", + "repo": "blank", + "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "blank", + "type": "github" + } + }, + "blank_7": { + "locked": { + "lastModified": 1625557891, + "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", + "owner": "divnix", + "repo": "blank", + "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "blank", + "type": "github" + } + }, + "cabal-32": { + "flake": false, + "locked": { + "lastModified": 1603716527, + "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=", + "owner": "haskell", + "repo": "cabal", + "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.2", + "repo": "cabal", + "type": "github" + } + }, + "cabal-32_2": { + "flake": false, + "locked": { + "lastModified": 1603716527, + "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=", + "owner": "haskell", + "repo": "cabal", + "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.2", + "repo": "cabal", + "type": "github" + } + }, + "cabal-32_3": { + "flake": false, + "locked": { + "lastModified": 1603716527, + "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=", + "owner": "haskell", + "repo": "cabal", + "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.2", + "repo": "cabal", + "type": "github" + } + }, + "cabal-32_4": { + "flake": false, + "locked": { + "lastModified": 1603716527, + "narHash": "sha256-sDbrmur9Zfp4mPKohCD8IDZfXJ0Tjxpmr2R+kg5PpSY=", + "owner": "haskell", + "repo": "cabal", + "rev": "94aaa8e4720081f9c75497e2735b90f6a819b08e", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.2", + "repo": "cabal", + "type": "github" + } + }, + "cabal-32_5": { + "flake": false, + "locked": { + "lastModified": 1603716527, + "narHash": "sha256-sDbrmur9Zfp4mPKohCD8IDZfXJ0Tjxpmr2R+kg5PpSY=", + "owner": "haskell", + "repo": "cabal", + "rev": "94aaa8e4720081f9c75497e2735b90f6a819b08e", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.2", + "repo": "cabal", + "type": "github" + } + }, + "cabal-32_6": { + "flake": false, + "locked": { + "lastModified": 1603716527, + "narHash": "sha256-sDbrmur9Zfp4mPKohCD8IDZfXJ0Tjxpmr2R+kg5PpSY=", + "owner": "haskell", + "repo": "cabal", + "rev": "94aaa8e4720081f9c75497e2735b90f6a819b08e", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.2", + "repo": "cabal", + "type": "github" + } + }, + "cabal-34": { + "flake": false, + "locked": { + "lastModified": 1645834128, + "narHash": "sha256-wG3d+dOt14z8+ydz4SL7pwGfe7SiimxcD/LOuPCV6xM=", + "owner": "haskell", + "repo": "cabal", + "rev": "5ff598c67f53f7c4f48e31d722ba37172230c462", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.4", + "repo": "cabal", + "type": "github" + } + }, + "cabal-34_2": { + "flake": false, + "locked": { + "lastModified": 1640353650, + "narHash": "sha256-N1t6M3/wqj90AEdRkeC8i923gQYUpzSr8b40qVOZ1Rk=", + "owner": "haskell", + "repo": "cabal", + "rev": "942639c18c0cd8ec53e0a6f8d120091af35312cd", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.4", + "repo": "cabal", + "type": "github" + } + }, + "cabal-34_3": { + "flake": false, + "locked": { + "lastModified": 1645834128, + "narHash": "sha256-wG3d+dOt14z8+ydz4SL7pwGfe7SiimxcD/LOuPCV6xM=", + "owner": "haskell", + "repo": "cabal", + "rev": "5ff598c67f53f7c4f48e31d722ba37172230c462", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.4", + "repo": "cabal", + "type": "github" + } + }, + "cabal-34_4": { + "flake": false, + "locked": { + "lastModified": 1622475795, + "narHash": "sha256-chwTL304Cav+7p38d9mcb+egABWmxo2Aq+xgVBgEb/U=", + "owner": "haskell", + "repo": "cabal", + "rev": "b086c1995cdd616fc8d91f46a21e905cc50a1049", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.4", + "repo": "cabal", + "type": "github" + } + }, + "cabal-34_5": { + "flake": false, + "locked": { + "lastModified": 1622475795, + "narHash": "sha256-chwTL304Cav+7p38d9mcb+egABWmxo2Aq+xgVBgEb/U=", + "owner": "haskell", + "repo": "cabal", + "rev": "b086c1995cdd616fc8d91f46a21e905cc50a1049", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.4", + "repo": "cabal", + "type": "github" + } + }, + "cabal-34_6": { + "flake": false, + "locked": { + "lastModified": 1622475795, + "narHash": "sha256-chwTL304Cav+7p38d9mcb+egABWmxo2Aq+xgVBgEb/U=", + "owner": "haskell", + "repo": "cabal", + "rev": "b086c1995cdd616fc8d91f46a21e905cc50a1049", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.4", + "repo": "cabal", + "type": "github" + } + }, + "cabal-36": { + "flake": false, + "locked": { + "lastModified": 1669081697, + "narHash": "sha256-I5or+V7LZvMxfbYgZATU4awzkicBwwok4mVoje+sGmU=", + "owner": "haskell", + "repo": "cabal", + "rev": "8fd619e33d34924a94e691c5fea2c42f0fc7f144", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.6", + "repo": "cabal", + "type": "github" + } + }, + "cabal-36_2": { + "flake": false, + "locked": { + "lastModified": 1641652457, + "narHash": "sha256-BlFPKP4C4HRUJeAbdembX1Rms1LD380q9s0qVDeoAak=", + "owner": "haskell", + "repo": "cabal", + "rev": "f27667f8ec360c475027dcaee0138c937477b070", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.6", + "repo": "cabal", + "type": "github" + } + }, + "cabal-36_3": { + "flake": false, + "locked": { + "lastModified": 1669081697, + "narHash": "sha256-I5or+V7LZvMxfbYgZATU4awzkicBwwok4mVoje+sGmU=", + "owner": "haskell", + "repo": "cabal", + "rev": "8fd619e33d34924a94e691c5fea2c42f0fc7f144", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.6", + "repo": "cabal", + "type": "github" + } + }, + "cabal-36_4": { + "flake": false, + "locked": { + "lastModified": 1640163203, + "narHash": "sha256-TwDWP2CffT0j40W6zr0J1Qbu+oh3nsF1lUx9446qxZM=", + "owner": "haskell", + "repo": "cabal", + "rev": "ecf418050c1821f25e2e218f1be94c31e0465df1", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.6", + "repo": "cabal", + "type": "github" + } + }, + "cabal-36_5": { + "flake": false, + "locked": { + "lastModified": 1640163203, + "narHash": "sha256-TwDWP2CffT0j40W6zr0J1Qbu+oh3nsF1lUx9446qxZM=", + "owner": "haskell", + "repo": "cabal", + "rev": "ecf418050c1821f25e2e218f1be94c31e0465df1", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.6", + "repo": "cabal", + "type": "github" + } + }, + "cardano-automation": { + "inputs": { + "flake-utils": "flake-utils_4", + "haskellNix": "haskellNix_2", + "nixpkgs": [ + "cardano-node", + "node-measured", + "cardano-automation", + "haskellNix", + "nixpkgs-unstable" + ], + "tullia": "tullia_3" + }, + "locked": { + "lastModified": 1674567399, + "narHash": "sha256-Oh0i63+nmB4JxuHDFD54Ry/ORoY2FqxrSi+HSAwSdbA=", + "owner": "input-output-hk", + "repo": "cardano-automation", + "rev": "24fbdeabe90d33aff1fb83bc39d53250f0ff34f6", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "cardano-automation", + "type": "github" + } + }, + "cardano-mainnet-mirror": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1642701714, + "narHash": "sha256-SR3luE+ePX6U193EKE/KSEuVzWAW0YsyPYDC4hOvALs=", + "owner": "input-output-hk", + "repo": "cardano-mainnet-mirror", + "rev": "819488be9eabbba6aaa7c931559bc584d8071e3d", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "nix", + "repo": "cardano-mainnet-mirror", + "type": "github" + } + }, + "cardano-mainnet-mirror_2": { + "inputs": { + "nixpkgs": "nixpkgs_13" + }, + "locked": { + "lastModified": 1642701714, + "narHash": "sha256-SR3luE+ePX6U193EKE/KSEuVzWAW0YsyPYDC4hOvALs=", + "owner": "input-output-hk", + "repo": "cardano-mainnet-mirror", + "rev": "819488be9eabbba6aaa7c931559bc584d8071e3d", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "nix", + "repo": "cardano-mainnet-mirror", + "type": "github" + } + }, + "cardano-mainnet-mirror_3": { + "inputs": { + "nixpkgs": "nixpkgs_23" + }, + "locked": { + "lastModified": 1642701714, + "narHash": "sha256-SR3luE+ePX6U193EKE/KSEuVzWAW0YsyPYDC4hOvALs=", + "owner": "input-output-hk", + "repo": "cardano-mainnet-mirror", + "rev": "819488be9eabbba6aaa7c931559bc584d8071e3d", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "nix", + "repo": "cardano-mainnet-mirror", + "type": "github" + } + }, + "cardano-mainnet-mirror_4": { + "inputs": { + "nixpkgs": "nixpkgs_24" + }, + "locked": { + "lastModified": 1642701714, + "narHash": "sha256-SR3luE+ePX6U193EKE/KSEuVzWAW0YsyPYDC4hOvALs=", + "owner": "input-output-hk", + "repo": "cardano-mainnet-mirror", + "rev": "819488be9eabbba6aaa7c931559bc584d8071e3d", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "nix", + "repo": "cardano-mainnet-mirror", + "type": "github" + } + }, + "cardano-node": { + "inputs": { + "CHaP": "CHaP", + "cardano-mainnet-mirror": "cardano-mainnet-mirror", + "customConfig": "customConfig", + "flake-compat": "flake-compat", + "hackageNix": "hackageNix", + "haskellNix": "haskellNix", + "hostNixpkgs": [ + "cardano-node", + "nixpkgs" + ], + "iohkNix": "iohkNix", + "nixTools": "nixTools", + "nixpkgs": [ + "cardano-node", + "haskellNix", + "nixpkgs-unstable" + ], + "node-measured": "node-measured", + "node-process": "node-process", + "node-snapshot": "node-snapshot", + "plutus-apps": "plutus-apps_2", + "std": [ + "cardano-node", + "tullia", + "std" + ], + "tullia": "tullia_6", + "utils": "utils_11" + }, + "locked": { + "lastModified": 1680029210, + "narHash": "sha256-iX+OoH70ZRyqeAraHIZbXQwdCPczOUdehwNQXomcUmg=", + "owner": "input-output-hk", + "repo": "cardano-node", + "rev": "f0b4ac897dcbefba9fa0d247b204a24543cf55f6", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "1.35.7", + "repo": "cardano-node", + "type": "github" + } + }, + "cardano-node-snapshot": { + "inputs": { + "customConfig": "customConfig_4", + "haskellNix": "haskellNix_5", + "iohkNix": "iohkNix_4", + "membench": "membench_2", + "nixpkgs": [ + "cardano-node", + "node-snapshot", + "membench", + "cardano-node-snapshot", + "haskellNix", + "nixpkgs-2105" + ], + "utils": "utils_7" + }, + "locked": { + "lastModified": 1644954571, + "narHash": "sha256-c6MM1mQoS/AnTIrwaRmITK4L4i9lLNtkjOUHiseBtUs=", + "owner": "input-output-hk", + "repo": "cardano-node", + "rev": "30d62b86e7b98da28ef8ad9412e4e00a1ba1231d", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "cardano-node", + "rev": "30d62b86e7b98da28ef8ad9412e4e00a1ba1231d", + "type": "github" + } + }, + "cardano-shell": { + "flake": false, + "locked": { + "lastModified": 1608537748, + "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", + "owner": "input-output-hk", + "repo": "cardano-shell", + "rev": "9392c75087cb9a3d453998f4230930dea3a95725", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "cardano-shell", + "type": "github" + } + }, + "cardano-shell_2": { + "flake": false, + "locked": { + "lastModified": 1608537748, + "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", + "owner": "input-output-hk", + "repo": "cardano-shell", + "rev": "9392c75087cb9a3d453998f4230930dea3a95725", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "cardano-shell", + "type": "github" + } + }, + "cardano-shell_3": { + "flake": false, + "locked": { + "lastModified": 1608537748, + "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", + "owner": "input-output-hk", + "repo": "cardano-shell", + "rev": "9392c75087cb9a3d453998f4230930dea3a95725", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "cardano-shell", + "type": "github" + } + }, + "cardano-shell_4": { + "flake": false, + "locked": { + "lastModified": 1608537748, + "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", + "owner": "input-output-hk", + "repo": "cardano-shell", + "rev": "9392c75087cb9a3d453998f4230930dea3a95725", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "cardano-shell", + "type": "github" + } + }, + "cardano-shell_5": { + "flake": false, + "locked": { + "lastModified": 1608537748, + "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", + "owner": "input-output-hk", + "repo": "cardano-shell", + "rev": "9392c75087cb9a3d453998f4230930dea3a95725", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "cardano-shell", + "type": "github" + } + }, + "cardano-shell_6": { + "flake": false, + "locked": { + "lastModified": 1608537748, + "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", + "owner": "input-output-hk", + "repo": "cardano-shell", + "rev": "9392c75087cb9a3d453998f4230930dea3a95725", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "cardano-shell", + "type": "github" + } + }, + "customConfig": { + "locked": { + "lastModified": 1630400035, + "narHash": "sha256-MWaVOCzuFwp09wZIW9iHq5wWen5C69I940N1swZLEQ0=", + "owner": "input-output-hk", + "repo": "empty-flake", + "rev": "2040a05b67bf9a669ce17eca56beb14b4206a99a", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "empty-flake", + "type": "github" + } + }, + "customConfig_2": { + "locked": { + "lastModified": 1630400035, + "narHash": "sha256-MWaVOCzuFwp09wZIW9iHq5wWen5C69I940N1swZLEQ0=", + "owner": "input-output-hk", + "repo": "empty-flake", + "rev": "2040a05b67bf9a669ce17eca56beb14b4206a99a", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "empty-flake", + "type": "github" + } + }, + "customConfig_3": { + "locked": { + "lastModified": 1630400035, + "narHash": "sha256-MWaVOCzuFwp09wZIW9iHq5wWen5C69I940N1swZLEQ0=", + "owner": "input-output-hk", + "repo": "empty-flake", + "rev": "2040a05b67bf9a669ce17eca56beb14b4206a99a", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "empty-flake", + "type": "github" + } + }, + "customConfig_4": { + "locked": { + "lastModified": 1630400035, + "narHash": "sha256-MWaVOCzuFwp09wZIW9iHq5wWen5C69I940N1swZLEQ0=", + "owner": "input-output-hk", + "repo": "empty-flake", + "rev": "2040a05b67bf9a669ce17eca56beb14b4206a99a", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "empty-flake", + "type": "github" + } + }, + "customConfig_5": { + "locked": { + "lastModified": 1630400035, + "narHash": "sha256-MWaVOCzuFwp09wZIW9iHq5wWen5C69I940N1swZLEQ0=", + "owner": "input-output-hk", + "repo": "empty-flake", + "rev": "2040a05b67bf9a669ce17eca56beb14b4206a99a", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "empty-flake", + "type": "github" + } + }, "daedalus": { "inputs": { "nixpkgs": [ @@ -22,7 +882,7 @@ "tullia", "nixpkgs" ], - "tullia": "tullia" + "tullia": "tullia_7" }, "locked": { "lastModified": 1673276601, @@ -40,6 +900,198 @@ } }, "devshell": { + "inputs": { + "flake-utils": [ + "cardano-node", + "haskellNix", + "tullia", + "std", + "flake-utils" + ], + "nixpkgs": [ + "cardano-node", + "haskellNix", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1663445644, + "narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=", + "owner": "numtide", + "repo": "devshell", + "rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "devshell_2": { + "inputs": { + "flake-utils": [ + "cardano-node", + "node-measured", + "cardano-automation", + "haskellNix", + "tullia", + "std", + "flake-utils" + ], + "nixpkgs": [ + "cardano-node", + "node-measured", + "cardano-automation", + "haskellNix", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1663445644, + "narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=", + "owner": "numtide", + "repo": "devshell", + "rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "devshell_3": { + "inputs": { + "flake-utils": [ + "cardano-node", + "node-measured", + "cardano-automation", + "tullia", + "std", + "flake-utils" + ], + "nixpkgs": [ + "cardano-node", + "node-measured", + "cardano-automation", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1663445644, + "narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=", + "owner": "numtide", + "repo": "devshell", + "rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "devshell_4": { + "inputs": { + "flake-utils": [ + "cardano-node", + "node-measured", + "haskellNix", + "tullia", + "std", + "flake-utils" + ], + "nixpkgs": [ + "cardano-node", + "node-measured", + "haskellNix", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1663445644, + "narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=", + "owner": "numtide", + "repo": "devshell", + "rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "devshell_5": { + "inputs": { + "flake-utils": [ + "cardano-node", + "node-measured", + "tullia", + "std", + "flake-utils" + ], + "nixpkgs": [ + "cardano-node", + "node-measured", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1663445644, + "narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=", + "owner": "numtide", + "repo": "devshell", + "rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "devshell_6": { + "inputs": { + "flake-utils": [ + "cardano-node", + "tullia", + "std", + "flake-utils" + ], + "nixpkgs": [ + "cardano-node", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1663445644, + "narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=", + "owner": "numtide", + "repo": "devshell", + "rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "devshell_7": { "inputs": { "flake-utils": [ "daedalus", @@ -69,6 +1121,198 @@ } }, "dmerge": { + "inputs": { + "nixlib": [ + "cardano-node", + "haskellNix", + "tullia", + "std", + "nixpkgs" + ], + "yants": [ + "cardano-node", + "haskellNix", + "tullia", + "std", + "yants" + ] + }, + "locked": { + "lastModified": 1659548052, + "narHash": "sha256-fzI2gp1skGA8mQo/FBFrUAtY0GQkAIAaV/V127TJPyY=", + "owner": "divnix", + "repo": "data-merge", + "rev": "d160d18ce7b1a45b88344aa3f13ed1163954b497", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "data-merge", + "type": "github" + } + }, + "dmerge_2": { + "inputs": { + "nixlib": [ + "cardano-node", + "node-measured", + "cardano-automation", + "haskellNix", + "tullia", + "std", + "nixpkgs" + ], + "yants": [ + "cardano-node", + "node-measured", + "cardano-automation", + "haskellNix", + "tullia", + "std", + "yants" + ] + }, + "locked": { + "lastModified": 1659548052, + "narHash": "sha256-fzI2gp1skGA8mQo/FBFrUAtY0GQkAIAaV/V127TJPyY=", + "owner": "divnix", + "repo": "data-merge", + "rev": "d160d18ce7b1a45b88344aa3f13ed1163954b497", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "data-merge", + "type": "github" + } + }, + "dmerge_3": { + "inputs": { + "nixlib": [ + "cardano-node", + "node-measured", + "cardano-automation", + "tullia", + "std", + "nixpkgs" + ], + "yants": [ + "cardano-node", + "node-measured", + "cardano-automation", + "tullia", + "std", + "yants" + ] + }, + "locked": { + "lastModified": 1659548052, + "narHash": "sha256-fzI2gp1skGA8mQo/FBFrUAtY0GQkAIAaV/V127TJPyY=", + "owner": "divnix", + "repo": "data-merge", + "rev": "d160d18ce7b1a45b88344aa3f13ed1163954b497", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "data-merge", + "type": "github" + } + }, + "dmerge_4": { + "inputs": { + "nixlib": [ + "cardano-node", + "node-measured", + "haskellNix", + "tullia", + "std", + "nixpkgs" + ], + "yants": [ + "cardano-node", + "node-measured", + "haskellNix", + "tullia", + "std", + "yants" + ] + }, + "locked": { + "lastModified": 1659548052, + "narHash": "sha256-fzI2gp1skGA8mQo/FBFrUAtY0GQkAIAaV/V127TJPyY=", + "owner": "divnix", + "repo": "data-merge", + "rev": "d160d18ce7b1a45b88344aa3f13ed1163954b497", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "data-merge", + "type": "github" + } + }, + "dmerge_5": { + "inputs": { + "nixlib": [ + "cardano-node", + "node-measured", + "tullia", + "std", + "nixpkgs" + ], + "yants": [ + "cardano-node", + "node-measured", + "tullia", + "std", + "yants" + ] + }, + "locked": { + "lastModified": 1659548052, + "narHash": "sha256-fzI2gp1skGA8mQo/FBFrUAtY0GQkAIAaV/V127TJPyY=", + "owner": "divnix", + "repo": "data-merge", + "rev": "d160d18ce7b1a45b88344aa3f13ed1163954b497", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "data-merge", + "type": "github" + } + }, + "dmerge_6": { + "inputs": { + "nixlib": [ + "cardano-node", + "tullia", + "std", + "nixpkgs" + ], + "yants": [ + "cardano-node", + "tullia", + "std", + "yants" + ] + }, + "locked": { + "lastModified": 1659548052, + "narHash": "sha256-fzI2gp1skGA8mQo/FBFrUAtY0GQkAIAaV/V127TJPyY=", + "owner": "divnix", + "repo": "data-merge", + "rev": "d160d18ce7b1a45b88344aa3f13ed1163954b497", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "data-merge", + "type": "github" + } + }, + "dmerge_7": { "inputs": { "nixlib": [ "daedalus", @@ -97,7 +1341,218 @@ "type": "github" } }, + "em": { + "flake": false, + "locked": { + "lastModified": 1676998710, + "narHash": "sha256-JBRDpeZK4zGaV4wZh6vpDdREcFWgLL2uTImYh8xazAM=", + "owner": "deepfire", + "repo": "em", + "rev": "fdeb0111b3d4028b8c1b32ba946ff3f42669e25c", + "type": "github" + }, + "original": { + "owner": "deepfire", + "repo": "em", + "type": "github" + } + }, + "empty-flake": { + "locked": { + "lastModified": 1630400035, + "narHash": "sha256-MWaVOCzuFwp09wZIW9iHq5wWen5C69I940N1swZLEQ0=", + "owner": "input-output-hk", + "repo": "empty-flake", + "rev": "2040a05b67bf9a669ce17eca56beb14b4206a99a", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "empty-flake", + "type": "github" + } + }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1647532380, + "narHash": "sha256-wswAxyO8AJTH7d5oU8VK82yBCpqwA+p6kLgpb1f1PAY=", + "owner": "input-output-hk", + "repo": "flake-compat", + "rev": "7da118186435255a30b5ffeabba9629c344c0bec", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "fixes", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_10": { + "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-compat_11": { + "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-compat_12": { + "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-compat_2": { + "flake": false, + "locked": { + "lastModified": 1672831974, + "narHash": "sha256-z9k3MfslLjWQfnjBtEtJZdq3H7kyi2kQtUThfTgdRk0=", + "owner": "input-output-hk", + "repo": "flake-compat", + "rev": "45f2638735f8cdc40fe302742b79f248d23eb368", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "hkm/gitlab-fix", + "repo": "flake-compat", + "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-compat_4": { + "flake": false, + "locked": { + "lastModified": 1635892615, + "narHash": "sha256-harGbMZr4hzat2BWBU+Y5OYXlu+fVz7E4WeQzHi5o8A=", + "owner": "input-output-hk", + "repo": "flake-compat", + "rev": "eca47d3377946315596da653862d341ee5341318", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_5": { + "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-compat_6": { + "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-compat_7": { + "flake": false, + "locked": { + "lastModified": 1647532380, + "narHash": "sha256-wswAxyO8AJTH7d5oU8VK82yBCpqwA+p6kLgpb1f1PAY=", + "owner": "input-output-hk", + "repo": "flake-compat", + "rev": "7da118186435255a30b5ffeabba9629c344c0bec", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "fixes", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_8": { + "flake": false, + "locked": { + "lastModified": 1672831974, + "narHash": "sha256-z9k3MfslLjWQfnjBtEtJZdq3H7kyi2kQtUThfTgdRk0=", + "owner": "input-output-hk", + "repo": "flake-compat", + "rev": "45f2638735f8cdc40fe302742b79f248d23eb368", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "hkm/gitlab-fix", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_9": { "flake": false, "locked": { "lastModified": 1650374568, @@ -115,20 +1570,21 @@ }, "flake-utils": { "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", + "lastModified": 1679360468, + "narHash": "sha256-LGnza3cfXF10Biw3ZTg0u9o9t7s680Ww200t5KkHTh8=", + "owner": "hamishmack", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "e1ea268ff47ad475443dbabcd54744b4e5b9d4f5", "type": "github" }, "original": { - "owner": "numtide", + "owner": "hamishmack", + "ref": "hkm/nested-hydraJobs", "repo": "flake-utils", "type": "github" } }, - "flake-utils_2": { + "flake-utils_10": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -143,7 +1599,7 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_11": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -158,9 +1614,442 @@ "type": "github" } }, + "flake-utils_12": { + "locked": { + "lastModified": 1679360468, + "narHash": "sha256-LGnza3cfXF10Biw3ZTg0u9o9t7s680Ww200t5KkHTh8=", + "owner": "hamishmack", + "repo": "flake-utils", + "rev": "e1ea268ff47ad475443dbabcd54744b4e5b9d4f5", + "type": "github" + }, + "original": { + "owner": "hamishmack", + "ref": "hkm/nested-hydraJobs", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_13": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_14": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_15": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_16": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_17": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_18": { + "locked": { + "lastModified": 1623875721, + "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_19": { + "locked": { + "lastModified": 1623875721, + "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_20": { + "locked": { + "lastModified": 1623875721, + "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_21": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_22": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_23": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_24": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_25": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "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_5": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_7": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_8": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_9": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "ghc-8.6.5-iohk": { + "flake": false, + "locked": { + "lastModified": 1600920045, + "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", + "owner": "input-output-hk", + "repo": "ghc", + "rev": "95713a6ecce4551240da7c96b6176f980af75cae", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "release/8.6.5-iohk", + "repo": "ghc", + "type": "github" + } + }, + "ghc-8.6.5-iohk_2": { + "flake": false, + "locked": { + "lastModified": 1600920045, + "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", + "owner": "input-output-hk", + "repo": "ghc", + "rev": "95713a6ecce4551240da7c96b6176f980af75cae", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "release/8.6.5-iohk", + "repo": "ghc", + "type": "github" + } + }, + "ghc-8.6.5-iohk_3": { + "flake": false, + "locked": { + "lastModified": 1600920045, + "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", + "owner": "input-output-hk", + "repo": "ghc", + "rev": "95713a6ecce4551240da7c96b6176f980af75cae", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "release/8.6.5-iohk", + "repo": "ghc", + "type": "github" + } + }, + "ghc-8.6.5-iohk_4": { + "flake": false, + "locked": { + "lastModified": 1600920045, + "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", + "owner": "input-output-hk", + "repo": "ghc", + "rev": "95713a6ecce4551240da7c96b6176f980af75cae", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "release/8.6.5-iohk", + "repo": "ghc", + "type": "github" + } + }, + "ghc-8.6.5-iohk_5": { + "flake": false, + "locked": { + "lastModified": 1600920045, + "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", + "owner": "input-output-hk", + "repo": "ghc", + "rev": "95713a6ecce4551240da7c96b6176f980af75cae", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "release/8.6.5-iohk", + "repo": "ghc", + "type": "github" + } + }, + "ghc-8.6.5-iohk_6": { + "flake": false, + "locked": { + "lastModified": 1600920045, + "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", + "owner": "input-output-hk", + "repo": "ghc", + "rev": "95713a6ecce4551240da7c96b6176f980af75cae", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "release/8.6.5-iohk", + "repo": "ghc", + "type": "github" + } + }, "gomod2nix": { "inputs": { - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_3", "utils": "utils" }, "locked": { @@ -177,6 +2066,899 @@ "type": "github" } }, + "gomod2nix_2": { + "inputs": { + "nixpkgs": "nixpkgs_7", + "utils": "utils_2" + }, + "locked": { + "lastModified": 1655245309, + "narHash": "sha256-d/YPoQ/vFn1+GTmSdvbSBSTOai61FONxB4+Lt6w/IVI=", + "owner": "tweag", + "repo": "gomod2nix", + "rev": "40d32f82fc60d66402eb0972e6e368aeab3faf58", + "type": "github" + }, + "original": { + "owner": "tweag", + "repo": "gomod2nix", + "type": "github" + } + }, + "gomod2nix_3": { + "inputs": { + "nixpkgs": "nixpkgs_10", + "utils": "utils_3" + }, + "locked": { + "lastModified": 1655245309, + "narHash": "sha256-d/YPoQ/vFn1+GTmSdvbSBSTOai61FONxB4+Lt6w/IVI=", + "owner": "tweag", + "repo": "gomod2nix", + "rev": "40d32f82fc60d66402eb0972e6e368aeab3faf58", + "type": "github" + }, + "original": { + "owner": "tweag", + "repo": "gomod2nix", + "type": "github" + } + }, + "gomod2nix_4": { + "inputs": { + "nixpkgs": "nixpkgs_15", + "utils": "utils_4" + }, + "locked": { + "lastModified": 1655245309, + "narHash": "sha256-d/YPoQ/vFn1+GTmSdvbSBSTOai61FONxB4+Lt6w/IVI=", + "owner": "tweag", + "repo": "gomod2nix", + "rev": "40d32f82fc60d66402eb0972e6e368aeab3faf58", + "type": "github" + }, + "original": { + "owner": "tweag", + "repo": "gomod2nix", + "type": "github" + } + }, + "gomod2nix_5": { + "inputs": { + "nixpkgs": "nixpkgs_19", + "utils": "utils_5" + }, + "locked": { + "lastModified": 1655245309, + "narHash": "sha256-d/YPoQ/vFn1+GTmSdvbSBSTOai61FONxB4+Lt6w/IVI=", + "owner": "tweag", + "repo": "gomod2nix", + "rev": "40d32f82fc60d66402eb0972e6e368aeab3faf58", + "type": "github" + }, + "original": { + "owner": "tweag", + "repo": "gomod2nix", + "type": "github" + } + }, + "gomod2nix_6": { + "inputs": { + "nixpkgs": "nixpkgs_25", + "utils": "utils_10" + }, + "locked": { + "lastModified": 1655245309, + "narHash": "sha256-d/YPoQ/vFn1+GTmSdvbSBSTOai61FONxB4+Lt6w/IVI=", + "owner": "tweag", + "repo": "gomod2nix", + "rev": "40d32f82fc60d66402eb0972e6e368aeab3faf58", + "type": "github" + }, + "original": { + "owner": "tweag", + "repo": "gomod2nix", + "type": "github" + } + }, + "gomod2nix_7": { + "inputs": { + "nixpkgs": "nixpkgs_29", + "utils": "utils_12" + }, + "locked": { + "lastModified": 1655245309, + "narHash": "sha256-d/YPoQ/vFn1+GTmSdvbSBSTOai61FONxB4+Lt6w/IVI=", + "owner": "tweag", + "repo": "gomod2nix", + "rev": "40d32f82fc60d66402eb0972e6e368aeab3faf58", + "type": "github" + }, + "original": { + "owner": "tweag", + "repo": "gomod2nix", + "type": "github" + } + }, + "hackage": { + "flake": false, + "locked": { + "lastModified": 1667783503, + "narHash": "sha256-25ZZPMQi9YQbXz3tZYPECVUI0FAQkJcDUIA/v8+mo9E=", + "owner": "input-output-hk", + "repo": "hackage.nix", + "rev": "1f77f69e6dd92b5130cbe681b74e8fc0d29d63ff", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "hackage.nix", + "type": "github" + } + }, + "hackageNix": { + "flake": false, + "locked": { + "lastModified": 1679876764, + "narHash": "sha256-cBqBwo6V6X9de0qnHpC7kf4Q9/2MNqODbO2RXg5h0lQ=", + "owner": "input-output-hk", + "repo": "hackage.nix", + "rev": "ba9ec9719c2e86af4a6b070955f145730d20320c", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "hackage.nix", + "type": "github" + } + }, + "hackageNix_2": { + "flake": false, + "locked": { + "lastModified": 1679444578, + "narHash": "sha256-iAGg8IhYPCaJPCeo3hoacVXIGISCFZm1yTgAAvv5aes=", + "owner": "input-output-hk", + "repo": "hackage.nix", + "rev": "f3793d3d9fa159d0f3a652fc4a50b65ed0e86c27", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "hackage.nix", + "type": "github" + } + }, + "hackage_2": { + "flake": false, + "locked": { + "lastModified": 1643073363, + "narHash": "sha256-66oSXQKEDIOSQ2uKAS9facCX/Zuh/jFgyFDtxEqN9sk=", + "owner": "input-output-hk", + "repo": "hackage.nix", + "rev": "4ef9bd3a32316ce236164c7ebff00ebeb33236e2", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "hackage.nix", + "type": "github" + } + }, + "hackage_3": { + "flake": false, + "locked": { + "lastModified": 1643073363, + "narHash": "sha256-66oSXQKEDIOSQ2uKAS9facCX/Zuh/jFgyFDtxEqN9sk=", + "owner": "input-output-hk", + "repo": "hackage.nix", + "rev": "4ef9bd3a32316ce236164c7ebff00ebeb33236e2", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "hackage.nix", + "type": "github" + } + }, + "hackage_4": { + "flake": false, + "locked": { + "lastModified": 1639098768, + "narHash": "sha256-DZ4sG8FeDxWvBLixrj0jELXjtebZ0SCCPmQW43HNzIE=", + "owner": "input-output-hk", + "repo": "hackage.nix", + "rev": "c7b123af6b0b9b364cab03363504d42dca16a4b5", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "hackage.nix", + "type": "github" + } + }, + "haskellNix": { + "inputs": { + "HTTP": "HTTP", + "cabal-32": "cabal-32", + "cabal-34": "cabal-34", + "cabal-36": "cabal-36", + "cardano-shell": "cardano-shell", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils", + "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", + "hackage": [ + "cardano-node", + "hackageNix" + ], + "hpc-coveralls": "hpc-coveralls", + "hydra": "hydra", + "iserv-proxy": "iserv-proxy", + "nixpkgs": [ + "cardano-node", + "nixpkgs" + ], + "nixpkgs-2003": "nixpkgs-2003", + "nixpkgs-2105": "nixpkgs-2105", + "nixpkgs-2111": "nixpkgs-2111", + "nixpkgs-2205": "nixpkgs-2205", + "nixpkgs-2211": "nixpkgs-2211", + "nixpkgs-unstable": "nixpkgs-unstable", + "old-ghc-nix": "old-ghc-nix", + "stackage": "stackage", + "tullia": "tullia" + }, + "locked": { + "lastModified": 1679898063, + "narHash": "sha256-gK0vq6v8NioSWbhpWyl73oG1s7PQemj2XWrk0qFNfk4=", + "owner": "input-output-hk", + "repo": "haskell.nix", + "rev": "9f75bfdde36def44543dba510fa2795b897e145e", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "haskell.nix", + "type": "github" + } + }, + "haskellNix_2": { + "inputs": { + "HTTP": "HTTP_2", + "cabal-32": "cabal-32_2", + "cabal-34": "cabal-34_2", + "cabal-36": "cabal-36_2", + "cardano-shell": "cardano-shell_2", + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_5", + "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_2", + "hackage": "hackage", + "hpc-coveralls": "hpc-coveralls_2", + "hydra": "hydra_2", + "nixpkgs": [ + "cardano-node", + "node-measured", + "cardano-automation", + "haskellNix", + "nixpkgs-unstable" + ], + "nixpkgs-2003": "nixpkgs-2003_2", + "nixpkgs-2105": "nixpkgs-2105_2", + "nixpkgs-2111": "nixpkgs-2111_2", + "nixpkgs-2205": "nixpkgs-2205_2", + "nixpkgs-unstable": "nixpkgs-unstable_2", + "old-ghc-nix": "old-ghc-nix_2", + "stackage": "stackage_2", + "tullia": "tullia_2" + }, + "locked": { + "lastModified": 1667783630, + "narHash": "sha256-IzbvNxsOVxHJGY70qAzaEOPmz4Fw93+4qLFd2on/ZAc=", + "owner": "input-output-hk", + "repo": "haskell.nix", + "rev": "f1f330065199dc4eca017bc21de0c67bc46df393", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "haskell.nix", + "type": "github" + } + }, + "haskellNix_3": { + "inputs": { + "HTTP": "HTTP_3", + "cabal-32": "cabal-32_3", + "cabal-34": "cabal-34_3", + "cabal-36": "cabal-36_3", + "cardano-shell": "cardano-shell_3", + "flake-compat": "flake-compat_8", + "flake-utils": "flake-utils_12", + "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_3", + "hackage": [ + "cardano-node", + "node-measured", + "hackageNix" + ], + "hpc-coveralls": "hpc-coveralls_3", + "hydra": "hydra_3", + "iserv-proxy": "iserv-proxy_2", + "nixpkgs": [ + "cardano-node", + "node-measured", + "nixpkgs" + ], + "nixpkgs-2003": "nixpkgs-2003_3", + "nixpkgs-2105": "nixpkgs-2105_3", + "nixpkgs-2111": "nixpkgs-2111_3", + "nixpkgs-2205": "nixpkgs-2205_3", + "nixpkgs-2211": "nixpkgs-2211_2", + "nixpkgs-unstable": "nixpkgs-unstable_3", + "old-ghc-nix": "old-ghc-nix_3", + "stackage": "stackage_3", + "tullia": "tullia_4" + }, + "locked": { + "lastModified": 1679800264, + "narHash": "sha256-DNXKCVN2e7S/b253bk02Iukxj4QMr4gMFf3yKpEYR5U=", + "owner": "input-output-hk", + "repo": "haskell.nix", + "rev": "3c3decc5989603df52655317c9f484cf25300d2f", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "haskell.nix", + "type": "github" + } + }, + "haskellNix_4": { + "inputs": { + "HTTP": "HTTP_4", + "cabal-32": "cabal-32_4", + "cabal-34": "cabal-34_4", + "cabal-36": "cabal-36_4", + "cardano-shell": "cardano-shell_4", + "flake-utils": "flake-utils_18", + "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_4", + "hackage": "hackage_2", + "hpc-coveralls": "hpc-coveralls_4", + "nix-tools": "nix-tools", + "nixpkgs": [ + "cardano-node", + "node-snapshot", + "nixpkgs" + ], + "nixpkgs-2003": "nixpkgs-2003_4", + "nixpkgs-2105": "nixpkgs-2105_4", + "nixpkgs-2111": "nixpkgs-2111_4", + "nixpkgs-unstable": "nixpkgs-unstable_4", + "old-ghc-nix": "old-ghc-nix_4", + "stackage": "stackage_4" + }, + "locked": { + "lastModified": 1643073543, + "narHash": "sha256-g2l/KDWzMRTFRugNVcx3CPZeyA5BNcH9/zDiqFpprB4=", + "owner": "input-output-hk", + "repo": "haskell.nix", + "rev": "14f740c7c8f535581c30b1697018e389680e24cb", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "haskell.nix", + "type": "github" + } + }, + "haskellNix_5": { + "inputs": { + "HTTP": "HTTP_5", + "cabal-32": "cabal-32_5", + "cabal-34": "cabal-34_5", + "cabal-36": "cabal-36_5", + "cardano-shell": "cardano-shell_5", + "flake-utils": "flake-utils_19", + "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_5", + "hackage": "hackage_3", + "hpc-coveralls": "hpc-coveralls_5", + "nix-tools": "nix-tools_2", + "nixpkgs": [ + "cardano-node", + "node-snapshot", + "membench", + "cardano-node-snapshot", + "nixpkgs" + ], + "nixpkgs-2003": "nixpkgs-2003_5", + "nixpkgs-2105": "nixpkgs-2105_5", + "nixpkgs-2111": "nixpkgs-2111_5", + "nixpkgs-unstable": "nixpkgs-unstable_5", + "old-ghc-nix": "old-ghc-nix_5", + "stackage": "stackage_5" + }, + "locked": { + "lastModified": 1643073543, + "narHash": "sha256-g2l/KDWzMRTFRugNVcx3CPZeyA5BNcH9/zDiqFpprB4=", + "owner": "input-output-hk", + "repo": "haskell.nix", + "rev": "14f740c7c8f535581c30b1697018e389680e24cb", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "haskell.nix", + "type": "github" + } + }, + "haskellNix_6": { + "inputs": { + "HTTP": "HTTP_6", + "cabal-32": "cabal-32_6", + "cabal-34": "cabal-34_6", + "cardano-shell": "cardano-shell_6", + "flake-utils": "flake-utils_20", + "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_6", + "hackage": "hackage_4", + "hpc-coveralls": "hpc-coveralls_6", + "nix-tools": "nix-tools_3", + "nixpkgs": [ + "cardano-node", + "node-snapshot", + "plutus-example", + "nixpkgs" + ], + "nixpkgs-2003": "nixpkgs-2003_6", + "nixpkgs-2105": "nixpkgs-2105_6", + "nixpkgs-2111": "nixpkgs-2111_6", + "nixpkgs-unstable": "nixpkgs-unstable_6", + "old-ghc-nix": "old-ghc-nix_6", + "stackage": "stackage_6" + }, + "locked": { + "lastModified": 1639098904, + "narHash": "sha256-7VrCNEaKGLm4pTOS11dt1dRL2033oqrNCfal0uONsqA=", + "owner": "input-output-hk", + "repo": "haskell.nix", + "rev": "b18c6ce0867fee77f12ecf41dc6c67f7a59d9826", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "haskell.nix", + "type": "github" + } + }, + "hpc-coveralls": { + "flake": false, + "locked": { + "lastModified": 1607498076, + "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", + "type": "github" + }, + "original": { + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "type": "github" + } + }, + "hpc-coveralls_2": { + "flake": false, + "locked": { + "lastModified": 1607498076, + "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", + "type": "github" + }, + "original": { + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "type": "github" + } + }, + "hpc-coveralls_3": { + "flake": false, + "locked": { + "lastModified": 1607498076, + "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", + "type": "github" + }, + "original": { + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "type": "github" + } + }, + "hpc-coveralls_4": { + "flake": false, + "locked": { + "lastModified": 1607498076, + "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", + "type": "github" + }, + "original": { + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "type": "github" + } + }, + "hpc-coveralls_5": { + "flake": false, + "locked": { + "lastModified": 1607498076, + "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", + "type": "github" + }, + "original": { + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "type": "github" + } + }, + "hpc-coveralls_6": { + "flake": false, + "locked": { + "lastModified": 1607498076, + "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", + "type": "github" + }, + "original": { + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "type": "github" + } + }, + "hydra": { + "inputs": { + "nix": "nix", + "nixpkgs": [ + "cardano-node", + "haskellNix", + "hydra", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1671755331, + "narHash": "sha256-hXsgJj0Cy0ZiCiYdW2OdBz5WmFyOMKuw4zyxKpgUKm4=", + "owner": "NixOS", + "repo": "hydra", + "rev": "f48f00ee6d5727ae3e488cbf9ce157460853fea8", + "type": "github" + }, + "original": { + "id": "hydra", + "type": "indirect" + } + }, + "hydra_2": { + "inputs": { + "nix": "nix_2", + "nixpkgs": [ + "cardano-node", + "node-measured", + "cardano-automation", + "haskellNix", + "hydra", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1646878427, + "narHash": "sha256-KtbrofMtN8GlM7D+n90kixr7QpSlVmdN+vK5CA/aRzc=", + "owner": "NixOS", + "repo": "hydra", + "rev": "28b682b85b7efc5cf7974065792a1f22203a5927", + "type": "github" + }, + "original": { + "id": "hydra", + "type": "indirect" + } + }, + "hydra_3": { + "inputs": { + "nix": "nix_3", + "nixpkgs": [ + "cardano-node", + "node-measured", + "haskellNix", + "hydra", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1671755331, + "narHash": "sha256-hXsgJj0Cy0ZiCiYdW2OdBz5WmFyOMKuw4zyxKpgUKm4=", + "owner": "NixOS", + "repo": "hydra", + "rev": "f48f00ee6d5727ae3e488cbf9ce157460853fea8", + "type": "github" + }, + "original": { + "id": "hydra", + "type": "indirect" + } + }, + "incl": { + "inputs": { + "nixlib": [ + "cardano-node", + "haskellNix", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1669263024, + "narHash": "sha256-E/+23NKtxAqYG/0ydYgxlgarKnxmDbg6rCMWnOBqn9Q=", + "owner": "divnix", + "repo": "incl", + "rev": "ce7bebaee048e4cd7ebdb4cee7885e00c4e2abca", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "incl", + "type": "github" + } + }, + "incl_2": { + "inputs": { + "nixlib": [ + "cardano-node", + "node-measured", + "haskellNix", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1669263024, + "narHash": "sha256-E/+23NKtxAqYG/0ydYgxlgarKnxmDbg6rCMWnOBqn9Q=", + "owner": "divnix", + "repo": "incl", + "rev": "ce7bebaee048e4cd7ebdb4cee7885e00c4e2abca", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "incl", + "type": "github" + } + }, + "incl_3": { + "inputs": { + "nixlib": [ + "cardano-node", + "node-measured", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1669263024, + "narHash": "sha256-E/+23NKtxAqYG/0ydYgxlgarKnxmDbg6rCMWnOBqn9Q=", + "owner": "divnix", + "repo": "incl", + "rev": "ce7bebaee048e4cd7ebdb4cee7885e00c4e2abca", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "incl", + "type": "github" + } + }, + "incl_4": { + "inputs": { + "nixlib": [ + "cardano-node", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1669263024, + "narHash": "sha256-E/+23NKtxAqYG/0ydYgxlgarKnxmDbg6rCMWnOBqn9Q=", + "owner": "divnix", + "repo": "incl", + "rev": "ce7bebaee048e4cd7ebdb4cee7885e00c4e2abca", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "incl", + "type": "github" + } + }, + "iohkNix": { + "inputs": { + "nixpkgs": [ + "cardano-node", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1678931316, + "narHash": "sha256-RvxkLxW1cl9cMvZuxRsDxeOZnCdQj1XlajPCNo1KxEM=", + "owner": "input-output-hk", + "repo": "iohk-nix", + "rev": "67967ced6a40dce4721bc3fcc163c1809398c3c0", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "iohk-nix", + "type": "github" + } + }, + "iohkNix_2": { + "inputs": { + "nixpkgs": [ + "cardano-node", + "node-measured", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1678326995, + "narHash": "sha256-cGIHTWB3ENLTCc2/3eLMPL5eBE87grCDOBS4lBllaZg=", + "owner": "input-output-hk", + "repo": "iohk-nix", + "rev": "6f1ca44c8bf714df4866e8bf30030a70f55e64e2", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "iohk-nix", + "type": "github" + } + }, + "iohkNix_3": { + "inputs": { + "nixpkgs": [ + "cardano-node", + "node-snapshot", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1631778944, + "narHash": "sha256-N5eCcUYtZ5kUOl/JJGjx6ZzhA3uIn1itDRTiRV+3jLw=", + "owner": "input-output-hk", + "repo": "iohk-nix", + "rev": "db2c75a09c696271194bb3ef25ec8e9839b594b7", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "iohk-nix", + "type": "github" + } + }, + "iohkNix_4": { + "inputs": { + "nixpkgs": [ + "cardano-node", + "node-snapshot", + "membench", + "cardano-node-snapshot", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1631778944, + "narHash": "sha256-N5eCcUYtZ5kUOl/JJGjx6ZzhA3uIn1itDRTiRV+3jLw=", + "owner": "input-output-hk", + "repo": "iohk-nix", + "rev": "db2c75a09c696271194bb3ef25ec8e9839b594b7", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "iohk-nix", + "type": "github" + } + }, + "iohkNix_5": { + "inputs": { + "nixpkgs": [ + "cardano-node", + "node-snapshot", + "plutus-example", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1633964277, + "narHash": "sha256-7G/BK514WiMRr90EswNBthe8SmH9tjPaTBba/RW/VA8=", + "owner": "input-output-hk", + "repo": "iohk-nix", + "rev": "1e51437aac8a0e49663cb21e781f34163c81ebfb", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "iohk-nix", + "type": "github" + } + }, + "iohkNix_6": { + "inputs": { + "nixpkgs": "nixpkgs_33" + }, + "locked": { + "lastModified": 1629993366, + "narHash": "sha256-FNjrODWYQcZ6VRZzdmUUE3Jh3IZZ4zOwsNbPznX27G4=", + "owner": "input-output-hk", + "repo": "iohk-nix", + "rev": "df1da282f996ec46b33379407df99613a1fbafdd", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "df1da282f996ec46b33379407df99613a1fbafdd", + "repo": "iohk-nix", + "type": "github" + } + }, + "iserv-proxy": { + "flake": false, + "locked": { + "lastModified": 1670983692, + "narHash": "sha256-avLo34JnI9HNyOuauK5R69usJm+GfW3MlyGlYxZhTgY=", + "ref": "hkm/remote-iserv", + "rev": "50d0abb3317ac439a4e7495b185a64af9b7b9300", + "revCount": 10, + "type": "git", + "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" + }, + "original": { + "ref": "hkm/remote-iserv", + "type": "git", + "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" + } + }, + "iserv-proxy_2": { + "flake": false, + "locked": { + "lastModified": 1670983692, + "narHash": "sha256-avLo34JnI9HNyOuauK5R69usJm+GfW3MlyGlYxZhTgY=", + "ref": "hkm/remote-iserv", + "rev": "50d0abb3317ac439a4e7495b185a64af9b7b9300", + "revCount": 10, + "type": "git", + "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" + }, + "original": { + "ref": "hkm/remote-iserv", + "type": "git", + "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" + } + }, "lowdown-src": { "flake": false, "locked": { @@ -193,6 +2975,54 @@ "type": "github" } }, + "lowdown-src_2": { + "flake": false, + "locked": { + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "type": "github" + }, + "original": { + "owner": "kristapsdz", + "repo": "lowdown", + "type": "github" + } + }, + "lowdown-src_3": { + "flake": false, + "locked": { + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "type": "github" + }, + "original": { + "owner": "kristapsdz", + "repo": "lowdown", + "type": "github" + } + }, + "lowdown-src_4": { + "flake": false, + "locked": { + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "type": "github" + }, + "original": { + "owner": "kristapsdz", + "repo": "lowdown", + "type": "github" + } + }, "mdbook-kroki-preprocessor": { "flake": false, "locked": { @@ -209,9 +3039,295 @@ "type": "github" } }, + "mdbook-kroki-preprocessor_2": { + "flake": false, + "locked": { + "lastModified": 1661755005, + "narHash": "sha256-1TJuUzfyMycWlOQH67LR63/ll2GDZz25I3JfScy/Jnw=", + "owner": "JoelCourtney", + "repo": "mdbook-kroki-preprocessor", + "rev": "93adb5716d035829efed27f65f2f0833a7d3e76f", + "type": "github" + }, + "original": { + "owner": "JoelCourtney", + "repo": "mdbook-kroki-preprocessor", + "type": "github" + } + }, + "mdbook-kroki-preprocessor_3": { + "flake": false, + "locked": { + "lastModified": 1661755005, + "narHash": "sha256-1TJuUzfyMycWlOQH67LR63/ll2GDZz25I3JfScy/Jnw=", + "owner": "JoelCourtney", + "repo": "mdbook-kroki-preprocessor", + "rev": "93adb5716d035829efed27f65f2f0833a7d3e76f", + "type": "github" + }, + "original": { + "owner": "JoelCourtney", + "repo": "mdbook-kroki-preprocessor", + "type": "github" + } + }, + "membench": { + "inputs": { + "cardano-mainnet-mirror": "cardano-mainnet-mirror_3", + "cardano-node-measured": [ + "cardano-node", + "node-snapshot" + ], + "cardano-node-process": [ + "cardano-node", + "node-snapshot" + ], + "cardano-node-snapshot": "cardano-node-snapshot", + "nixpkgs": [ + "cardano-node", + "node-snapshot", + "nixpkgs" + ], + "ouroboros-network": "ouroboros-network_2" + }, + "locked": { + "lastModified": 1645070579, + "narHash": "sha256-AxL6tCOnzYnE6OquoFzj+X1bLDr1PQx3d8/vXm+rbfA=", + "owner": "input-output-hk", + "repo": "cardano-memory-benchmark", + "rev": "65643e000186de1335e24ec89159db8ba85e1c1a", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "cardano-memory-benchmark", + "type": "github" + } + }, + "membench_2": { + "inputs": { + "cardano-mainnet-mirror": "cardano-mainnet-mirror_4", + "cardano-node-measured": [ + "cardano-node", + "node-snapshot", + "membench", + "cardano-node-snapshot" + ], + "cardano-node-process": [ + "cardano-node", + "node-snapshot", + "membench", + "cardano-node-snapshot" + ], + "cardano-node-snapshot": [ + "cardano-node", + "node-snapshot", + "membench", + "cardano-node-snapshot" + ], + "nixpkgs": [ + "cardano-node", + "node-snapshot", + "membench", + "cardano-node-snapshot", + "nixpkgs" + ], + "ouroboros-network": "ouroboros-network" + }, + "locked": { + "lastModified": 1644547122, + "narHash": "sha256-8nWK+ScMACvRQLbA27gwXNoZver+Wx/cF7V37044koY=", + "owner": "input-output-hk", + "repo": "cardano-memory-benchmark", + "rev": "9d8ff4b9394de0421ee95caa511d01163de88b77", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "cardano-memory-benchmark", + "type": "github" + } + }, "n2c": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": [ + "cardano-node", + "haskellNix", + "tullia", + "std", + "flake-utils" + ], + "nixpkgs": [ + "cardano-node", + "haskellNix", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1665039323, + "narHash": "sha256-SAh3ZjFGsaCI8FRzXQyp56qcGdAqgKEfJWPCQ0Sr7tQ=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "b008fe329ffb59b67bf9e7b08ede6ee792f2741a", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, + "n2c_2": { + "inputs": { + "flake-utils": "flake-utils_8", + "nixpkgs": [ + "cardano-node", + "node-measured", + "cardano-automation", + "haskellNix", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1665039323, + "narHash": "sha256-SAh3ZjFGsaCI8FRzXQyp56qcGdAqgKEfJWPCQ0Sr7tQ=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "b008fe329ffb59b67bf9e7b08ede6ee792f2741a", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, + "n2c_3": { + "inputs": { + "flake-utils": "flake-utils_11", + "nixpkgs": [ + "cardano-node", + "node-measured", + "cardano-automation", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1665039323, + "narHash": "sha256-SAh3ZjFGsaCI8FRzXQyp56qcGdAqgKEfJWPCQ0Sr7tQ=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "b008fe329ffb59b67bf9e7b08ede6ee792f2741a", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, + "n2c_4": { + "inputs": { + "flake-utils": [ + "cardano-node", + "node-measured", + "haskellNix", + "tullia", + "std", + "flake-utils" + ], + "nixpkgs": [ + "cardano-node", + "node-measured", + "haskellNix", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1665039323, + "narHash": "sha256-SAh3ZjFGsaCI8FRzXQyp56qcGdAqgKEfJWPCQ0Sr7tQ=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "b008fe329ffb59b67bf9e7b08ede6ee792f2741a", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, + "n2c_5": { + "inputs": { + "flake-utils": [ + "cardano-node", + "node-measured", + "tullia", + "std", + "flake-utils" + ], + "nixpkgs": [ + "cardano-node", + "node-measured", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1665039323, + "narHash": "sha256-SAh3ZjFGsaCI8FRzXQyp56qcGdAqgKEfJWPCQ0Sr7tQ=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "b008fe329ffb59b67bf9e7b08ede6ee792f2741a", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, + "n2c_6": { + "inputs": { + "flake-utils": [ + "cardano-node", + "tullia", + "std", + "flake-utils" + ], + "nixpkgs": [ + "cardano-node", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1665039323, + "narHash": "sha256-SAh3ZjFGsaCI8FRzXQyp56qcGdAqgKEfJWPCQ0Sr7tQ=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "b008fe329ffb59b67bf9e7b08ede6ee792f2741a", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, + "n2c_7": { + "inputs": { + "flake-utils": "flake-utils_25", "nixpkgs": [ "daedalus", "tullia", @@ -236,34 +3352,271 @@ "nix": { "inputs": { "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_2", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1677045134, - "narHash": "sha256-jUc2ccTR8f6MGY2pUKgujm+lxSPNGm/ZAP+toX+nMNc=", + "lastModified": 1661606874, + "narHash": "sha256-9+rpYzI+SmxJn+EbYxjGv68Ucp22bdFUSy/4LkHkkDQ=", "owner": "NixOS", "repo": "nix", - "rev": "4acc684ef7b3117c6d6ac12837398a0008a53d85", + "rev": "11e45768b34fdafdcf019ddbd337afa16127ff0f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "2.13.3", + "ref": "2.11.0", "repo": "nix", "type": "github" } }, "nix-nomad": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_3", + "flake-utils": [ + "cardano-node", + "haskellNix", + "tullia", + "nix2container", + "flake-utils" + ], + "gomod2nix": "gomod2nix", + "nixpkgs": [ + "cardano-node", + "haskellNix", + "tullia", + "nixpkgs" + ], + "nixpkgs-lib": [ + "cardano-node", + "haskellNix", + "tullia", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1658277770, + "narHash": "sha256-T/PgG3wUn8Z2rnzfxf2VqlR1CBjInPE0l1yVzXxPnt0=", + "owner": "tristanpemble", + "repo": "nix-nomad", + "rev": "054adcbdd0a836ae1c20951b67ed549131fd2d70", + "type": "github" + }, + "original": { + "owner": "tristanpemble", + "repo": "nix-nomad", + "type": "github" + } + }, + "nix-nomad_2": { + "inputs": { + "flake-compat": "flake-compat_5", + "flake-utils": [ + "cardano-node", + "node-measured", + "cardano-automation", + "haskellNix", + "tullia", + "nix2container", + "flake-utils" + ], + "gomod2nix": "gomod2nix_2", + "nixpkgs": [ + "cardano-node", + "node-measured", + "cardano-automation", + "haskellNix", + "tullia", + "nixpkgs" + ], + "nixpkgs-lib": [ + "cardano-node", + "node-measured", + "cardano-automation", + "haskellNix", + "tullia", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1658277770, + "narHash": "sha256-T/PgG3wUn8Z2rnzfxf2VqlR1CBjInPE0l1yVzXxPnt0=", + "owner": "tristanpemble", + "repo": "nix-nomad", + "rev": "054adcbdd0a836ae1c20951b67ed549131fd2d70", + "type": "github" + }, + "original": { + "owner": "tristanpemble", + "repo": "nix-nomad", + "type": "github" + } + }, + "nix-nomad_3": { + "inputs": { + "flake-compat": "flake-compat_6", + "flake-utils": [ + "cardano-node", + "node-measured", + "cardano-automation", + "tullia", + "nix2container", + "flake-utils" + ], + "gomod2nix": "gomod2nix_3", + "nixpkgs": [ + "cardano-node", + "node-measured", + "cardano-automation", + "tullia", + "nixpkgs" + ], + "nixpkgs-lib": [ + "cardano-node", + "node-measured", + "cardano-automation", + "tullia", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1658277770, + "narHash": "sha256-T/PgG3wUn8Z2rnzfxf2VqlR1CBjInPE0l1yVzXxPnt0=", + "owner": "tristanpemble", + "repo": "nix-nomad", + "rev": "054adcbdd0a836ae1c20951b67ed549131fd2d70", + "type": "github" + }, + "original": { + "owner": "tristanpemble", + "repo": "nix-nomad", + "type": "github" + } + }, + "nix-nomad_4": { + "inputs": { + "flake-compat": "flake-compat_9", + "flake-utils": [ + "cardano-node", + "node-measured", + "haskellNix", + "tullia", + "nix2container", + "flake-utils" + ], + "gomod2nix": "gomod2nix_4", + "nixpkgs": [ + "cardano-node", + "node-measured", + "haskellNix", + "tullia", + "nixpkgs" + ], + "nixpkgs-lib": [ + "cardano-node", + "node-measured", + "haskellNix", + "tullia", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1658277770, + "narHash": "sha256-T/PgG3wUn8Z2rnzfxf2VqlR1CBjInPE0l1yVzXxPnt0=", + "owner": "tristanpemble", + "repo": "nix-nomad", + "rev": "054adcbdd0a836ae1c20951b67ed549131fd2d70", + "type": "github" + }, + "original": { + "owner": "tristanpemble", + "repo": "nix-nomad", + "type": "github" + } + }, + "nix-nomad_5": { + "inputs": { + "flake-compat": "flake-compat_10", + "flake-utils": [ + "cardano-node", + "node-measured", + "tullia", + "nix2container", + "flake-utils" + ], + "gomod2nix": "gomod2nix_5", + "nixpkgs": [ + "cardano-node", + "node-measured", + "tullia", + "nixpkgs" + ], + "nixpkgs-lib": [ + "cardano-node", + "node-measured", + "tullia", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1658277770, + "narHash": "sha256-T/PgG3wUn8Z2rnzfxf2VqlR1CBjInPE0l1yVzXxPnt0=", + "owner": "tristanpemble", + "repo": "nix-nomad", + "rev": "054adcbdd0a836ae1c20951b67ed549131fd2d70", + "type": "github" + }, + "original": { + "owner": "tristanpemble", + "repo": "nix-nomad", + "type": "github" + } + }, + "nix-nomad_6": { + "inputs": { + "flake-compat": "flake-compat_11", + "flake-utils": [ + "cardano-node", + "tullia", + "nix2container", + "flake-utils" + ], + "gomod2nix": "gomod2nix_6", + "nixpkgs": [ + "cardano-node", + "tullia", + "nixpkgs" + ], + "nixpkgs-lib": [ + "cardano-node", + "tullia", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1658277770, + "narHash": "sha256-T/PgG3wUn8Z2rnzfxf2VqlR1CBjInPE0l1yVzXxPnt0=", + "owner": "tristanpemble", + "repo": "nix-nomad", + "rev": "054adcbdd0a836ae1c20951b67ed549131fd2d70", + "type": "github" + }, + "original": { + "owner": "tristanpemble", + "repo": "nix-nomad", + "type": "github" + } + }, + "nix-nomad_7": { + "inputs": { + "flake-compat": "flake-compat_12", "flake-utils": [ "daedalus", "tullia", "nix2container", "flake-utils" ], - "gomod2nix": "gomod2nix", + "gomod2nix": "gomod2nix_7", "nixpkgs": [ "daedalus", "tullia", @@ -289,10 +3642,58 @@ "type": "github" } }, + "nix-tools": { + "flake": false, + "locked": { + "lastModified": 1636018067, + "narHash": "sha256-ng306fkuwr6V/malWtt3979iAC4yMVDDH2ViwYB6sQE=", + "owner": "input-output-hk", + "repo": "nix-tools", + "rev": "ed5bd7215292deba55d6ab7a4e8c21f8b1564dda", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "nix-tools", + "type": "github" + } + }, + "nix-tools_2": { + "flake": false, + "locked": { + "lastModified": 1636018067, + "narHash": "sha256-ng306fkuwr6V/malWtt3979iAC4yMVDDH2ViwYB6sQE=", + "owner": "input-output-hk", + "repo": "nix-tools", + "rev": "ed5bd7215292deba55d6ab7a4e8c21f8b1564dda", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "nix-tools", + "type": "github" + } + }, + "nix-tools_3": { + "flake": false, + "locked": { + "lastModified": 1636018067, + "narHash": "sha256-ng306fkuwr6V/malWtt3979iAC4yMVDDH2ViwYB6sQE=", + "owner": "input-output-hk", + "repo": "nix-tools", + "rev": "ed5bd7215292deba55d6ab7a4e8c21f8b1564dda", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "nix-tools", + "type": "github" + } + }, "nix2container": { "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2" + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1658567952, @@ -308,7 +3709,456 @@ "type": "github" } }, + "nix2container_2": { + "inputs": { + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_8" + }, + "locked": { + "lastModified": 1658567952, + "narHash": "sha256-XZ4ETYAMU7XcpEeAFP3NOl9yDXNuZAen/aIJ84G+VgA=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "60bb43d405991c1378baf15a40b5811a53e32ffa", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, + "nix2container_3": { + "inputs": { + "flake-utils": "flake-utils_9", + "nixpkgs": "nixpkgs_11" + }, + "locked": { + "lastModified": 1658567952, + "narHash": "sha256-XZ4ETYAMU7XcpEeAFP3NOl9yDXNuZAen/aIJ84G+VgA=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "60bb43d405991c1378baf15a40b5811a53e32ffa", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, + "nix2container_4": { + "inputs": { + "flake-utils": "flake-utils_13", + "nixpkgs": "nixpkgs_16" + }, + "locked": { + "lastModified": 1658567952, + "narHash": "sha256-XZ4ETYAMU7XcpEeAFP3NOl9yDXNuZAen/aIJ84G+VgA=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "60bb43d405991c1378baf15a40b5811a53e32ffa", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, + "nix2container_5": { + "inputs": { + "flake-utils": "flake-utils_15", + "nixpkgs": "nixpkgs_18" + }, + "locked": { + "lastModified": 1671269339, + "narHash": "sha256-KR2SXh4c2Y+bgbCfXjTGJ74O9/u4CAPFA0KYZHhKf5Q=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "6800fff45afecc7e47c334d14cf2b2f4f25601a0", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, + "nix2container_6": { + "inputs": { + "flake-utils": "flake-utils_16", + "nixpkgs": "nixpkgs_20" + }, + "locked": { + "lastModified": 1658567952, + "narHash": "sha256-XZ4ETYAMU7XcpEeAFP3NOl9yDXNuZAen/aIJ84G+VgA=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "60bb43d405991c1378baf15a40b5811a53e32ffa", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, + "nix2container_7": { + "inputs": { + "flake-utils": "flake-utils_21", + "nixpkgs": "nixpkgs_26" + }, + "locked": { + "lastModified": 1658567952, + "narHash": "sha256-XZ4ETYAMU7XcpEeAFP3NOl9yDXNuZAen/aIJ84G+VgA=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "60bb43d405991c1378baf15a40b5811a53e32ffa", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, + "nix2container_8": { + "inputs": { + "flake-utils": "flake-utils_23", + "nixpkgs": "nixpkgs_30" + }, + "locked": { + "lastModified": 1658567952, + "narHash": "sha256-XZ4ETYAMU7XcpEeAFP3NOl9yDXNuZAen/aIJ84G+VgA=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "60bb43d405991c1378baf15a40b5811a53e32ffa", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, + "nixTools": { + "flake": false, + "locked": { + "lastModified": 1644395812, + "narHash": "sha256-BVFk/BEsTLq5MMZvdy3ZYHKfaS3dHrsKh4+tb5t5b58=", + "owner": "input-output-hk", + "repo": "nix-tools", + "rev": "d847c63b99bbec78bf83be2a61dc9f09b8a9ccc1", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "nix-tools", + "type": "github" + } + }, + "nix_2": { + "inputs": { + "lowdown-src": "lowdown-src_2", + "nixpkgs": "nixpkgs_6", + "nixpkgs-regression": "nixpkgs-regression_2" + }, + "locked": { + "lastModified": 1643066034, + "narHash": "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg=", + "owner": "NixOS", + "repo": "nix", + "rev": "a1cd7e58606a41fcf62bf8637804cf8306f17f62", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "2.6.0", + "repo": "nix", + "type": "github" + } + }, + "nix_3": { + "inputs": { + "lowdown-src": "lowdown-src_3", + "nixpkgs": "nixpkgs_14", + "nixpkgs-regression": "nixpkgs-regression_3" + }, + "locked": { + "lastModified": 1661606874, + "narHash": "sha256-9+rpYzI+SmxJn+EbYxjGv68Ucp22bdFUSy/4LkHkkDQ=", + "owner": "NixOS", + "repo": "nix", + "rev": "11e45768b34fdafdcf019ddbd337afa16127ff0f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "2.11.0", + "repo": "nix", + "type": "github" + } + }, + "nix_4": { + "inputs": { + "lowdown-src": "lowdown-src_4", + "nixpkgs": "nixpkgs_34", + "nixpkgs-regression": "nixpkgs-regression_4" + }, + "locked": { + "lastModified": 1677045134, + "narHash": "sha256-jUc2ccTR8f6MGY2pUKgujm+lxSPNGm/ZAP+toX+nMNc=", + "owner": "NixOS", + "repo": "nix", + "rev": "4acc684ef7b3117c6d6ac12837398a0008a53d85", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "2.13.3", + "repo": "nix", + "type": "github" + } + }, "nixago": { + "inputs": { + "flake-utils": [ + "cardano-node", + "haskellNix", + "tullia", + "std", + "flake-utils" + ], + "nixago-exts": [ + "cardano-node", + "haskellNix", + "tullia", + "std", + "blank" + ], + "nixpkgs": [ + "cardano-node", + "haskellNix", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1661824785, + "narHash": "sha256-/PnwdWoO/JugJZHtDUioQp3uRiWeXHUdgvoyNbXesz8=", + "owner": "nix-community", + "repo": "nixago", + "rev": "8c1f9e5f1578d4b2ea989f618588d62a335083c3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixago", + "type": "github" + } + }, + "nixago_2": { + "inputs": { + "flake-utils": [ + "cardano-node", + "node-measured", + "cardano-automation", + "haskellNix", + "tullia", + "std", + "flake-utils" + ], + "nixago-exts": [ + "cardano-node", + "node-measured", + "cardano-automation", + "haskellNix", + "tullia", + "std", + "blank" + ], + "nixpkgs": [ + "cardano-node", + "node-measured", + "cardano-automation", + "haskellNix", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1661824785, + "narHash": "sha256-/PnwdWoO/JugJZHtDUioQp3uRiWeXHUdgvoyNbXesz8=", + "owner": "nix-community", + "repo": "nixago", + "rev": "8c1f9e5f1578d4b2ea989f618588d62a335083c3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixago", + "type": "github" + } + }, + "nixago_3": { + "inputs": { + "flake-utils": [ + "cardano-node", + "node-measured", + "cardano-automation", + "tullia", + "std", + "flake-utils" + ], + "nixago-exts": [ + "cardano-node", + "node-measured", + "cardano-automation", + "tullia", + "std", + "blank" + ], + "nixpkgs": [ + "cardano-node", + "node-measured", + "cardano-automation", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1661824785, + "narHash": "sha256-/PnwdWoO/JugJZHtDUioQp3uRiWeXHUdgvoyNbXesz8=", + "owner": "nix-community", + "repo": "nixago", + "rev": "8c1f9e5f1578d4b2ea989f618588d62a335083c3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixago", + "type": "github" + } + }, + "nixago_4": { + "inputs": { + "flake-utils": [ + "cardano-node", + "node-measured", + "haskellNix", + "tullia", + "std", + "flake-utils" + ], + "nixago-exts": [ + "cardano-node", + "node-measured", + "haskellNix", + "tullia", + "std", + "blank" + ], + "nixpkgs": [ + "cardano-node", + "node-measured", + "haskellNix", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1661824785, + "narHash": "sha256-/PnwdWoO/JugJZHtDUioQp3uRiWeXHUdgvoyNbXesz8=", + "owner": "nix-community", + "repo": "nixago", + "rev": "8c1f9e5f1578d4b2ea989f618588d62a335083c3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixago", + "type": "github" + } + }, + "nixago_5": { + "inputs": { + "flake-utils": [ + "cardano-node", + "node-measured", + "tullia", + "std", + "flake-utils" + ], + "nixago-exts": [ + "cardano-node", + "node-measured", + "tullia", + "std", + "blank" + ], + "nixpkgs": [ + "cardano-node", + "node-measured", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1661824785, + "narHash": "sha256-/PnwdWoO/JugJZHtDUioQp3uRiWeXHUdgvoyNbXesz8=", + "owner": "nix-community", + "repo": "nixago", + "rev": "8c1f9e5f1578d4b2ea989f618588d62a335083c3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixago", + "type": "github" + } + }, + "nixago_6": { + "inputs": { + "flake-utils": [ + "cardano-node", + "tullia", + "std", + "flake-utils" + ], + "nixago-exts": [ + "cardano-node", + "tullia", + "std", + "blank" + ], + "nixpkgs": [ + "cardano-node", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1661824785, + "narHash": "sha256-/PnwdWoO/JugJZHtDUioQp3uRiWeXHUdgvoyNbXesz8=", + "owner": "nix-community", + "repo": "nixago", + "rev": "8c1f9e5f1578d4b2ea989f618588d62a335083c3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixago", + "type": "github" + } + }, + "nixago_7": { "inputs": { "flake-utils": [ "daedalus", @@ -345,16 +4195,382 @@ }, "nixpkgs": { "locked": { - "lastModified": 1653581809, - "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", + "lastModified": 1642336556, + "narHash": "sha256-QSPPbFEwy0T0DrIuSzAACkaANPQaR1lZR/nHZGz9z04=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", + "rev": "f3d9d4bd898cca7d04af2ae4f6ef01f2219df3d6", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs-2003": { + "locked": { + "lastModified": 1620055814, + "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-20.03-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2003_2": { + "locked": { + "lastModified": 1620055814, + "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-20.03-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2003_3": { + "locked": { + "lastModified": 1620055814, + "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-20.03-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2003_4": { + "locked": { + "lastModified": 1620055814, + "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-20.03-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2003_5": { + "locked": { + "lastModified": 1620055814, + "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-20.03-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2003_6": { + "locked": { + "lastModified": 1620055814, + "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-20.03-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2105": { + "locked": { + "lastModified": 1659914493, + "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-21.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2105_2": { + "locked": { + "lastModified": 1659914493, + "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-21.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2105_3": { + "locked": { + "lastModified": 1659914493, + "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-21.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2105_4": { + "locked": { + "lastModified": 1640283157, + "narHash": "sha256-6Ddfop+rKE+Gl9Tjp9YIrkfoYPzb8F80ergdjcq3/MY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "dde1557825c5644c869c5efc7448dc03722a8f09", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-21.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2105_5": { + "locked": { + "lastModified": 1640283157, + "narHash": "sha256-6Ddfop+rKE+Gl9Tjp9YIrkfoYPzb8F80ergdjcq3/MY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "dde1557825c5644c869c5efc7448dc03722a8f09", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-21.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2105_6": { + "locked": { + "lastModified": 1630481079, + "narHash": "sha256-leWXLchbAbqOlLT6tju631G40SzQWPqaAXQG3zH1Imw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "110a2c9ebbf5d4a94486854f18a37a938cfacbbb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-21.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2111": { + "locked": { + "lastModified": 1659446231, + "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-21.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2111_2": { + "locked": { + "lastModified": 1659446231, + "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-21.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2111_3": { + "locked": { + "lastModified": 1659446231, + "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-21.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2111_4": { + "locked": { + "lastModified": 1640283207, + "narHash": "sha256-SCwl7ZnCfMDsuSYvwIroiAlk7n33bW8HFfY8NvKhcPA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "64c7e3388bbd9206e437713351e814366e0c3284", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-21.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2111_5": { + "locked": { + "lastModified": 1640283207, + "narHash": "sha256-SCwl7ZnCfMDsuSYvwIroiAlk7n33bW8HFfY8NvKhcPA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "64c7e3388bbd9206e437713351e814366e0c3284", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-21.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2111_6": { + "locked": { + "lastModified": 1638410074, + "narHash": "sha256-MQYI4k4XkoTzpeRjq5wl+1NShsl1CKq8MISFuZ81sWs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5b80f23502f8e902612a8c631dfce383e1c56596", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-21.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2205": { + "locked": { + "lastModified": 1672580127, + "narHash": "sha256-3lW3xZslREhJogoOkjeZtlBtvFMyxHku7I/9IVehhT8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0874168639713f547c05947c76124f78441ea46c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-22.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2205_2": { + "locked": { + "lastModified": 1663981975, + "narHash": "sha256-TKaxWAVJR+a5JJauKZqibmaM5e/Pi5tBDx9s8fl/kSE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "309faedb8338d3ae8ad8f1043b3ccf48c9cc2970", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-22.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2205_3": { + "locked": { + "lastModified": 1672580127, + "narHash": "sha256-3lW3xZslREhJogoOkjeZtlBtvFMyxHku7I/9IVehhT8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0874168639713f547c05947c76124f78441ea46c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-22.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2211": { + "locked": { + "lastModified": 1675730325, + "narHash": "sha256-uNvD7fzO5hNlltNQUAFBPlcEjNG5Gkbhl/ROiX+GZU4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b7ce17b1ebf600a72178f6302c77b6382d09323f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-22.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2211_2": { + "locked": { + "lastModified": 1675730325, + "narHash": "sha256-uNvD7fzO5hNlltNQUAFBPlcEjNG5Gkbhl/ROiX+GZU4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b7ce17b1ebf600a72178f6302c77b6382d09323f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-22.11-darwin", "repo": "nixpkgs", "type": "github" } @@ -375,6 +4591,149 @@ "type": "github" } }, + "nixpkgs-regression_2": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "indirect" + } + }, + "nixpkgs-regression_3": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, + "nixpkgs-regression_4": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1675758091, + "narHash": "sha256-7gFSQbSVAFUHtGCNHPF7mPc5CcqDk9M2+inlVPZSneg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "747927516efcb5e31ba03b7ff32f61f6d47e7d87", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable_2": { + "locked": { + "lastModified": 1663905476, + "narHash": "sha256-0CSwRKaYravh9v6qSlBpM0gNg0UhKT2lL7Yn6Zbx7UM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e14f9fb57315f0d4abde222364f19f88c77d2b79", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable_3": { + "locked": { + "lastModified": 1675758091, + "narHash": "sha256-7gFSQbSVAFUHtGCNHPF7mPc5CcqDk9M2+inlVPZSneg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "747927516efcb5e31ba03b7ff32f61f6d47e7d87", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable_4": { + "locked": { + "lastModified": 1641285291, + "narHash": "sha256-KYaOBNGar3XWTxTsYPr9P6u74KAqNq0wobEC236U+0c=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0432195a4b8d68faaa7d3d4b355260a3120aeeae", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable_5": { + "locked": { + "lastModified": 1641285291, + "narHash": "sha256-KYaOBNGar3XWTxTsYPr9P6u74KAqNq0wobEC236U+0c=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0432195a4b8d68faaa7d3d4b355260a3120aeeae", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable_6": { + "locked": { + "lastModified": 1635295995, + "narHash": "sha256-sGYiXjFlxTTMNb4NSkgvX+knOOTipE6gqwPUQpxNF+c=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "22a500a3f87bbce73bd8d777ef920b43a636f018", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgsUnstable": { "locked": { "lastModified": 1689679375, @@ -391,7 +4750,23 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_10": { + "locked": { + "lastModified": 1653581809, + "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -406,23 +4781,7 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1653920503, - "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "a634c8f6c1fbf9b9730e01764999666f3436f10a", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-22.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { + "nixpkgs_12": { "locked": { "lastModified": 1665087388, "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", @@ -438,7 +4797,362 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_13": { + "locked": { + "lastModified": 1642336556, + "narHash": "sha256-QSPPbFEwy0T0DrIuSzAACkaANPQaR1lZR/nHZGz9z04=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f3d9d4bd898cca7d04af2ae4f6ef01f2219df3d6", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_14": { + "locked": { + "lastModified": 1657693803, + "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.05-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_15": { + "locked": { + "lastModified": 1653581809, + "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_16": { + "locked": { + "lastModified": 1654807842, + "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_17": { + "locked": { + "lastModified": 1665087388, + "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_18": { + "locked": { + "lastModified": 1654807842, + "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_19": { + "locked": { + "lastModified": 1653581809, + "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1657693803, + "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.05-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_20": { + "locked": { + "lastModified": 1654807842, + "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_21": { + "locked": { + "lastModified": 1674407282, + "narHash": "sha256-2qwc8mrPINSFdWffPK+ji6nQ9aGnnZyHSItVcYDZDlk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ab1254087f4cdf4af74b552d7fc95175d9bdbb49", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_22": { + "locked": { + "lastModified": 1665087388, + "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_23": { + "locked": { + "lastModified": 1642336556, + "narHash": "sha256-QSPPbFEwy0T0DrIuSzAACkaANPQaR1lZR/nHZGz9z04=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f3d9d4bd898cca7d04af2ae4f6ef01f2219df3d6", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_24": { + "locked": { + "lastModified": 1642336556, + "narHash": "sha256-QSPPbFEwy0T0DrIuSzAACkaANPQaR1lZR/nHZGz9z04=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f3d9d4bd898cca7d04af2ae4f6ef01f2219df3d6", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_25": { + "locked": { + "lastModified": 1653581809, + "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_26": { + "locked": { + "lastModified": 1654807842, + "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_27": { + "locked": { + "lastModified": 1674407282, + "narHash": "sha256-2qwc8mrPINSFdWffPK+ji6nQ9aGnnZyHSItVcYDZDlk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ab1254087f4cdf4af74b552d7fc95175d9bdbb49", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_28": { + "locked": { + "lastModified": 1665087388, + "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_29": { + "locked": { + "lastModified": 1653581809, + "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1653581809, + "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_30": { + "locked": { + "lastModified": 1654807842, + "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_31": { + "locked": { + "lastModified": 1653920503, + "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "a634c8f6c1fbf9b9730e01764999666f3436f10a", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-22.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_32": { + "locked": { + "lastModified": 1665087388, + "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_33": { + "locked": { + "lastModified": 1691003216, + "narHash": "sha256-Qq/MPkhS12Bl0X060pPvX3v9ac3f2rRQfHjjozPh/Qs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4a56ce9727a0c5478a836a0d8a8f641c5b9a3d5f", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_34": { "locked": { "lastModified": 1670461440, "narHash": "sha256-jy1LB8HOMKGJEGXgzFRLDU1CBGL0/LlkolgnqIsF0D8=", @@ -454,7 +5168,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_35": { "locked": { "lastModified": 1689680872, "narHash": "sha256-brNix2+ihJSzCiKwLafbyejrHJZUP0Fy6z5+xMOC27M=", @@ -470,39 +5184,874 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1654807842, + "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1665087388, + "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1632864508, + "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-21.05-small", + "type": "indirect" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1653581809, + "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1654807842, + "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { + "locked": { + "lastModified": 1665087388, + "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "node-measured": { + "inputs": { + "CHaP": "CHaP_2", + "cardano-automation": "cardano-automation", + "cardano-mainnet-mirror": "cardano-mainnet-mirror_2", + "customConfig": "customConfig_2", + "em": "em", + "empty-flake": "empty-flake", + "flake-compat": "flake-compat_7", + "hackageNix": "hackageNix_2", + "haskellNix": "haskellNix_3", + "hostNixpkgs": [ + "cardano-node", + "node-measured", + "nixpkgs" + ], + "iohkNix": "iohkNix_2", + "nix2container": "nix2container_5", + "nixpkgs": [ + "cardano-node", + "node-measured", + "haskellNix", + "nixpkgs-unstable" + ], + "ops-lib": "ops-lib", + "plutus-apps": "plutus-apps", + "std": [ + "cardano-node", + "node-measured", + "tullia", + "std" + ], + "tullia": "tullia_5", + "utils": "utils_6" + }, + "locked": { + "lastModified": 1679934872, + "narHash": "sha256-JRVDjjtVCLoslEnfMn39P3waDUCJMjxaUha4ocUhRx4=", + "owner": "input-output-hk", + "repo": "cardano-node", + "rev": "fdbc87249ce22e18109d7f5a9d7f432a6f653367", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "cardano-node", + "type": "github" + } + }, + "node-process": { + "flake": false, + "locked": { + "lastModified": 1648681325, + "narHash": "sha256-6oWDYmMb+V4x0jCoYDzKfBJMpr7Mx5zA3WMpNHspuSw=", + "owner": "input-output-hk", + "repo": "cardano-node", + "rev": "78675fbf8986c87c0d2356b727a0ec2060f1adba", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "cardano-node", + "type": "github" + } + }, + "node-snapshot": { + "inputs": { + "customConfig": "customConfig_3", + "haskellNix": "haskellNix_4", + "iohkNix": "iohkNix_3", + "membench": "membench", + "nixpkgs": [ + "cardano-node", + "node-snapshot", + "haskellNix", + "nixpkgs-2105" + ], + "plutus-example": "plutus-example", + "utils": "utils_9" + }, + "locked": { + "lastModified": 1645120669, + "narHash": "sha256-2MKfGsYS5n69+pfqNHb4IH/E95ok1MD7mhEYfUpRcz4=", + "owner": "input-output-hk", + "repo": "cardano-node", + "rev": "7f00e3ea5a61609e19eeeee4af35241571efdf5c", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "cardano-node", + "rev": "7f00e3ea5a61609e19eeeee4af35241571efdf5c", + "type": "github" + } + }, + "nosys": { + "locked": { + "lastModified": 1667881534, + "narHash": "sha256-FhwJ15uPLRsvaxtt/bNuqE/ykMpNAPF0upozFKhTtXM=", + "owner": "divnix", + "repo": "nosys", + "rev": "2d0d5207f6a230e9d0f660903f8db9807b54814f", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "nosys", + "type": "github" + } + }, + "nosys_2": { + "locked": { + "lastModified": 1667881534, + "narHash": "sha256-FhwJ15uPLRsvaxtt/bNuqE/ykMpNAPF0upozFKhTtXM=", + "owner": "divnix", + "repo": "nosys", + "rev": "2d0d5207f6a230e9d0f660903f8db9807b54814f", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "nosys", + "type": "github" + } + }, + "nosys_3": { + "locked": { + "lastModified": 1667881534, + "narHash": "sha256-FhwJ15uPLRsvaxtt/bNuqE/ykMpNAPF0upozFKhTtXM=", + "owner": "divnix", + "repo": "nosys", + "rev": "2d0d5207f6a230e9d0f660903f8db9807b54814f", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "nosys", + "type": "github" + } + }, + "nosys_4": { + "locked": { + "lastModified": 1667881534, + "narHash": "sha256-FhwJ15uPLRsvaxtt/bNuqE/ykMpNAPF0upozFKhTtXM=", + "owner": "divnix", + "repo": "nosys", + "rev": "2d0d5207f6a230e9d0f660903f8db9807b54814f", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "nosys", + "type": "github" + } + }, + "old-ghc-nix": { + "flake": false, + "locked": { + "lastModified": 1631092763, + "narHash": "sha256-sIKgO+z7tj4lw3u6oBZxqIhDrzSkvpHtv0Kki+lh9Fg=", + "owner": "angerman", + "repo": "old-ghc-nix", + "rev": "af48a7a7353e418119b6dfe3cd1463a657f342b8", + "type": "github" + }, + "original": { + "owner": "angerman", + "ref": "master", + "repo": "old-ghc-nix", + "type": "github" + } + }, + "old-ghc-nix_2": { + "flake": false, + "locked": { + "lastModified": 1631092763, + "narHash": "sha256-sIKgO+z7tj4lw3u6oBZxqIhDrzSkvpHtv0Kki+lh9Fg=", + "owner": "angerman", + "repo": "old-ghc-nix", + "rev": "af48a7a7353e418119b6dfe3cd1463a657f342b8", + "type": "github" + }, + "original": { + "owner": "angerman", + "ref": "master", + "repo": "old-ghc-nix", + "type": "github" + } + }, + "old-ghc-nix_3": { + "flake": false, + "locked": { + "lastModified": 1631092763, + "narHash": "sha256-sIKgO+z7tj4lw3u6oBZxqIhDrzSkvpHtv0Kki+lh9Fg=", + "owner": "angerman", + "repo": "old-ghc-nix", + "rev": "af48a7a7353e418119b6dfe3cd1463a657f342b8", + "type": "github" + }, + "original": { + "owner": "angerman", + "ref": "master", + "repo": "old-ghc-nix", + "type": "github" + } + }, + "old-ghc-nix_4": { + "flake": false, + "locked": { + "lastModified": 1631092763, + "narHash": "sha256-sIKgO+z7tj4lw3u6oBZxqIhDrzSkvpHtv0Kki+lh9Fg=", + "owner": "angerman", + "repo": "old-ghc-nix", + "rev": "af48a7a7353e418119b6dfe3cd1463a657f342b8", + "type": "github" + }, + "original": { + "owner": "angerman", + "ref": "master", + "repo": "old-ghc-nix", + "type": "github" + } + }, + "old-ghc-nix_5": { + "flake": false, + "locked": { + "lastModified": 1631092763, + "narHash": "sha256-sIKgO+z7tj4lw3u6oBZxqIhDrzSkvpHtv0Kki+lh9Fg=", + "owner": "angerman", + "repo": "old-ghc-nix", + "rev": "af48a7a7353e418119b6dfe3cd1463a657f342b8", + "type": "github" + }, + "original": { + "owner": "angerman", + "ref": "master", + "repo": "old-ghc-nix", + "type": "github" + } + }, + "old-ghc-nix_6": { + "flake": false, + "locked": { + "lastModified": 1631092763, + "narHash": "sha256-sIKgO+z7tj4lw3u6oBZxqIhDrzSkvpHtv0Kki+lh9Fg=", + "owner": "angerman", + "repo": "old-ghc-nix", + "rev": "af48a7a7353e418119b6dfe3cd1463a657f342b8", + "type": "github" + }, + "original": { + "owner": "angerman", + "ref": "master", + "repo": "old-ghc-nix", + "type": "github" + } + }, + "ops-lib": { + "flake": false, + "locked": { + "lastModified": 1675186784, + "narHash": "sha256-HqDtrvk1l7YeREzCSEpUtChtlEgT6Tww9WrJiozjukc=", + "owner": "input-output-hk", + "repo": "ops-lib", + "rev": "5be29ed53b2a4cbbf4cf326fa2e9c1f2b754d26d", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "ops-lib", + "type": "github" + } + }, + "ouroboros-network": { + "flake": false, + "locked": { + "lastModified": 1643385024, + "narHash": "sha256-9R4Z1jBsTcEgBHxhzjCJnroEcdfMsTjf8kwg6uPue+Q=", + "owner": "input-output-hk", + "repo": "ouroboros-network", + "rev": "8e97076176d465f5f4f86d5b5596220272630649", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "ouroboros-network", + "type": "github" + } + }, + "ouroboros-network_2": { + "flake": false, + "locked": { + "lastModified": 1643385024, + "narHash": "sha256-9R4Z1jBsTcEgBHxhzjCJnroEcdfMsTjf8kwg6uPue+Q=", + "owner": "input-output-hk", + "repo": "ouroboros-network", + "rev": "8e97076176d465f5f4f86d5b5596220272630649", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "ouroboros-network", + "type": "github" + } + }, + "plutus-apps": { + "flake": false, + "locked": { + "lastModified": 1675109201, + "narHash": "sha256-uS/9cicIpb3fCTL3R/7Y0gX0zF4QfRx/MWJ1m1hACIM=", + "owner": "input-output-hk", + "repo": "plutus-apps", + "rev": "15467f28b19a12284f1fd086240181e62d934f0c", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "plutus-apps", + "type": "github" + } + }, + "plutus-apps_2": { + "flake": false, + "locked": { + "lastModified": 1668055541, + "narHash": "sha256-c0XuranD91kZ7uR0gemZQOFDNRv3pFXunJC4j064mtc=", + "owner": "input-output-hk", + "repo": "plutus-apps", + "rev": "1651d36a0f6458e7d2326d57dbc1baa00034d70d", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "plutus-apps", + "type": "github" + } + }, + "plutus-example": { + "inputs": { + "customConfig": "customConfig_5", + "haskellNix": "haskellNix_6", + "iohkNix": "iohkNix_5", + "nixpkgs": [ + "cardano-node", + "node-snapshot", + "plutus-example", + "haskellNix", + "nixpkgs-2105" + ], + "utils": "utils_8" + }, + "locked": { + "lastModified": 1640022647, + "narHash": "sha256-M+YnF7Zj/7QK2pu0T75xNVaX0eEeijtBH8yz+jEHIMM=", + "owner": "input-output-hk", + "repo": "cardano-node", + "rev": "814df2c146f5d56f8c35a681fe75e85b905aed5d", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "cardano-node", + "rev": "814df2c146f5d56f8c35a681fe75e85b905aed5d", + "type": "github" + } + }, "root": { "inputs": { + "cardano-node": "cardano-node", "daedalus": "daedalus", - "nix": "nix", - "nixpkgs": "nixpkgs_6", + "iohkNix": "iohkNix_6", + "nix": "nix_4", + "nixpkgs": "nixpkgs_35", "nixpkgsUnstable": "nixpkgsUnstable", - "utils": "utils_2" + "utils": "utils_13" + } + }, + "stackage": { + "flake": false, + "locked": { + "lastModified": 1679875779, + "narHash": "sha256-7wbjEda9vWy6ZBGwa1MEP+T6Qk6z/zGJH/y9S7bf8mI=", + "owner": "input-output-hk", + "repo": "stackage.nix", + "rev": "18a9ebec4be38d78062f0bf6ac0f9d2b63cf5960", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "stackage.nix", + "type": "github" + } + }, + "stackage_2": { + "flake": false, + "locked": { + "lastModified": 1667610757, + "narHash": "sha256-H4dlMk5EW50xOtGo+5Srm3HGQV1+hY9ttgRQ+Sew5uA=", + "owner": "input-output-hk", + "repo": "stackage.nix", + "rev": "01d8ea53f65b08910003a1990547bab75ed6068a", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "stackage.nix", + "type": "github" + } + }, + "stackage_3": { + "flake": false, + "locked": { + "lastModified": 1679702948, + "narHash": "sha256-3v6EVGga1QZ+hVeiomAXhqRhSZqboQRMZ0C7Ypb0U/s=", + "owner": "input-output-hk", + "repo": "stackage.nix", + "rev": "6ec27bb501b2885765a6a58843d884e13ac42d69", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "stackage.nix", + "type": "github" + } + }, + "stackage_4": { + "flake": false, + "locked": { + "lastModified": 1643073493, + "narHash": "sha256-5cPd1+i/skvJY9vJO1BhVRPcJObqkxDSywBEppDmb1U=", + "owner": "input-output-hk", + "repo": "stackage.nix", + "rev": "48e1188855ca38f3b7e2a8dba5352767a2f0a8f7", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "stackage.nix", + "type": "github" + } + }, + "stackage_5": { + "flake": false, + "locked": { + "lastModified": 1643073493, + "narHash": "sha256-5cPd1+i/skvJY9vJO1BhVRPcJObqkxDSywBEppDmb1U=", + "owner": "input-output-hk", + "repo": "stackage.nix", + "rev": "48e1188855ca38f3b7e2a8dba5352767a2f0a8f7", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "stackage.nix", + "type": "github" + } + }, + "stackage_6": { + "flake": false, + "locked": { + "lastModified": 1639012797, + "narHash": "sha256-hiLyBa5XFBvxD+BcYPKyYd/0dNMccxAuywFNqYtIIvs=", + "owner": "input-output-hk", + "repo": "stackage.nix", + "rev": "9ea6ea359da91c75a71e334b25aa7dc5ddc4b2c6", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "stackage.nix", + "type": "github" } }, "std": { "inputs": { - "blank": "blank", - "devshell": "devshell", - "dmerge": "dmerge", - "flake-utils": "flake-utils_2", - "makes": [ - "daedalus", + "arion": [ + "cardano-node", + "haskellNix", + "tullia", + "std", + "blank" + ], + "blank": "blank", + "devshell": "devshell", + "dmerge": "dmerge", + "flake-utils": "flake-utils_3", + "incl": "incl", + "makes": [ + "cardano-node", + "haskellNix", "tullia", "std", "blank" ], - "mdbook-kroki-preprocessor": "mdbook-kroki-preprocessor", "microvm": [ - "daedalus", + "cardano-node", + "haskellNix", "tullia", "std", "blank" ], "n2c": "n2c", "nixago": "nixago", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", + "nosys": "nosys", "yants": "yants" }, + "locked": { + "lastModified": 1674526466, + "narHash": "sha256-tMTaS0bqLx6VJ+K+ZT6xqsXNpzvSXJTmogkraBGzymg=", + "owner": "divnix", + "repo": "std", + "rev": "516387e3d8d059b50e742a2ff1909ed3c8f82826", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "std", + "type": "github" + } + }, + "std_2": { + "inputs": { + "blank": "blank_2", + "devshell": "devshell_2", + "dmerge": "dmerge_2", + "flake-utils": "flake-utils_7", + "makes": [ + "cardano-node", + "node-measured", + "cardano-automation", + "haskellNix", + "tullia", + "std", + "blank" + ], + "mdbook-kroki-preprocessor": "mdbook-kroki-preprocessor", + "microvm": [ + "cardano-node", + "node-measured", + "cardano-automation", + "haskellNix", + "tullia", + "std", + "blank" + ], + "n2c": "n2c_2", + "nixago": "nixago_2", + "nixpkgs": "nixpkgs_9", + "yants": "yants_2" + }, + "locked": { + "lastModified": 1665513321, + "narHash": "sha256-D6Pacw9yf/HMs84KYuCxHXnNDL7v43gtcka5URagFqE=", + "owner": "divnix", + "repo": "std", + "rev": "94a90eedb9cfc115b12ae8f6622d9904788559e4", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "std", + "type": "github" + } + }, + "std_3": { + "inputs": { + "blank": "blank_3", + "devshell": "devshell_3", + "dmerge": "dmerge_3", + "flake-utils": "flake-utils_10", + "makes": [ + "cardano-node", + "node-measured", + "cardano-automation", + "tullia", + "std", + "blank" + ], + "mdbook-kroki-preprocessor": "mdbook-kroki-preprocessor_2", + "microvm": [ + "cardano-node", + "node-measured", + "cardano-automation", + "tullia", + "std", + "blank" + ], + "n2c": "n2c_3", + "nixago": "nixago_3", + "nixpkgs": "nixpkgs_12", + "yants": "yants_3" + }, + "locked": { + "lastModified": 1665513321, + "narHash": "sha256-D6Pacw9yf/HMs84KYuCxHXnNDL7v43gtcka5URagFqE=", + "owner": "divnix", + "repo": "std", + "rev": "94a90eedb9cfc115b12ae8f6622d9904788559e4", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "std", + "type": "github" + } + }, + "std_4": { + "inputs": { + "arion": [ + "cardano-node", + "node-measured", + "haskellNix", + "tullia", + "std", + "blank" + ], + "blank": "blank_4", + "devshell": "devshell_4", + "dmerge": "dmerge_4", + "flake-utils": "flake-utils_14", + "incl": "incl_2", + "makes": [ + "cardano-node", + "node-measured", + "haskellNix", + "tullia", + "std", + "blank" + ], + "microvm": [ + "cardano-node", + "node-measured", + "haskellNix", + "tullia", + "std", + "blank" + ], + "n2c": "n2c_4", + "nixago": "nixago_4", + "nixpkgs": "nixpkgs_17", + "nosys": "nosys_2", + "yants": "yants_4" + }, + "locked": { + "lastModified": 1674526466, + "narHash": "sha256-tMTaS0bqLx6VJ+K+ZT6xqsXNpzvSXJTmogkraBGzymg=", + "owner": "divnix", + "repo": "std", + "rev": "516387e3d8d059b50e742a2ff1909ed3c8f82826", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "std", + "type": "github" + } + }, + "std_5": { + "inputs": { + "arion": [ + "cardano-node", + "node-measured", + "tullia", + "std", + "blank" + ], + "blank": "blank_5", + "devshell": "devshell_5", + "dmerge": "dmerge_5", + "flake-utils": "flake-utils_17", + "incl": "incl_3", + "makes": [ + "cardano-node", + "node-measured", + "tullia", + "std", + "blank" + ], + "microvm": [ + "cardano-node", + "node-measured", + "tullia", + "std", + "blank" + ], + "n2c": "n2c_5", + "nixago": "nixago_5", + "nixpkgs": "nixpkgs_22", + "nosys": "nosys_3", + "yants": "yants_5" + }, + "locked": { + "lastModified": 1674526466, + "narHash": "sha256-tMTaS0bqLx6VJ+K+ZT6xqsXNpzvSXJTmogkraBGzymg=", + "owner": "divnix", + "repo": "std", + "rev": "516387e3d8d059b50e742a2ff1909ed3c8f82826", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "std", + "type": "github" + } + }, + "std_6": { + "inputs": { + "arion": [ + "cardano-node", + "tullia", + "std", + "blank" + ], + "blank": "blank_6", + "devshell": "devshell_6", + "dmerge": "dmerge_6", + "flake-utils": "flake-utils_22", + "incl": "incl_4", + "makes": [ + "cardano-node", + "tullia", + "std", + "blank" + ], + "microvm": [ + "cardano-node", + "tullia", + "std", + "blank" + ], + "n2c": "n2c_6", + "nixago": "nixago_6", + "nixpkgs": "nixpkgs_28", + "nosys": "nosys_4", + "yants": "yants_6" + }, + "locked": { + "lastModified": 1674526466, + "narHash": "sha256-tMTaS0bqLx6VJ+K+ZT6xqsXNpzvSXJTmogkraBGzymg=", + "owner": "divnix", + "repo": "std", + "rev": "516387e3d8d059b50e742a2ff1909ed3c8f82826", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "std", + "type": "github" + } + }, + "std_7": { + "inputs": { + "blank": "blank_7", + "devshell": "devshell_7", + "dmerge": "dmerge_7", + "flake-utils": "flake-utils_24", + "makes": [ + "daedalus", + "tullia", + "std", + "blank" + ], + "mdbook-kroki-preprocessor": "mdbook-kroki-preprocessor_3", + "microvm": [ + "daedalus", + "tullia", + "std", + "blank" + ], + "n2c": "n2c_7", + "nixago": "nixago_7", + "nixpkgs": "nixpkgs_32", + "yants": "yants_7" + }, "locked": { "lastModified": 1665513321, "narHash": "sha256-D6Pacw9yf/HMs84KYuCxHXnNDL7v43gtcka5URagFqE=", @@ -536,9 +6085,155 @@ "inputs": { "nix-nomad": "nix-nomad", "nix2container": "nix2container", - "nixpkgs": "nixpkgs_3", + "nixpkgs": [ + "cardano-node", + "haskellNix", + "nixpkgs" + ], "std": "std" }, + "locked": { + "lastModified": 1675695930, + "narHash": "sha256-B7rEZ/DBUMlK1AcJ9ajnAPPxqXY6zW2SBX+51bZV0Ac=", + "owner": "input-output-hk", + "repo": "tullia", + "rev": "621365f2c725608f381b3ad5b57afef389fd4c31", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "tullia", + "type": "github" + } + }, + "tullia_2": { + "inputs": { + "nix-nomad": "nix-nomad_2", + "nix2container": "nix2container_2", + "nixpkgs": [ + "cardano-node", + "node-measured", + "cardano-automation", + "haskellNix", + "nixpkgs" + ], + "std": "std_2" + }, + "locked": { + "lastModified": 1666200256, + "narHash": "sha256-cJPS8zBu30SMhxMe7I8DWutwqMuhPsEez87y9gxMKc4=", + "owner": "input-output-hk", + "repo": "tullia", + "rev": "575362c2244498e8d2c97f72861510fa72e75d44", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "tullia", + "type": "github" + } + }, + "tullia_3": { + "inputs": { + "nix-nomad": "nix-nomad_3", + "nix2container": "nix2container_3", + "nixpkgs": [ + "cardano-node", + "node-measured", + "cardano-automation", + "nixpkgs" + ], + "std": "std_3" + }, + "locked": { + "lastModified": 1668711738, + "narHash": "sha256-CBjky16o9pqsGE1bWu6nRlRajgSXMEk+yaFQLibqXcE=", + "owner": "input-output-hk", + "repo": "tullia", + "rev": "ead1f515c251f0e060060ef0e2356a51d3dfe4b0", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "tullia", + "type": "github" + } + }, + "tullia_4": { + "inputs": { + "nix-nomad": "nix-nomad_4", + "nix2container": "nix2container_4", + "nixpkgs": [ + "cardano-node", + "node-measured", + "haskellNix", + "nixpkgs" + ], + "std": "std_4" + }, + "locked": { + "lastModified": 1675695930, + "narHash": "sha256-B7rEZ/DBUMlK1AcJ9ajnAPPxqXY6zW2SBX+51bZV0Ac=", + "owner": "input-output-hk", + "repo": "tullia", + "rev": "621365f2c725608f381b3ad5b57afef389fd4c31", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "tullia", + "type": "github" + } + }, + "tullia_5": { + "inputs": { + "nix-nomad": "nix-nomad_5", + "nix2container": "nix2container_6", + "nixpkgs": "nixpkgs_21", + "std": "std_5" + }, + "locked": { + "lastModified": 1675695930, + "narHash": "sha256-B7rEZ/DBUMlK1AcJ9ajnAPPxqXY6zW2SBX+51bZV0Ac=", + "owner": "input-output-hk", + "repo": "tullia", + "rev": "621365f2c725608f381b3ad5b57afef389fd4c31", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "tullia", + "type": "github" + } + }, + "tullia_6": { + "inputs": { + "nix-nomad": "nix-nomad_6", + "nix2container": "nix2container_7", + "nixpkgs": "nixpkgs_27", + "std": "std_6" + }, + "locked": { + "lastModified": 1675695930, + "narHash": "sha256-B7rEZ/DBUMlK1AcJ9ajnAPPxqXY6zW2SBX+51bZV0Ac=", + "owner": "input-output-hk", + "repo": "tullia", + "rev": "621365f2c725608f381b3ad5b57afef389fd4c31", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "tullia", + "type": "github" + } + }, + "tullia_7": { + "inputs": { + "nix-nomad": "nix-nomad_7", + "nix2container": "nix2container_8", + "nixpkgs": "nixpkgs_31", + "std": "std_7" + }, "locked": { "lastModified": 1668711738, "narHash": "sha256-CBjky16o9pqsGE1bWu6nRlRajgSXMEk+yaFQLibqXcE=", @@ -568,7 +6263,52 @@ "type": "github" } }, - "utils_2": { + "utils_10": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_11": { + "locked": { + "lastModified": 1623875721, + "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_12": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_13": { "inputs": { "systems": "systems" }, @@ -586,7 +6326,274 @@ "type": "github" } }, + "utils_2": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_3": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_4": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_5": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "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" + } + }, + "utils_7": { + "locked": { + "lastModified": 1623875721, + "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_8": { + "locked": { + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_9": { + "locked": { + "lastModified": 1623875721, + "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "yants": { + "inputs": { + "nixpkgs": [ + "cardano-node", + "haskellNix", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1667096281, + "narHash": "sha256-wRRec6ze0gJHmGn6m57/zhz/Kdvp9HS4Nl5fkQ+uIuA=", + "owner": "divnix", + "repo": "yants", + "rev": "d18f356ec25cb94dc9c275870c3a7927a10f8c3c", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "yants", + "type": "github" + } + }, + "yants_2": { + "inputs": { + "nixpkgs": [ + "cardano-node", + "node-measured", + "cardano-automation", + "haskellNix", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660507851, + "narHash": "sha256-BKjq7JnVuUR/xDtcv6Vm9GYGKAblisXrAgybor9hT/s=", + "owner": "divnix", + "repo": "yants", + "rev": "0b895ca02a8fa72bad50b454cb3e7d8a66407c96", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "yants", + "type": "github" + } + }, + "yants_3": { + "inputs": { + "nixpkgs": [ + "cardano-node", + "node-measured", + "cardano-automation", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660507851, + "narHash": "sha256-BKjq7JnVuUR/xDtcv6Vm9GYGKAblisXrAgybor9hT/s=", + "owner": "divnix", + "repo": "yants", + "rev": "0b895ca02a8fa72bad50b454cb3e7d8a66407c96", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "yants", + "type": "github" + } + }, + "yants_4": { + "inputs": { + "nixpkgs": [ + "cardano-node", + "node-measured", + "haskellNix", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1667096281, + "narHash": "sha256-wRRec6ze0gJHmGn6m57/zhz/Kdvp9HS4Nl5fkQ+uIuA=", + "owner": "divnix", + "repo": "yants", + "rev": "d18f356ec25cb94dc9c275870c3a7927a10f8c3c", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "yants", + "type": "github" + } + }, + "yants_5": { + "inputs": { + "nixpkgs": [ + "cardano-node", + "node-measured", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1667096281, + "narHash": "sha256-wRRec6ze0gJHmGn6m57/zhz/Kdvp9HS4Nl5fkQ+uIuA=", + "owner": "divnix", + "repo": "yants", + "rev": "d18f356ec25cb94dc9c275870c3a7927a10f8c3c", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "yants", + "type": "github" + } + }, + "yants_6": { + "inputs": { + "nixpkgs": [ + "cardano-node", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1667096281, + "narHash": "sha256-wRRec6ze0gJHmGn6m57/zhz/Kdvp9HS4Nl5fkQ+uIuA=", + "owner": "divnix", + "repo": "yants", + "rev": "d18f356ec25cb94dc9c275870c3a7927a10f8c3c", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "yants", + "type": "github" + } + }, + "yants_7": { "inputs": { "nixpkgs": [ "daedalus", diff --git a/flake.nix b/flake.nix index 94f1bc7..26293bb 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,9 @@ description = "mio-ops deployment"; inputs = { + cardano-node.url = "github:input-output-hk/cardano-node/?ref=1.35.7"; daedalus.url = "github:input-output-hk/daedalus/?ref=5.2.0"; + iohkNix.url = "github:input-output-hk/iohk-nix/?ref=df1da282f996ec46b33379407df99613a1fbafdd"; nix.url = "github:NixOS/nix/?ref=2.13.3"; nixpkgs.url = github:NixOS/nixpkgs/?ref=nixos-23.05; nixpkgsUnstable.url = github:NixOS/nixpkgs/?ref=nixos-unstable; diff --git a/profiles/cardano-node.nix b/profiles/cardano-node.nix index 3af4472..ec52b3a 100644 --- a/profiles/cardano-node.nix +++ b/profiles/cardano-node.nix @@ -3,15 +3,15 @@ config, pkgs, lib, + cardano-node, + iohkNix, ... }: let - sources = import ../nix/sources.nix; - cardanoNodeProject = import (sources.cardano-node + "/nix") { - gitrev = sources.cardano-node.rev; + cardanoNodeProject = import (cardano-node + "/nix") { + gitrev = cardano-node.rev; }; - iohkNix = import (sources.iohk-nix) {}; in { - imports = [../secrets/cardano/producers.nix "${sources.cardano-node}/nix/nixos"]; + imports = [../secrets/cardano/producers.nix "${cardano-node.cardano-node}/nix/nixos"]; environment.systemPackages = [cardanoNodeProject.cardano-cli]; From cc6e04210bef1740141fda51ee5b393ba6b8f78f Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Thu, 3 Aug 2023 21:32:15 +1000 Subject: [PATCH 06/47] server_common: convert to flake --- profiles/server_common.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/profiles/server_common.nix b/profiles/server_common.nix index 98f59af..b35a785 100644 --- a/profiles/server_common.nix +++ b/profiles/server_common.nix @@ -4,10 +4,7 @@ pkgs, lib, ... -}: let - sources = import ../nix/sources.nix; - nixpkgs2305 = (import sources."nixos-23.05" {}).pkgs; -in { +}: { imports = [ ../profiles/openssh.nix ../secrets/user-craige.nix From f74670874d447721a4c94a0dbd5e8945d35d24cc Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Thu, 3 Aug 2023 21:38:00 +1000 Subject: [PATCH 07/47] games-kids: converted to flake --- profiles/games-kids.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/profiles/games-kids.nix b/profiles/games-kids.nix index 072e9cf..a27fcb4 100644 --- a/profiles/games-kids.nix +++ b/profiles/games-kids.nix @@ -2,11 +2,9 @@ { config, pkgs, + nixpkgsUnstable, ... -}: let - sources = import ../nix/sources.nix; - unstable = import sources.nixpkgsUnstable {}; -in { +}: { imports = [ ../profiles/minecraftClient.nix # Play Minecraft :-) ]; From 5a97ed348e532be6809a24d0d6204c9c6c0eb2ec Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Thu, 3 Aug 2023 21:42:12 +1000 Subject: [PATCH 08/47] iog: converted to flake --- profiles/iog.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/profiles/iog.nix b/profiles/iog.nix index 7855a56..bcda846 100644 --- a/profiles/iog.nix +++ b/profiles/iog.nix @@ -3,15 +3,13 @@ config, pkgs, lib, + nix, ... -}: let - sources = import ../nix/sources.nix; - nixVersion = (import sources.nixpkgs {}).nixVersions.latest; -in { +}: { imports = [../profiles/terminal-recording.nix ../profiles/nix-direnv.nix]; nix = { - package = nixVersion; + package = nix; settings = { substituters = [ "https://cache.nixos.org" From 59fc07e66f998af60373c8bb8347b52503c94c71 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Wed, 21 Aug 2024 20:01:26 +1000 Subject: [PATCH 09/47] chore(nixos): bumped to HEAD of 24.05 --- flake.lock | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 47d0ce8..7810045 100644 --- a/flake.lock +++ b/flake.lock @@ -5170,16 +5170,16 @@ }, "nixpkgs_35": { "locked": { - "lastModified": 1689680872, - "narHash": "sha256-brNix2+ihJSzCiKwLafbyejrHJZUP0Fy6z5+xMOC27M=", + "lastModified": 1724098845, + "narHash": "sha256-D5HwjQw/02fuXbR4LCTo64koglP2j99hkDR79/3yLOE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "08700de174bc6235043cb4263b643b721d936bdb", + "rev": "f1bad50880bae73ff2d82fafc22010b4fc097a9c", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 26293bb..77f6263 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ daedalus.url = "github:input-output-hk/daedalus/?ref=5.2.0"; iohkNix.url = "github:input-output-hk/iohk-nix/?ref=df1da282f996ec46b33379407df99613a1fbafdd"; nix.url = "github:NixOS/nix/?ref=2.13.3"; - nixpkgs.url = github:NixOS/nixpkgs/?ref=nixos-23.05; + nixpkgs.url = github:NixOS/nixpkgs/?ref=nixos-24.05; nixpkgsUnstable.url = github:NixOS/nixpkgs/?ref=nixos-unstable; utils.url = "github:numtide/flake-utils"; }; From a51b1efd8007ddeeb151e2243bd654fe3d932c66 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Thu, 22 Aug 2024 11:33:51 +1000 Subject: [PATCH 10/47] chore(nix): upgrade to v2.24.3 --- flake.lock | 139 +++++++++++++++++++++++++++++++++++++++++++---------- flake.nix | 2 +- 2 files changed, 115 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index 7810045..3b430a8 100644 --- a/flake.lock +++ b/flake.lock @@ -1437,6 +1437,22 @@ "type": "github" } }, + "flake-compat_13": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-compat_2": { "flake": false, "locked": { @@ -1568,6 +1584,27 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1679360468, @@ -2047,6 +2084,37 @@ "type": "github" } }, + "git-hooks-nix": { + "inputs": { + "flake-compat": [ + "nix" + ], + "gitignore": [ + "nix" + ], + "nixpkgs": [ + "nix", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1721042469, + "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gomod2nix": { "inputs": { "nixpkgs": "nixpkgs_3", @@ -2959,6 +3027,23 @@ "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" } }, + "libgit2": { + "flake": false, + "locked": { + "lastModified": 1715853528, + "narHash": "sha256-J2rCxTecyLbbDdsyBWn9w7r3pbKRMkI9E7RvRgAqBdY=", + "owner": "libgit2", + "repo": "libgit2", + "rev": "36f7e21ad757a3dacc58cf7944329da6bc1d6e96", + "type": "github" + }, + "original": { + "owner": "libgit2", + "ref": "v1.8.1", + "repo": "libgit2", + "type": "github" + } + }, "lowdown-src": { "flake": false, "locked": { @@ -3007,22 +3092,6 @@ "type": "github" } }, - "lowdown-src_4": { - "flake": false, - "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", - "type": "github" - }, - "original": { - "owner": "kristapsdz", - "repo": "lowdown", - "type": "github" - } - }, "mdbook-kroki-preprocessor": { "flake": false, "locked": { @@ -3902,21 +3971,25 @@ }, "nix_4": { "inputs": { - "lowdown-src": "lowdown-src_4", + "flake-compat": "flake-compat_13", + "flake-parts": "flake-parts", + "git-hooks-nix": "git-hooks-nix", + "libgit2": "libgit2", "nixpkgs": "nixpkgs_34", + "nixpkgs-23-11": "nixpkgs-23-11", "nixpkgs-regression": "nixpkgs-regression_4" }, "locked": { - "lastModified": 1677045134, - "narHash": "sha256-jUc2ccTR8f6MGY2pUKgujm+lxSPNGm/ZAP+toX+nMNc=", + "lastModified": 1723879049, + "narHash": "sha256-aBuGXm0UwDekCYLl7xDyw+BAJOg7728i57TbSXzPacc=", "owner": "NixOS", "repo": "nix", - "rev": "4acc684ef7b3117c6d6ac12837398a0008a53d85", + "rev": "3ac5d736e2c0d229197057841e6dbf6bdbe3560f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "2.13.3", + "ref": "2.24.3", "repo": "nix", "type": "github" } @@ -4575,6 +4648,22 @@ "type": "github" } }, + "nixpkgs-23-11": { + "locked": { + "lastModified": 1717159533, + "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + } + }, "nixpkgs-regression": { "locked": { "lastModified": 1643052045, @@ -5154,16 +5243,16 @@ }, "nixpkgs_34": { "locked": { - "lastModified": 1670461440, - "narHash": "sha256-jy1LB8HOMKGJEGXgzFRLDU1CBGL0/LlkolgnqIsF0D8=", + "lastModified": 1723688146, + "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "04a75b2eecc0acf6239acf9dd04485ff8d14f425", + "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11-small", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 77f6263..39d9381 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ cardano-node.url = "github:input-output-hk/cardano-node/?ref=1.35.7"; daedalus.url = "github:input-output-hk/daedalus/?ref=5.2.0"; iohkNix.url = "github:input-output-hk/iohk-nix/?ref=df1da282f996ec46b33379407df99613a1fbafdd"; - nix.url = "github:NixOS/nix/?ref=2.13.3"; + nix.url = "github:NixOS/nix/?ref=2.24.3"; nixpkgs.url = github:NixOS/nixpkgs/?ref=nixos-24.05; nixpkgsUnstable.url = github:NixOS/nixpkgs/?ref=nixos-unstable; utils.url = "github:numtide/flake-utils"; From 4637b58ce8446befe918433662bfa10e4ff18c4e Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Thu, 22 Aug 2024 11:47:13 +1000 Subject: [PATCH 11/47] chore(nix): add nixops --- shell.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/shell.nix b/shell.nix index 31f04ef..cb05f0b 100644 --- a/shell.nix +++ b/shell.nix @@ -9,6 +9,7 @@ with pkgs; buildInputs = [ alejandra # The Uncompromising Nix Code Formatter nix # Powerful package manager, makes packaging reliable & reproducible + nixops_unstable_minimal # work around for issue #127423 tea # Gitea official CLI client treefmt # one CLI to format the code tree ]; From e47519137b4e75017cc984fdc772928b3d16a5e2 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Thu, 22 Aug 2024 12:52:01 +1000 Subject: [PATCH 12/47] chore(nix): remove nixops.nix --- nixops.nix | 34 ---------------------------------- outputs.nix | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 34 deletions(-) delete mode 100644 nixops.nix diff --git a/nixops.nix b/nixops.nix deleted file mode 100644 index 74f5099..0000000 --- a/nixops.nix +++ /dev/null @@ -1,34 +0,0 @@ -# NixOps configuration for the mio-ops nodes -{ - network = { - description = "mio-ops nodes"; - enableRollback = true; - }; - - network.storage.legacy = {databasefile = "~/.nixops/deployments.nixops";}; - - defaults = { - config, - pkgs, - lib, - ... - }: { - system.autoUpgrade.enable = false; # Disabled as it conflicts with NixOps - }; - - airgead = import hosts/airgead.nix; - brighde = import hosts/brighde.nix; - ceilidh = import hosts/ceilidh.nix; - cuallaidh = import hosts/cuallaidh.nix; - dhu = import hosts/dhu.nix; - dionach = import hosts/dionach.nix; - iolear-beag = import hosts/iolear-beag.nix; - doilidh = import hosts/doilidh.nix; - eamhair = import hosts/eamhair.nix; - ceitidh = import hosts/ceitidh.nix; - paidh-uachdar = import hosts/paidh-uachdar.nix; - sanganto = import hosts/sanganto.nix; - sercanto = import hosts/sercanto.nix; - sithlainnir = import hosts/sithlainnir.nix; - teintidh = import hosts/teintidh.nix; -} diff --git a/outputs.nix b/outputs.nix index 0157017..8c03d6a 100644 --- a/outputs.nix +++ b/outputs.nix @@ -16,6 +16,29 @@ in { inherit (nix.packages."${pkgs.system}") nix; inherit (nixpkgsUnstable.legacyPackages."${pkgs.system}") alejandra; }; + nixopsConfigurations."${pkgs.system}".default = { + inherit (inputs) nixpkgs; + network = { + description = "mio-ops nodes"; + enableRollback = true; + storage.legacy = {databasefile = "~/.nixops/deployments.nixops";}; + }; + airgead = import hosts/airgead.nix; + brighde = import hosts/brighde.nix; + ceilidh = import hosts/ceilidh.nix; + cuallaidh = import hosts/cuallaidh.nix; + dhu = import hosts/dhu.nix; + dionach = import hosts/dionach.nix; + iolear-beag = import hosts/iolear-beag.nix; + doilidh = import hosts/doilidh.nix; + eamhair = import hosts/eamhair.nix; + ceitidh = import hosts/ceitidh.nix; + paidh-uachdar = import hosts/paidh-uachdar.nix; + sanganto = import hosts/sanganto.nix; + sercanto = import hosts/sercanto.nix; + sithlainnir = import hosts/sithlainnir.nix; + teintidh = import hosts/teintidh.nix; + }; })) // { } From ae3b0ddf0f17c5aec1de92c2c4f2c085285ce948 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Thu, 22 Aug 2024 13:43:53 +1000 Subject: [PATCH 13/47] chore(nix): remove legacy non-flake configuration --- default.nix | 23 ----------------------- globals-defaults.nix | 1 - globals.nix | 11 ----------- outputs.nix | 6 +++++- shell.nix | 7 ++++++- 5 files changed, 11 insertions(+), 37 deletions(-) delete mode 100644 default.nix delete mode 100644 globals-defaults.nix delete mode 100644 globals.nix diff --git a/default.nix b/default.nix deleted file mode 100644 index 81b9a6c..0000000 --- a/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - sources ? import ./nix/sources.nix, - system ? builtins.currentSystem, - crossSystem ? null, - config ? {}, - alejandraUnstable ? (import sources.nixpkgsUnstable {}).alejandra, - cardanoNodeProject ? import sources.cardano-node {}, -} @ args: -with import ./nix args; { - shell = mkShell { - inherit (import sources.niv {}) niv; - buildInputs = [ - alejandraUnstable # The Uncompromising Nix Code Formatter - cardanoNodeProject.cardano-cli # required for KES key rotation - niv - nixops_unstable_minimal # work around for issue #127423 - tea # Gitea official CLI client - treefmt # one CLI to format the code tree - ]; - NIX_PATH = "nixpkgs=${sources.nixpkgs}"; - NIXOPS_DEPLOYMENT = "${globals.deploymentName}"; - }; -} diff --git a/globals-defaults.nix b/globals-defaults.nix deleted file mode 100644 index 0967ef4..0000000 --- a/globals-defaults.nix +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/globals.nix b/globals.nix deleted file mode 100644 index ace84e5..0000000 --- a/globals.nix +++ /dev/null @@ -1,11 +0,0 @@ -self: super: { - globals = - import ./globals-defaults.nix - // rec { - deploymentName = "mio-ops"; - - domain = "mcwhirter.io"; - - environment = "${deploymentName}"; - }; -} diff --git a/outputs.nix b/outputs.nix index 8c03d6a..af7d38b 100644 --- a/outputs.nix +++ b/outputs.nix @@ -8,13 +8,16 @@ ... } @ inputs: (utils.lib.eachDefaultSystem (system: let + deploymentName = "mio-ops"; pkgs = nixpkgs.legacyPackages."${system}"; + nix_path = "nixpkgs=${nixpkgs}"; in { devShell = pkgs.callPackage ./shell.nix { inherit (nix.packages."${pkgs.system}") nix; - inherit (nixpkgsUnstable.legacyPackages."${pkgs.system}") alejandra; + inherit deploymentName; + inherit nix_path; }; nixopsConfigurations."${pkgs.system}".default = { inherit (inputs) nixpkgs; @@ -23,6 +26,7 @@ in { enableRollback = true; storage.legacy = {databasefile = "~/.nixops/deployments.nixops";}; }; + defaults = {}; airgead = import hosts/airgead.nix; brighde = import hosts/brighde.nix; ceilidh = import hosts/ceilidh.nix; diff --git a/shell.nix b/shell.nix index cb05f0b..fe46bf7 100644 --- a/shell.nix +++ b/shell.nix @@ -1,8 +1,9 @@ { pkgs ? import {}, + deploymentName, mkShell, - alejandra, nix, + nix_path, }: with pkgs; mkShell { @@ -13,4 +14,8 @@ with pkgs; tea # Gitea official CLI client treefmt # one CLI to format the code tree ]; + shellHook = '' + export NIX_PATH=${nix_path} + export NIXOPS_DEPLOYMENT=${deploymentName} + ''; } From 88e4b1cb7071670d31390aa79c1ad9d8b891f0a5 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Thu, 20 Jul 2023 20:57:19 +1000 Subject: [PATCH 14/47] nix: remove niv From 1b000bd9b777e680804668e8d126ee9bedf41f56 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Fri, 23 Aug 2024 17:50:00 +1000 Subject: [PATCH 15/47] chore(nix): add colmena --- flake.lock | 130 +++++++++++++++--- flake.nix | 1 + hosts/{airgead.nix => airgead/default.nix} | 0 hosts/{brighde.nix => brighde/default.nix} | 0 hosts/{ceilidh.nix => ceilidh/default.nix} | 0 hosts/{ceitidh.nix => ceitidh/default.nix} | 0 .../{cuallaidh.nix => cuallaidh/default.nix} | 0 hosts/{dhu.nix => dhu/default.nix} | 0 hosts/{dionach.nix => dionach/default.nix} | 0 hosts/{doilidh.nix => doilidh/default.nix} | 0 hosts/{eamhair.nix => eamhair/default.nix} | 0 .../default.nix} | 0 .../default.nix} | 0 hosts/{sanganto.nix => sanganto/default.nix} | 34 ++--- hosts/{sercanto.nix => sercanto/default.nix} | 0 .../default.nix} | 0 hosts/{teintidh.nix => teintidh/default.nix} | 0 outputs.nix | 51 +++---- shell.nix | 2 + 19 files changed, 155 insertions(+), 63 deletions(-) rename hosts/{airgead.nix => airgead/default.nix} (100%) rename hosts/{brighde.nix => brighde/default.nix} (100%) rename hosts/{ceilidh.nix => ceilidh/default.nix} (100%) rename hosts/{ceitidh.nix => ceitidh/default.nix} (100%) rename hosts/{cuallaidh.nix => cuallaidh/default.nix} (100%) rename hosts/{dhu.nix => dhu/default.nix} (100%) rename hosts/{dionach.nix => dionach/default.nix} (100%) rename hosts/{doilidh.nix => doilidh/default.nix} (100%) rename hosts/{eamhair.nix => eamhair/default.nix} (100%) rename hosts/{iolear-beag.nix => iolear-beag/default.nix} (100%) rename hosts/{paidh-uachdar.nix => paidh-uachdar/default.nix} (100%) rename hosts/{sanganto.nix => sanganto/default.nix} (74%) rename hosts/{sercanto.nix => sercanto/default.nix} (100%) rename hosts/{sithlainnir.nix => sithlainnir/default.nix} (100%) rename hosts/{teintidh.nix => teintidh/default.nix} (100%) diff --git a/flake.lock b/flake.lock index 3b430a8..540ca6b 100644 --- a/flake.lock +++ b/flake.lock @@ -800,6 +800,28 @@ "type": "github" } }, + "colmena": { + "inputs": { + "flake-compat": "flake-compat_12", + "flake-utils": "flake-utils_23", + "nixpkgs": "nixpkgs_29", + "stable": "stable" + }, + "locked": { + "lastModified": 1684127108, + "narHash": "sha256-01bfuSY4gnshhtqA1EJCw2CMsKkAx+dHS+sEpQ2+EAQ=", + "owner": "zhaofengli", + "repo": "colmena", + "rev": "5fdd743a11e7291bd8ac1e169d62ba6156c99be4", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "ref": "v0.4.0", + "repo": "colmena", + "type": "github" + } + }, "customConfig": { "locked": { "lastModified": 1630400035, @@ -1438,6 +1460,22 @@ } }, "flake-compat_13": { + "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-compat_14": { "flake": false, "locked": { "lastModified": 1696426674, @@ -1833,6 +1871,21 @@ } }, "flake-utils_23": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_24": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -1847,7 +1900,7 @@ "type": "github" } }, - "flake-utils_24": { + "flake-utils_25": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -1862,7 +1915,7 @@ "type": "github" } }, - "flake-utils_25": { + "flake-utils_26": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -2231,7 +2284,7 @@ }, "gomod2nix_7": { "inputs": { - "nixpkgs": "nixpkgs_29", + "nixpkgs": "nixpkgs_30", "utils": "utils_12" }, "locked": { @@ -2976,7 +3029,7 @@ }, "iohkNix_6": { "inputs": { - "nixpkgs": "nixpkgs_33" + "nixpkgs": "nixpkgs_34" }, "locked": { "lastModified": 1629993366, @@ -3396,7 +3449,7 @@ }, "n2c_7": { "inputs": { - "flake-utils": "flake-utils_25", + "flake-utils": "flake-utils_26", "nixpkgs": [ "daedalus", "tullia", @@ -3678,7 +3731,7 @@ }, "nix-nomad_7": { "inputs": { - "flake-compat": "flake-compat_12", + "flake-compat": "flake-compat_13", "flake-utils": [ "daedalus", "tullia", @@ -3894,8 +3947,8 @@ }, "nix2container_8": { "inputs": { - "flake-utils": "flake-utils_23", - "nixpkgs": "nixpkgs_30" + "flake-utils": "flake-utils_24", + "nixpkgs": "nixpkgs_31" }, "locked": { "lastModified": 1658567952, @@ -3971,11 +4024,11 @@ }, "nix_4": { "inputs": { - "flake-compat": "flake-compat_13", + "flake-compat": "flake-compat_14", "flake-parts": "flake-parts", "git-hooks-nix": "git-hooks-nix", "libgit2": "libgit2", - "nixpkgs": "nixpkgs_34", + "nixpkgs": "nixpkgs_35", "nixpkgs-23-11": "nixpkgs-23-11", "nixpkgs-regression": "nixpkgs-regression_4" }, @@ -5150,11 +5203,11 @@ }, "nixpkgs_29": { "locked": { - "lastModified": 1653581809, - "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", + "lastModified": 1683408522, + "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", + "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7", "type": "github" }, "original": { @@ -5181,6 +5234,22 @@ } }, "nixpkgs_30": { + "locked": { + "lastModified": 1653581809, + "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_31": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -5195,7 +5264,7 @@ "type": "github" } }, - "nixpkgs_31": { + "nixpkgs_32": { "locked": { "lastModified": 1653920503, "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=", @@ -5211,7 +5280,7 @@ "type": "github" } }, - "nixpkgs_32": { + "nixpkgs_33": { "locked": { "lastModified": 1665087388, "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", @@ -5227,7 +5296,7 @@ "type": "github" } }, - "nixpkgs_33": { + "nixpkgs_34": { "locked": { "lastModified": 1691003216, "narHash": "sha256-Qq/MPkhS12Bl0X060pPvX3v9ac3f2rRQfHjjozPh/Qs=", @@ -5241,7 +5310,7 @@ "type": "indirect" } }, - "nixpkgs_34": { + "nixpkgs_35": { "locked": { "lastModified": 1723688146, "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", @@ -5257,7 +5326,7 @@ "type": "github" } }, - "nixpkgs_35": { + "nixpkgs_36": { "locked": { "lastModified": 1724098845, "narHash": "sha256-D5HwjQw/02fuXbR4LCTo64koglP2j99hkDR79/3yLOE=", @@ -5735,14 +5804,31 @@ "root": { "inputs": { "cardano-node": "cardano-node", + "colmena": "colmena", "daedalus": "daedalus", "iohkNix": "iohkNix_6", "nix": "nix_4", - "nixpkgs": "nixpkgs_35", + "nixpkgs": "nixpkgs_36", "nixpkgsUnstable": "nixpkgsUnstable", "utils": "utils_13" } }, + "stable": { + "locked": { + "lastModified": 1669735802, + "narHash": "sha256-qtG/o/i5ZWZLmXw108N2aPiVsxOcidpHJYNkT45ry9Q=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "731cc710aeebecbf45a258e977e8b68350549522", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, "stackage": { "flake": false, "locked": { @@ -6122,7 +6208,7 @@ "blank": "blank_7", "devshell": "devshell_7", "dmerge": "dmerge_7", - "flake-utils": "flake-utils_24", + "flake-utils": "flake-utils_25", "makes": [ "daedalus", "tullia", @@ -6138,7 +6224,7 @@ ], "n2c": "n2c_7", "nixago": "nixago_7", - "nixpkgs": "nixpkgs_32", + "nixpkgs": "nixpkgs_33", "yants": "yants_7" }, "locked": { @@ -6320,7 +6406,7 @@ "inputs": { "nix-nomad": "nix-nomad_7", "nix2container": "nix2container_8", - "nixpkgs": "nixpkgs_31", + "nixpkgs": "nixpkgs_32", "std": "std_7" }, "locked": { diff --git a/flake.nix b/flake.nix index 39d9381..17faaf1 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ inputs = { cardano-node.url = "github:input-output-hk/cardano-node/?ref=1.35.7"; + colmena.url = github:zhaofengli/colmena/?ref=v0.4.0; daedalus.url = "github:input-output-hk/daedalus/?ref=5.2.0"; iohkNix.url = "github:input-output-hk/iohk-nix/?ref=df1da282f996ec46b33379407df99613a1fbafdd"; nix.url = "github:NixOS/nix/?ref=2.24.3"; diff --git a/hosts/airgead.nix b/hosts/airgead/default.nix similarity index 100% rename from hosts/airgead.nix rename to hosts/airgead/default.nix diff --git a/hosts/brighde.nix b/hosts/brighde/default.nix similarity index 100% rename from hosts/brighde.nix rename to hosts/brighde/default.nix diff --git a/hosts/ceilidh.nix b/hosts/ceilidh/default.nix similarity index 100% rename from hosts/ceilidh.nix rename to hosts/ceilidh/default.nix diff --git a/hosts/ceitidh.nix b/hosts/ceitidh/default.nix similarity index 100% rename from hosts/ceitidh.nix rename to hosts/ceitidh/default.nix diff --git a/hosts/cuallaidh.nix b/hosts/cuallaidh/default.nix similarity index 100% rename from hosts/cuallaidh.nix rename to hosts/cuallaidh/default.nix diff --git a/hosts/dhu.nix b/hosts/dhu/default.nix similarity index 100% rename from hosts/dhu.nix rename to hosts/dhu/default.nix diff --git a/hosts/dionach.nix b/hosts/dionach/default.nix similarity index 100% rename from hosts/dionach.nix rename to hosts/dionach/default.nix diff --git a/hosts/doilidh.nix b/hosts/doilidh/default.nix similarity index 100% rename from hosts/doilidh.nix rename to hosts/doilidh/default.nix diff --git a/hosts/eamhair.nix b/hosts/eamhair/default.nix similarity index 100% rename from hosts/eamhair.nix rename to hosts/eamhair/default.nix diff --git a/hosts/iolear-beag.nix b/hosts/iolear-beag/default.nix similarity index 100% rename from hosts/iolear-beag.nix rename to hosts/iolear-beag/default.nix diff --git a/hosts/paidh-uachdar.nix b/hosts/paidh-uachdar/default.nix similarity index 100% rename from hosts/paidh-uachdar.nix rename to hosts/paidh-uachdar/default.nix diff --git a/hosts/sanganto.nix b/hosts/sanganto/default.nix similarity index 74% rename from hosts/sanganto.nix rename to hosts/sanganto/default.nix index 12f449e..04076de 100644 --- a/hosts/sanganto.nix +++ b/hosts/sanganto/default.nix @@ -5,23 +5,23 @@ ... }: { imports = [ - ../hardware/system76_thelioMira.nix # Include results of the hardware scan. - ../profiles/cron-craige.nix # Provide Craige's cron jobs - ../profiles/desktopCraige.nix # Craige's desktop tools and apps - ../profiles/haskell-dev.nix # Haskell dev environment - ../profiles/host_common.nix # Common host configuration options - ../profiles/iog.nix # IOHK environment - ../profiles/keyboard.nix - ../profiles/neomutt.nix # Neomutt email - ../profiles/nix-community.nix # Nix community aarch64 tooling - ../profiles/nixpkgs-dev.nix # Nix pkgs dev tools - ../profiles/openssh.nix # Enable and configure openssh - ../profiles/pantheon.nix # Enable and configure the pantheon desktop - ../profiles/pipewire.nix # Enable and pipewire audio system - ../profiles/xmonad.nix # Xmonad desktop environment - ../profiles/yubikey.nix # Yubikey tooling - ../secrets/craige.nix # Ssshhhhh! - ../secrets/root.nix # Ssshhhhh! + ../../hardware/system76_thelioMira.nix # Include results of the hardware scan. + ../../profiles/cron-craige.nix # Provide Craige's cron jobs + ../../profiles/desktopCraige.nix # Craige's desktop tools and apps + ../../profiles/haskell-dev.nix # Haskell dev environment + ../../profiles/host_common.nix # Common host configuration options + ../../profiles/iog.nix # IOHK environment + ../../profiles/keyboard.nix + ../../profiles/neomutt.nix # Neomutt email + ../../profiles/nix-community.nix # Nix community aarch64 tooling + ../../profiles/nixpkgs-dev.nix # Nix pkgs dev tools + ../../profiles/openssh.nix # Enable and configure openssh + ../../profiles/pantheon.nix # Enable and configure the pantheon desktop + ../../profiles/pipewire.nix # Enable and pipewire audio system + ../../profiles/xmonad.nix # Xmonad desktop environment + ../../profiles/yubikey.nix # Yubikey tooling + ../../secrets/craige.nix # Ssshhhhh! + ../../secrets/root.nix # Ssshhhhh! ]; deployment.targetHost = "10.42.0.11"; diff --git a/hosts/sercanto.nix b/hosts/sercanto/default.nix similarity index 100% rename from hosts/sercanto.nix rename to hosts/sercanto/default.nix diff --git a/hosts/sithlainnir.nix b/hosts/sithlainnir/default.nix similarity index 100% rename from hosts/sithlainnir.nix rename to hosts/sithlainnir/default.nix diff --git a/hosts/teintidh.nix b/hosts/teintidh/default.nix similarity index 100% rename from hosts/teintidh.nix rename to hosts/teintidh/default.nix diff --git a/outputs.nix b/outputs.nix index af7d38b..a5c0cb4 100644 --- a/outputs.nix +++ b/outputs.nix @@ -1,5 +1,6 @@ { self, + colmena, daedalus, nix, nixpkgs, @@ -15,34 +16,36 @@ in { devShell = pkgs.callPackage ./shell.nix { + inherit (colmena.packages."${pkgs.system}") colmena; inherit (nix.packages."${pkgs.system}") nix; inherit deploymentName; inherit nix_path; }; - nixopsConfigurations."${pkgs.system}".default = { - inherit (inputs) nixpkgs; - network = { - description = "mio-ops nodes"; - enableRollback = true; - storage.legacy = {databasefile = "~/.nixops/deployments.nixops";}; - }; - defaults = {}; - airgead = import hosts/airgead.nix; - brighde = import hosts/brighde.nix; - ceilidh = import hosts/ceilidh.nix; - cuallaidh = import hosts/cuallaidh.nix; - dhu = import hosts/dhu.nix; - dionach = import hosts/dionach.nix; - iolear-beag = import hosts/iolear-beag.nix; - doilidh = import hosts/doilidh.nix; - eamhair = import hosts/eamhair.nix; - ceitidh = import hosts/ceitidh.nix; - paidh-uachdar = import hosts/paidh-uachdar.nix; - sanganto = import hosts/sanganto.nix; - sercanto = import hosts/sercanto.nix; - sithlainnir = import hosts/sithlainnir.nix; - teintidh = import hosts/teintidh.nix; - }; })) // { + colmena = { + meta = { + description = "mio-ops deployment"; + name = "deploymentName"; + nixpkgs = import nixpkgs { + system = "x86_64-linux"; + overlays = []; + }; + }; + airgead = {imports = [hosts/airgead];}; + brighde = {imports = [hosts/brighde];}; + ceilidh = {imports = [hosts/ceilidh];}; + ceitidh = {imports = [hosts/ceitidh];}; + cuallaidh = {imports = [hosts/cuallaidh];}; + dhu = {imports = [hosts/dhu];}; + dionach = {imports = [hosts/dionach];}; + doilidh = {imports = [hosts/doilidh];}; + eamhair = {imports = [hosts/eamhair];}; + iolear-beag = {imports = [hosts/iolear-beag];}; + paidh-uachdar = {imports = [hosts/paidh-uachdar];}; + sanganto = {imports = [hosts/sanganto];}; + sercanto = {imports = [hosts/sercanto];}; + sithlainnir = {imports = [hosts/sithlainnir];}; + teintidh = {imports = [hosts/teintidh];}; + }; } diff --git a/shell.nix b/shell.nix index fe46bf7..79d6f31 100644 --- a/shell.nix +++ b/shell.nix @@ -1,5 +1,6 @@ { pkgs ? import {}, + colmena, deploymentName, mkShell, nix, @@ -9,6 +10,7 @@ with pkgs; mkShell { buildInputs = [ alejandra # The Uncompromising Nix Code Formatter + colmena # Simple, stateless NixOS deployment tool nix # Powerful package manager, makes packaging reliable & reproducible nixops_unstable_minimal # work around for issue #127423 tea # Gitea official CLI client From 6ff9cea34bf1afd7da0a30ff465abbbf3583da1e Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Fri, 23 Aug 2024 18:00:07 +1000 Subject: [PATCH 16/47] chore(nix): updated import paths --- hosts/airgead/default.nix | 6 ++--- hosts/brighde/default.nix | 6 ++--- hosts/ceilidh/default.nix | 2 +- hosts/ceitidh/default.nix | 4 ++-- hosts/cuallaidh/default.nix | 30 ++++++++++++------------- hosts/dhu/default.nix | 6 ++--- hosts/dionach/default.nix | 6 ++--- hosts/doilidh/default.nix | 2 +- hosts/eamhair/default.nix | 2 +- hosts/iolear-beag/default.nix | 6 ++--- hosts/paidh-uachdar/default.nix | 15 ++++++------- hosts/sercanto/default.nix | 39 ++++++++++++++++----------------- hosts/sithlainnir/default.nix | 6 ++--- hosts/teintidh/default.nix | 8 +++---- 14 files changed, 67 insertions(+), 71 deletions(-) diff --git a/hosts/airgead/default.nix b/hosts/airgead/default.nix index 9f6ebd3..5ed7eee 100644 --- a/hosts/airgead/default.nix +++ b/hosts/airgead/default.nix @@ -6,9 +6,9 @@ ... }: { imports = [ - ../networks/linode.nix - ../profiles/cardano-node.nix - ../secrets/airgead.nix + ../../networks/linode.nix + ../../profiles/cardano-node.nix + ../../secrets/airgead.nix ]; deployment.targetHost = "172.105.187.96"; diff --git a/hosts/brighde/default.nix b/hosts/brighde/default.nix index 0c04172..a9b990a 100644 --- a/hosts/brighde/default.nix +++ b/hosts/brighde/default.nix @@ -5,9 +5,9 @@ ... }: { imports = [ - ../hardware/lenovo_yoga7i.nix - ../profiles/desktopFiona.nix - ../profiles/desktop_common.nix + ../../hardware/lenovo_yoga7i.nix + ../../profiles/desktopFiona.nix + ../../profiles/desktop_common.nix ]; # Use the UEFI boot loader. diff --git a/hosts/ceilidh/default.nix b/hosts/ceilidh/default.nix index 327c188..d3cc741 100644 --- a/hosts/ceilidh/default.nix +++ b/hosts/ceilidh/default.nix @@ -5,7 +5,7 @@ lib, ... }: { - imports = [../hardware/raspberry_pi_4_model_B.nix]; + imports = [../../hardware/raspberry_pi_4_model_B.nix]; # Comment out deployment when building the SD Image. deployment.targetHost = "10.42.0.108"; diff --git a/hosts/ceitidh/default.nix b/hosts/ceitidh/default.nix index 2562d76..de2fd9d 100644 --- a/hosts/ceitidh/default.nix +++ b/hosts/ceitidh/default.nix @@ -6,8 +6,8 @@ ... }: { imports = [ - ../networks/pi3B_rack.nix - ../profiles/cyclone-ibis.nix + ../../networks/pi3B_rack.nix + ../../profiles/cyclone-ibis.nix ]; # Comment out deployment when building the SD Image. diff --git a/hosts/cuallaidh/default.nix b/hosts/cuallaidh/default.nix index 541d7f5..42d6b27 100644 --- a/hosts/cuallaidh/default.nix +++ b/hosts/cuallaidh/default.nix @@ -6,22 +6,20 @@ ... }: { imports = [ - ../modules/tmate-ssh-server.nix - ../networks/linode.nix - ../profiles/coturn.nix - #../profiles/cryptpad.nix - #../profiles/hydra.nix - ../profiles/iog.nix - ../profiles/ipv6.nix - ../profiles/mastodon.nix - ../profiles/matrix.nix - ../profiles/mcwhirter.io.nix - ../profiles/minecraftServer.nix - ../profiles/nextcloud.nix - ../profiles/nixpkgs-dev.nix - ../profiles/taskserver.nix - ../profiles/tt-rss.nix - ../secrets/tt-rss.nix + ../../modules/tmate-ssh-server.nix + ../../networks/linode.nix + ../../profiles/coturn.nix + ../../profiles/iog.nix + ../../profiles/ipv6.nix + ../../profiles/mastodon.nix + ../../profiles/matrix.nix + ../../profiles/mcwhirter.io.nix + ../../profiles/minecraftServer.nix + ../../profiles/nextcloud.nix + ../../profiles/nixpkgs-dev.nix + ../../profiles/taskserver.nix + ../../profiles/tt-rss.nix + ../../secrets/tt-rss.nix ]; deployment.targetHost = "172.105.171.16"; diff --git a/hosts/dhu/default.nix b/hosts/dhu/default.nix index 5109590..389e50e 100644 --- a/hosts/dhu/default.nix +++ b/hosts/dhu/default.nix @@ -5,9 +5,9 @@ ... }: { imports = [ - ../hardware/eeepc701.nix # Include common configuration options - ../secrets/wireless.nix - ../profiles/sway.nix + ../../hardware/eeepc701.nix # Include common configuration options + ../../secrets/wireless.nix + ../../profiles/sway.nix ]; deployment.targetHost = "10.42.0.119"; diff --git a/hosts/dionach/default.nix b/hosts/dionach/default.nix index fd6522e..570c0ff 100644 --- a/hosts/dionach/default.nix +++ b/hosts/dionach/default.nix @@ -5,9 +5,9 @@ ... }: { imports = [ - ../hardware/purism_librem_15.nix # Include results of the hardware scan. - ../profiles/desktop_common.nix - ../profiles/steam.nix + ../../hardware/purism_librem_15.nix # Include results of the hardware scan. + ../../profiles/desktop_common.nix + ../../profiles/steam.nix ]; deployment.targetHost = "10.42.0.190"; diff --git a/hosts/doilidh/default.nix b/hosts/doilidh/default.nix index af7e87b..afb6ed0 100644 --- a/hosts/doilidh/default.nix +++ b/hosts/doilidh/default.nix @@ -5,7 +5,7 @@ lib, ... }: { - imports = [../networks/pi3B_rack.nix]; + imports = [../../networks/pi3B_rack.nix]; # Comment out deployment when building the SD Image. deployment.targetHost = "10.42.0.204"; diff --git a/hosts/eamhair/default.nix b/hosts/eamhair/default.nix index 7344210..7d86e98 100644 --- a/hosts/eamhair/default.nix +++ b/hosts/eamhair/default.nix @@ -5,7 +5,7 @@ lib, ... }: { - imports = [../networks/pi3B_rack.nix]; + imports = [../../networks/pi3B_rack.nix]; # Comment out deployment when building the SD Image. deployment.targetHost = "10.42.0.205"; diff --git a/hosts/iolear-beag/default.nix b/hosts/iolear-beag/default.nix index ebdafb6..9a40049 100644 --- a/hosts/iolear-beag/default.nix +++ b/hosts/iolear-beag/default.nix @@ -5,9 +5,9 @@ ... }: { imports = [ - ../hardware/lenovo_x201.nix - ../profiles/desktop_common.nix - ../profiles/wine.nix + ../../hardware/lenovo_x201.nix + ../../profiles/desktop_common.nix + ../../profiles/wine.nix ]; # Use the GRUB 2 boot loader. diff --git a/hosts/paidh-uachdar/default.nix b/hosts/paidh-uachdar/default.nix index b23fb7c..eeb6dc9 100644 --- a/hosts/paidh-uachdar/default.nix +++ b/hosts/paidh-uachdar/default.nix @@ -6,14 +6,13 @@ ... }: { imports = [ - ../hardware/raspberry_pi_3_model_B.nix - ../profiles/host_common.nix - ../profiles/openssh.nix - ../profiles/pi_common.nix - #../profiles/xmonad.nix - ../secrets/craige.nix # Ssshhhhh! - ../secrets/root.nix # Ssshhhhh! - ../secrets/wireless.nix # Hey look! A squirrel! + ../../hardware/raspberry_pi_3_model_B.nix + ../../profiles/host_common.nix + ../../profiles/openssh.nix + ../../profiles/pi_common.nix + ../../secrets/craige.nix # Ssshhhhh! + ../../secrets/root.nix # Ssshhhhh! + ../../secrets/wireless.nix # Hey look! A squirrel! ]; # Comment out deployment when building the SD Image. diff --git a/hosts/sercanto/default.nix b/hosts/sercanto/default.nix index 5c3fa11..ae670e5 100644 --- a/hosts/sercanto/default.nix +++ b/hosts/sercanto/default.nix @@ -5,26 +5,25 @@ ... }: { imports = [ - ../hardware/system76_lemurPro.nix # Include results of the hardware scan. - ../profiles/cron-craige.nix # Provide Craige's cron jobs - ../profiles/desktopCraige.nix # Craige's desktop tools and apps - ../profiles/haskell-dev.nix # Haskell dev environment - ../profiles/host_common.nix # Common host configuration options - ../profiles/iog.nix # IOHK environment - ../profiles/keyboard.nix - ../profiles/neomutt.nix # Neomutt email - ../profiles/nix-community.nix # Nix community aarch64 tooling - ../profiles/nix-mio-ops.nix # mio-ops Nix tooling - ../profiles/nixpkgs-dev.nix # Nix pkgs dev tools - ../profiles/openssh.nix # Enable and configure openssh - ../profiles/pantheon.nix # Enable and configure the pantheon desktop - ../profiles/pipewire.nix # Enable and pipewire audio system - ../profiles/powerManagement.nix # Power management for laptops - ../profiles/xmonad.nix # Xmonad desktop environment - ../profiles/yubikey.nix # Yubikey tooling - ../secrets/craige.nix # Ssshhhhh! - ../secrets/root.nix # Ssshhhhh! - #../secrets/wireless.nix # Hey look! A squirrel! + ../../hardware/system76_lemurPro.nix # Include results of the hardware scan. + ../../profiles/cron-craige.nix # Provide Craige's cron jobs + ../../profiles/desktopCraige.nix # Craige's desktop tools and apps + ../../profiles/haskell-dev.nix # Haskell dev environment + ../../profiles/host_common.nix # Common host configuration options + ../../profiles/iog.nix # IOHK environment + ../../profiles/keyboard.nix + ../../profiles/neomutt.nix # Neomutt email + ../../profiles/nix-community.nix # Nix community aarch64 tooling + ../../profiles/nix-mio-ops.nix # mio-ops Nix tooling + ../../profiles/nixpkgs-dev.nix # Nix pkgs dev tools + ../../profiles/openssh.nix # Enable and configure openssh + ../../profiles/pantheon.nix # Enable and configure the pantheon desktop + ../../profiles/pipewire.nix # Enable and pipewire audio system + ../../profiles/powerManagement.nix # Power management for laptops + ../../profiles/xmonad.nix # Xmonad desktop environment + ../../profiles/yubikey.nix # Yubikey tooling + ../../secrets/craige.nix # Ssshhhhh! + ../../secrets/root.nix # Ssshhhhh! ]; deployment.targetHost = "10.42.0.180"; diff --git a/hosts/sithlainnir/default.nix b/hosts/sithlainnir/default.nix index a7b88bd..db2c09c 100644 --- a/hosts/sithlainnir/default.nix +++ b/hosts/sithlainnir/default.nix @@ -5,9 +5,9 @@ ... }: { imports = [ - ../hardware/lenovo_x201.nix - ../profiles/desktopFiona.nix - ../profiles/desktop_common.nix + ../../hardware/lenovo_x201.nix + ../../profiles/desktopFiona.nix + ../../profiles/desktop_common.nix ]; # Use the GRUB 2 boot loader. diff --git a/hosts/teintidh/default.nix b/hosts/teintidh/default.nix index 1486fbb..7ee6e12 100644 --- a/hosts/teintidh/default.nix +++ b/hosts/teintidh/default.nix @@ -5,10 +5,10 @@ ... }: { imports = [ - ../hardware/lenovo_x201.nix - ../profiles/desktop_common.nix - ../profiles/haskell-dev.nix - ../profiles/kids-dev.nix + ../../hardware/lenovo_x201.nix + ../../profiles/desktop_common.nix + ../../profiles/haskell-dev.nix + ../../profiles/kids-dev.nix ]; # Use the GRUB 2 boot loader. From 0eaabffc5598ab9da91a077d502d28a70dfede31 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Fri, 23 Aug 2024 20:07:08 +1000 Subject: [PATCH 17/47] chore(nix): add ragenix --- flake.lock | 190 +++++++++++++++++++++++++++++++++++++++++++++++++++- flake.nix | 4 ++ outputs.nix | 2 + shell.nix | 2 + 4 files changed, 197 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 540ca6b..d709128 100644 --- a/flake.lock +++ b/flake.lock @@ -130,6 +130,30 @@ "type": "github" } }, + "agenix": { + "inputs": { + "darwin": "darwin", + "home-manager": "home-manager", + "nixpkgs": [ + "ragenix", + "nixpkgs" + ], + "systems": "systems" + }, + "locked": { + "lastModified": 1707830867, + "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", + "owner": "ryantm", + "repo": "agenix", + "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", + "type": "github" + }, + "original": { + "owner": "ryantm", + "repo": "agenix", + "type": "github" + } + }, "blank": { "locked": { "lastModified": 1625557891, @@ -822,6 +846,27 @@ "type": "github" } }, + "crane": { + "inputs": { + "nixpkgs": [ + "ragenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1708794349, + "narHash": "sha256-jX+B1VGHT0ruHHL5RwS8L21R6miBn4B6s9iVyUJsJJY=", + "owner": "ipetkov", + "repo": "crane", + "rev": "2c94ff9a6fbeb9f3ea0107f28688edbe9c81deaa", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "customConfig": { "locked": { "lastModified": 1630400035, @@ -921,6 +966,29 @@ "type": "github" } }, + "darwin": { + "inputs": { + "nixpkgs": [ + "ragenix", + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "type": "github" + }, + "original": { + "owner": "lnl7", + "ref": "master", + "repo": "nix-darwin", + "type": "github" + } + }, "devshell": { "inputs": { "flake-utils": [ @@ -1930,6 +1998,24 @@ "type": "github" } }, + "flake-utils_27": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flake-utils_3": { "locked": { "lastModified": 1659877975, @@ -2648,6 +2734,28 @@ "type": "github" } }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "ragenix", + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1703113217, + "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "hpc-coveralls": { "flake": false, "locked": { @@ -5801,6 +5909,30 @@ "type": "github" } }, + "ragenix": { + "inputs": { + "agenix": "agenix", + "crane": "crane", + "flake-utils": "flake-utils_27", + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1718869541, + "narHash": "sha256-smhpGh1x/8mNl+sFL8SbeWnx0bK4HWjmdRA3mIwGjPU=", + "owner": "yaxitech", + "repo": "ragenix", + "rev": "8a254bbaa93fbd38e16f70fa81af6782794e046e", + "type": "github" + }, + "original": { + "owner": "yaxitech", + "repo": "ragenix", + "type": "github" + } + }, "root": { "inputs": { "cardano-node": "cardano-node", @@ -5810,9 +5942,35 @@ "nix": "nix_4", "nixpkgs": "nixpkgs_36", "nixpkgsUnstable": "nixpkgsUnstable", + "ragenix": "ragenix", "utils": "utils_13" } }, + "rust-overlay": { + "inputs": { + "flake-utils": [ + "ragenix", + "flake-utils" + ], + "nixpkgs": [ + "ragenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1708740535, + "narHash": "sha256-NCTw235XwSDbeTAtAwg/hOeNOgwYhVq7JjDdbkOgBeA=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "9b24383d77f598716fa0cbb8b48c97249f5ee1af", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "stable": { "locked": { "lastModified": 1669735802, @@ -6256,6 +6414,36 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tullia": { "inputs": { "nix-nomad": "nix-nomad", @@ -6485,7 +6673,7 @@ }, "utils_13": { "inputs": { - "systems": "systems" + "systems": "systems_3" }, "locked": { "lastModified": 1689068808, diff --git a/flake.nix b/flake.nix index 17faaf1..71b0b25 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,10 @@ nix.url = "github:NixOS/nix/?ref=2.24.3"; nixpkgs.url = github:NixOS/nixpkgs/?ref=nixos-24.05; nixpkgsUnstable.url = github:NixOS/nixpkgs/?ref=nixos-unstable; + ragenix = { + url = github:yaxitech/ragenix; + inputs.nixpkgs.follows = "nixpkgs"; + }; utils.url = "github:numtide/flake-utils"; }; diff --git a/outputs.nix b/outputs.nix index a5c0cb4..f24bfaf 100644 --- a/outputs.nix +++ b/outputs.nix @@ -5,6 +5,7 @@ nix, nixpkgs, nixpkgsUnstable, + ragenix, utils, ... } @ inputs: @@ -18,6 +19,7 @@ in { ./shell.nix { inherit (colmena.packages."${pkgs.system}") colmena; inherit (nix.packages."${pkgs.system}") nix; + inherit (ragenix.packages."${pkgs.system}") ragenix; inherit deploymentName; inherit nix_path; }; diff --git a/shell.nix b/shell.nix index 79d6f31..08db02d 100644 --- a/shell.nix +++ b/shell.nix @@ -5,6 +5,7 @@ mkShell, nix, nix_path, + ragenix, }: with pkgs; mkShell { @@ -13,6 +14,7 @@ with pkgs; colmena # Simple, stateless NixOS deployment tool nix # Powerful package manager, makes packaging reliable & reproducible nixops_unstable_minimal # work around for issue #127423 + ragenix # CLI management of secrets encrypted via existing SSH keys tea # Gitea official CLI client treefmt # one CLI to format the code tree ]; From df59944d2402e9fffcd48a4a44622df130a85c5b Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Fri, 23 Aug 2024 23:48:24 +1000 Subject: [PATCH 18/47] chore(nix): add user secrets --- .envrc | 3 ++ .gitignore | 2 -- hosts/paidh-uachdar/default.nix | 3 +- hosts/sanganto/default.nix | 3 +- hosts/sercanto/default.nix | 3 +- profiles/desktop_common.nix | 8 ++--- profiles/server_common.nix | 3 +- profiles/users-core.nix | 39 ++++++++++++++++++++++ profiles/users-ops.nix | 41 ++++++++++++++++++++++++ profiles/users.nix | 57 +++++++++++++++++++++++++++++++++ secrets/craige-ops.age | 35 ++++++++++++++++++++ secrets/craige.age | 36 +++++++++++++++++++++ secrets/fiona.age | 37 +++++++++++++++++++++ secrets/hamish.age | 37 +++++++++++++++++++++ secrets/logan.age | 37 +++++++++++++++++++++ secrets/root-ops.age | 37 +++++++++++++++++++++ secrets/root.age | 37 +++++++++++++++++++++ secrets/secrets.nix | 46 ++++++++++++++++++++++++++ secrets/xander.age | 35 ++++++++++++++++++++ 19 files changed, 483 insertions(+), 16 deletions(-) create mode 100644 profiles/users-core.nix create mode 100644 profiles/users-ops.nix create mode 100644 profiles/users.nix create mode 100644 secrets/craige-ops.age create mode 100644 secrets/craige.age create mode 100644 secrets/fiona.age create mode 100644 secrets/hamish.age create mode 100644 secrets/logan.age create mode 100644 secrets/root-ops.age create mode 100644 secrets/root.age create mode 100644 secrets/secrets.nix create mode 100644 secrets/xander.age diff --git a/.envrc b/.envrc index 005a801..c242529 100644 --- a/.envrc +++ b/.envrc @@ -1,2 +1,5 @@ use flake watch_file flake.nix + +# Allow ragenix to find it's configuration +export RULES=$(realpath ./secrets/secrets.nix) diff --git a/.gitignore b/.gitignore index b30a22a..0af3f2c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,4 @@ *.swp .direnv -Deployments/syncserver.nix examples result -secrets diff --git a/hosts/paidh-uachdar/default.nix b/hosts/paidh-uachdar/default.nix index eeb6dc9..89e9601 100644 --- a/hosts/paidh-uachdar/default.nix +++ b/hosts/paidh-uachdar/default.nix @@ -10,8 +10,7 @@ ../../profiles/host_common.nix ../../profiles/openssh.nix ../../profiles/pi_common.nix - ../../secrets/craige.nix # Ssshhhhh! - ../../secrets/root.nix # Ssshhhhh! + ../../profiles/users-ops.nix # MIO Ops users ../../secrets/wireless.nix # Hey look! A squirrel! ]; diff --git a/hosts/sanganto/default.nix b/hosts/sanganto/default.nix index 04076de..8f07fa8 100644 --- a/hosts/sanganto/default.nix +++ b/hosts/sanganto/default.nix @@ -20,8 +20,7 @@ ../../profiles/pipewire.nix # Enable and pipewire audio system ../../profiles/xmonad.nix # Xmonad desktop environment ../../profiles/yubikey.nix # Yubikey tooling - ../../secrets/craige.nix # Ssshhhhh! - ../../secrets/root.nix # Ssshhhhh! + ../../profiles/users-ops.nix # MIO Ops users ]; deployment.targetHost = "10.42.0.11"; diff --git a/hosts/sercanto/default.nix b/hosts/sercanto/default.nix index ae670e5..fcc81c9 100644 --- a/hosts/sercanto/default.nix +++ b/hosts/sercanto/default.nix @@ -22,8 +22,7 @@ ../../profiles/powerManagement.nix # Power management for laptops ../../profiles/xmonad.nix # Xmonad desktop environment ../../profiles/yubikey.nix # Yubikey tooling - ../../secrets/craige.nix # Ssshhhhh! - ../../secrets/root.nix # Ssshhhhh! + ../../profiles/users-ops.nix # MIO Ops users ]; deployment.targetHost = "10.42.0.180"; diff --git a/profiles/desktop_common.nix b/profiles/desktop_common.nix index 771e7ec..6d6179c 100644 --- a/profiles/desktop_common.nix +++ b/profiles/desktop_common.nix @@ -11,12 +11,8 @@ ../profiles/daedalus.nix ../profiles/openssh.nix ../profiles/powerManagement.nix - ../secrets/user-craige.nix - ../secrets/user-fiona.nix - ../secrets/user-hamish.nix - ../secrets/user-logan.nix - ../secrets/user-root.nix - ../secrets/user-xander.nix + ../secrets/users-core.nix + ../secrets/users.nix ]; # Common Desktop Packages diff --git a/profiles/server_common.nix b/profiles/server_common.nix index b35a785..72f44b5 100644 --- a/profiles/server_common.nix +++ b/profiles/server_common.nix @@ -7,8 +7,7 @@ }: { imports = [ ../profiles/openssh.nix - ../secrets/user-craige.nix - ../secrets/user-root.nix + ../profiles/users-core.nix ]; programs.mosh = { diff --git a/profiles/users-core.nix b/profiles/users-core.nix new file mode 100644 index 0000000..fd820a7 --- /dev/null +++ b/profiles/users-core.nix @@ -0,0 +1,39 @@ +# User configuration common to all MIO hosts +{ + config, + pkgs, + ... +}: { + age.secrets = { + root.file = ../secrets/root.age; + craige.file = ../secrets/craige.age; + }; + + # MIO Groups: + users.groups = { + craige.gid = 1000; + }; + + # MIO Users + users.users = { + root = { + hashedPasswordFile = config.age.secrets.root.path; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDtjE0YstRzlh+Zhlj03th9DYOkMqJ5xHUcderBq151K" + ]; + }; + craige = { + isNormalUser = true; + description = "Craige McWhirter"; + uid = 1000; + group = "craige"; + extraGroups = [ + "wheel" + ]; + hashedPasswordFile = config.age.secrets.craige.path; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDtjE0YstRzlh+Zhlj03th9DYOkMqJ5xHUcderBq151K" + ]; + }; + }; +} diff --git a/profiles/users-ops.nix b/profiles/users-ops.nix new file mode 100644 index 0000000..7de8891 --- /dev/null +++ b/profiles/users-ops.nix @@ -0,0 +1,41 @@ +# User configuration common to all MIO Opshosts +{ + config, + pkgs, + ... +}: { + age.secrets = { + root.file = ../secrets/root-ops.age; + craige.file = ../secrets/craige-ops.age; + }; + + # MIO Groups: + users.groups.craige.gid = 1000; + + # MIO Users + users.users.root = { + hashedPasswordFile = config.age.secrets.root.path; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDtjE0YstRzlh+Zhlj03th9DYOkMqJ5xHUcderBq151K" + ]; + }; + users.users.craige = { + isNormalUser = true; + home = "/home/craige"; + description = "Craige McWhirter"; + uid = 1000; + group = "craige"; + extraGroups = [ + "audio" + "libvirtd" + "networkmanager" + "qemu-libvirtd" + "video" + "wheel" + ]; + hashedPasswordFile = config.age.secrets.craige.path; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDtjE0YstRzlh+Zhlj03th9DYOkMqJ5xHUcderBq151K" + ]; + }; +} diff --git a/profiles/users.nix b/profiles/users.nix new file mode 100644 index 0000000..80040cd --- /dev/null +++ b/profiles/users.nix @@ -0,0 +1,57 @@ +# User configuration common to all MIO hosts +{ + config, + pkgs, + ... +}: { + age.secrets = { + fiona.file = ../secrets/fiona.age; + hamish.file = ../secrets/hamish.age; + logan.file = ../secrets/logan.age; + xander.file = ../secrets/xander.age; + }; + + # MIO Groups: + users.groups = { + fiona.gid = 1004; + hamish.gid = 1001; + logan.gid = 1002; + xander.gid = 1003; + }; + + # MIO Users + users.users = { + fiona = { + isNormalUser = true; + description = "Fiona McWhirter"; + uid = 1004; + group = "fiona"; + extraGroups = ["networkmanager"]; + hashedPassword = config.age.secrets.fiona.path; + }; + hamish = { + isNormalUser = true; + description = "Hamish McWhirter"; + uid = 1001; + group = "hamish"; + extraGroups = ["networkmanager"]; + hashedPassword = config.age.secrets.hamish.path; + }; + logan = { + isNormalUser = true; + description = "Logan Stoddart"; + uid = 1002; + group = "logan"; + extraGroups = ["networkmanager"]; + hashedPassword = config.age.secrets.logan.path; + }; + xander = { + isNormalUser = true; + description = "Xander Stoddart"; + uid = 1003; + group = "xander"; + extraGroups = ["networkmanager"]; + hashedPassword = config.age.secrets.logan.path; + }; + }; +} diff --git a/secrets/craige-ops.age b/secrets/craige-ops.age new file mode 100644 index 0000000..24bf958 --- /dev/null +++ b/secrets/craige-ops.age @@ -0,0 +1,35 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEZCOVgxUSAxQXRV +TE5GcXp0ckxqbml4Z0tmdERnT1QxcVpOSUxPUER6bFBSbEhZbTJ3ClJGWnlTN1Rr +ZStKcmRIOTRyWDhkMVRpYW50cnJUSzRYcm9LampkRWYreHcKLT4gc3NoLWVkMjU1 +MTkgSk00dDZBIERxU2V5VDlJd1RsQWQyQ213NzVTcFR4UkpKWXFKUzZUTmxmUjlw +M2NRaXMKWjI1OEdDaFQrK1R4TVdwRVhGSlo3dzVoSTBTR3RwYWprSG82cTU4Z0xo +QQotPiBzc2gtZWQyNTUxOSA5aEV5RFEgYXU2Z0ZvNTd1U010TUcwVUtUeUVqUitC +dHpRQWdUYnNzQStVSTAxMGUzSQp4K2hPSkRINTRlOWNic1lIU1kwQk1YT0RGYU5y +OStONjFSMlF1OHlIT2JjCi0+IHNzaC1lZDI1NTE5IHU3WjNqdyBDOW9Zd0NXazJM +ODVDYkRoSWdoK2JDZzI2UkVpb25NTTVpNFNDN2VXcUFFCmFpTVNZN29TNzlYa3I2 +V0VWMU5aWDZqV1E5cUpwcCtHL0RuUkVuSlpRbDQKLT4gc3NoLWVkMjU1MTkgV2c5 +M3J3IGgzZGM3d3J0Wk01RVM1U2FkL09vRUFHMkliSnBiN0dMbUJ5TjYxdDJEMlUK +QzdqVjgveUhlbkRZdTk2cUNmenpjM0o2MnkrL1g3c0VGUDJQZHgzWncxawotPiBz +c2gtZWQyNTUxOSBQeEt3alEgWnhIQlgrYUI5UzdqOU5ENHZteFd5bFd3UEVVeUE5 +NkFubFpzQ24xVXZndwpkc1NtSStzYU5hWnZXNXRiYjBqMWtSSmcyMkFUeUR1cDJq +eWNnNkZoK0RnCi0+IHNzaC1lZDI1NTE5IEIzZFhTQSBmRUViME5ZYUZ6TExwVW5H +ZUZaTzhmWktzSjZ2TDdLY2IySzRSL1AvUzBvCllVaTF6NFJuUi9CcHBFT3huWS84 +Z21Xak1RbmI1Ykh5ckR2V3BiK3VLYmcKLT4gc3NoLWVkMjU1MTkgUWZwS1ZnIE9z +L3ZDUkhDbDFxZGQ0bHppVWtMTlc1M1Fpd2pGZEFaV0lad00rZXVRRU0KaUNPT3JT +aEJ5U3l4RzVkSnV3MmM4OFZXQ0RKQWs3NmtnYXB1RTMxc3FXTQotPiBzc2gtZWQy +NTUxOSAwZHBkZ1EgMi96OFRxcjNveUdoeVNtbnV6YnlOOS9TRGxGWWJRYjJDWXlB +R0Ixc1ZnbwpDOGVrQktzSWRETWErTDBOSHBsamlIeng2akJ0Ri8wcWZidTY0eUJV +cnlzCi0+IHNzaC1lZDI1NTE5IHVsMGt4USBaYjRFZXdjcUdsZVBjYjY3bTMvRU1a +c05WY09kMUNCYjRtRGtYZG1iNjJzClRWUnVnQU56QWZOTkF6ODFvOTlnZkNUeWNC +OVB5bHBwVzRVK3BRdjRpa2MKLT4gc3NoLWVkMjU1MTkgWnc1SGt3IHJGa1poNzR5 +cTRpNStvd0N4N0lFS0tJYVB0UDZzSHVFM1FHOWtMVFNMaFUKK2pKNUFNNE55ZGJj +TWNBbzZNSnQ4eERHOWs3YnpQSDlwS2lzREVsQzhuSQotPiBzc2gtZWQyNTUxOSB6 +RzMrMXcgUEdobnlFUkNZRkliaVRJR0dHMDBDN1dLK3FaMFdwQ2gxUTIzWlZ4SkJ6 +MApLbjk0QVVPbytHazNqL2o5RWM2clZzRzA4TkFDVHlPM3U1aE9EZUJ1VTJZCi0+ +IEdFWn5dJCUtZ3JlYXNlCkpwUzlWd0VPNFp5QmFKWG5PUGF2NnpLQm1kODFJNXpN +NjBvCi0tLSB6cmJDT0lVZEFiZlBoQUd6NlZubU83QkNIRVlqSjhUZXRrUUFPVXMx +QVF3CqjMyxbHnczjBeKEemv2tEz9t9yDBYttGCcKCNfVKOpaKHMLcHU0ycC6dZbf +1d3fXDeAh/87g8RUSMpJfchDB6VpM8xXJgb/214VHDNyPBbNuzSrZvlA1ibwPWKh +U+XInONTk29sg7jHiJlgS6+9Y1aL1vXVOkdNMq718/lJBwSSu1+v +-----END AGE ENCRYPTED FILE----- diff --git a/secrets/craige.age b/secrets/craige.age new file mode 100644 index 0000000..e4fdd5e --- /dev/null +++ b/secrets/craige.age @@ -0,0 +1,36 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEZCOVgxUSBhSE56 +N3RlOElYWkJYbWE1MXBFV1lVcW9Cdk1Uc1huUmp5NU1ZNVJjOVJBCkNqai9UcDIx +RWxpaEZJQmlKamZTWVVyd3pBRUNCajhSR2M1Z05ja2QwMkUKLT4gc3NoLWVkMjU1 +MTkgSk00dDZBIE1DY1hwNmdzZDhqYzZ6Z1NpY0tBZmUyQ3ErdXBSa1ZUV29hci9i +VE5jbFUKbW1pSWc4d3p6S2F3dUFwb25wMHJsZzZYMzZUQjFrM2gwYTNSRlhKUHl3 +WQotPiBzc2gtZWQyNTUxOSA5aEV5RFEgeXlzbmllaUpzbWFoUnpkU1RwVDNkd3Fm +Y1p2VVIrRmdISFdsUllOaHYwWQo1ZTY0N0UzUjdVTWpKK0VIbXJJdC9QbCtaa2Fn +Qm54S1lxSVliYzdPWXNJCi0+IHNzaC1lZDI1NTE5IHU3WjNqdyB0MncxeVdkdWZ0 +MXhvVnhtTVFLVkw2d0gvb01yakx5ZGQ3c2ZKSU1mZ0RrCmZiYnQ1bFJMeUQweFpz +YzBtNUpSYWI0TW9oNzFRWWxVekFmcEEwRXk3bjQKLT4gc3NoLWVkMjU1MTkgV2c5 +M3J3IHJZUXdMWktKNGdMb0t2ZWxkcE5CeWI2Y2xpaFBVNEFRQ2hlb0FxRzhla1kK +clg3cmpVSTJZQlU4aDhoWG1zNzRiR0tLTjI1VS94VkM3eVhUU3JRbmg3cwotPiBz +c2gtZWQyNTUxOSBQeEt3alEgSzd6TUp5ajA3enFxdnpuenl2TlJzSW02LzdJS3J3 +a014NW9wWVNiZVB5ZwpacXNXQ3JHeHUxMVorN0xISFZRUm5RSXl4RlgyYWJLNlJN +TllKME0rZ2Z3Ci0+IHNzaC1lZDI1NTE5IEIzZFhTQSBTRXYrYk9FVGV5UkZUcmZ3 +T1AvT2l1d0NmeUhJM25POVFFQVdXdk5NaGlZCi9xbkt5VHQ1V0gvMzVXZ25CNlYv +dDBpMURza3MxZzNyVm9VbWZYdnc2NkkKLT4gc3NoLWVkMjU1MTkgUWZwS1ZnICtT +cG5uYWFtZUNYUkNpMlNyb1JkOVFkUDA4WERQaWQ0Z2JEOFBnOFdweHMKdGtxV3hV +ZUNTS2hpOU41NkVxMk5yUFdka0x1WlhSZ1RMMFNHd2lrTG5xYwotPiBzc2gtZWQy +NTUxOSAwZHBkZ1EgUm1uc2FJOUdKbHpkSXRvcHBINEU5QzQ5aWliYm42OFNZMWx4 +OTRURGVSYwpJZVpoL09QcW9JZGJZc21BNUliVWVKQlMraXV3U05seTVQUUNJZ1lF +TjVNCi0+IHNzaC1lZDI1NTE5IHVsMGt4USAxWWhMK1lGUFhBanFMbEQwVTgreEcw +a2JJcVFla3ZmOHZJK1VPTFZuRkNBClB2ZDVBYTc4QWZnUDdEdFdOZkx6dnpRZTkx +MDlOZitJd0NZM2V2amNUcmsKLT4gc3NoLWVkMjU1MTkgWnc1SGt3IHpiTGZmMFUy +MlZyZlJMa01GVmRsQ0hFRUxBWituMkE3S3RPRUJLdU1LbE0KN1M4RUJoVjVhZTRs +K1g2dGEzMjIyaWFEaHhIQ0tkSDFGMVd1WTh0Um1kZwotPiBzc2gtZWQyNTUxOSB6 +RzMrMXcgSkNsTUlxZ05jcmp5bDJhclhEVldjWXR2TWFreTdSSXl5MFNXMUNxWDJX +QQpHQ01ZLzRXUTNJTVJvK0dHNDZoTEtFaUpRRFoxUGFUampSRzREUzBtbU1BCi0+ +IF5bSEdnXH0tZ3JlYXNlCjBmSlA2SHREd2cycEdsZGhIMVJhUDZ1dXVjYnI1eURL +dUVDcGlZb2ZwaFZPTUNZeFNXSC94OEtYc3pFN3RtZUsKUU1qS056SmVidHZ2c28w +Ci0tLSB4SEdpRXd0RUxmVm5lVXJaWWQwbFFNVlo0SGxBK25jaHg1Umt2K1dsL3VR +CrLdgAdAyLUrzRwPhN0rl5DD6Z97AYiH44VcKrqZzkZYbhTfhHEHE/LwJIePAOiO +WHEYkWQtMOfaz1t6Nwe/bjG1VLRkttWRQNKWEewxG5c5NppWcgDIrd05DDX6oiRi +/oGAp7PVaZwkvgOwAxtD5OS/jTT+BzV2yGCBoLNSuqxF9VCL1yYtYzllBQ== +-----END AGE ENCRYPTED FILE----- diff --git a/secrets/fiona.age b/secrets/fiona.age new file mode 100644 index 0000000..5ee8278 --- /dev/null +++ b/secrets/fiona.age @@ -0,0 +1,37 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEZCOVgxUSBqb2N3 +cWFZNUpscUpmRm9oRTgwOWU4Mkhpcm1CdUQ2alB5RW1Ib2p5S21zCjJqQjhobFI0 +MW9SeWJldWdiMjMvQWxDYkpBQ3VMUkFnT1N6M2ZkNEdGTFUKLT4gc3NoLWVkMjU1 +MTkgSk00dDZBIFlIZEFwSVFydytDNXIwdlFuNC9iWnFXOERhV3BNY3lxdzJmelU5 +OGpRMDgKc3VGa3NBWFQ0UVR3WSs1TVBIQ3BQK0t1eU5FOTVpVnAvWjJpT2hoSGtN +TQotPiBzc2gtZWQyNTUxOSA5aEV5RFEgbS8xemZwQVhnSXB4amdNQWsybUdTblI0 +anYrWWltYnFTaEd0SGpxamlYMApTTXNwZ0E0RnV6NHVNalFGc3p0VDRFRXJEWW4r +ai94aHdyeGIwdzdHT293Ci0+IHNzaC1lZDI1NTE5IHU3WjNqdyBxSHZyTkdodWtl +dGdKemxTd3JEdzE1MFVVM1lsM2d3UE5JYkxsM1F3ZzBBCmNpN3FHaDlGOG1kSVFl +Y2NuN2NYajV4K2pWdDhMa2E3eTFWRmJacXo3UGcKLT4gc3NoLWVkMjU1MTkgV2c5 +M3J3IHV3TzYzZnlvNFpBQVE5MzRpYlc5QmZUOHlYbGs1QXJZZE1VdkdLcloyVWMK +RTdDakloVzBnYkNNQU1FOGtCWnlkRUdjZVFtcEczNkRwN1VUcHhveVQvMAotPiBz +c2gtZWQyNTUxOSBQeEt3alEga0xYNjlOR2JmLzd3amcxQ1AwQ3VONXIySDNHNG51 +cWlYMWNUd25mRVFtawpzdjRpR0pwN0QzOWdEeHFTYTJQdmc4YzlkMkhNUnBaL3l1 +T0JoeFVMUHkwCi0+IHNzaC1lZDI1NTE5IEIzZFhTQSBvaE50ZjMvTTdDMUo5ODFn +M2tMcWtvb3VqbWNBNFh1NlhIaVVnUk42d2dzClVOSWw4YnB4eXI3cysvQ2ZTeFdK +dFR2d0EzR25DSDByaFRyZkJzblpwUDQKLT4gc3NoLWVkMjU1MTkgUWZwS1ZnIEla +QWcxUW90eHFkbUx5b2VpOTA3WXQ1Undud1ZBV3BOdWp4Yk1jV1UxU00KRzZpQWpF +Y0NOZDZYWE1uanFYMGU3YitVcUVhMG5rdkcySHU1NTB3bk5CMAotPiBzc2gtZWQy +NTUxOSAwZHBkZ1EgbkdKWlJDYXpVbmE0aGZrR0pQYnFFVFpsbzFaZm1rSU8rY2hP +aFBaU0FGSQp3V3gwQTdhZG5UVDhvc3hwZlZEaGtMc2U1ZGJsY2dvcE5GMi9MUnIx +c1MwCi0+IHNzaC1lZDI1NTE5IHVsMGt4USB5dTBSa3hVbmpBWEFyNDFvU3gxQlpE +c3krU1c1ZWVlY3FkbjREMzN0czFNClJKalV5VDdxbnErcENOWnFzSXkwajhKcmt6 +QW5sdGtlTzZiR01sdkZEcUUKLT4gc3NoLWVkMjU1MTkgWnc1SGt3ICtsSHdFaGlP +Vyt6TWJ1Q2kyZDhmNUFQbnltcHdhaXh2NXM0dS9Bb2dwamcKcjg2VWZudGFvZDVK +M2pQSUtFdU03c1hWWWNqcXQzTDF5RHJVZ3lPVFNqVQotPiBzc2gtZWQyNTUxOSB6 +RzMrMXcgMEk0RGFQa2YvcHhRTklLSjBCaFEvb09seU9pMHVwMXhzL05HY2xhWTFt +QQpXdGNUeE5vbDNXb3FDVGxMdWt6MHpDVXQ2UWc2R1lzdnJvSEhLalRxMFRBCi0+ +IENKKjlNTU5dLWdyZWFzZQpHT3BtNFJPdEdFdzhSbk9Ud1JjdmZmbEJIaFlYbkxz +N3VCMTYxbEhrN1VFckQ2ZDc3aUt5MEE0SU0vYTE3Nlg0CnI2UTljOGdiK0h0SEps +WmN1K0hqa2VUVnJxMk94Tm9ORVZ4ZTdqLzBidk5FNmh1OEFjblpTdwotLS0gYVQ2 +dC85STBXYi9IRnFWVFdvTmRkUG15RjkwTkFnQlE4Ly9hVGk3TWp3NAo4cVH9Y1Kg +1Z1zTvAW9/e6QpBBUQo/9eoyXpwmCE1hLaowxGUf8gvsWAMbVQTdI8NsejCyM44A +l1+EhywFfBNQXGwnsBjPUdnenDcqNhdO2LHybqvvdhWOYC+J5JQjczxdZ7myLtP7 +VKyEh2ac3E9d6OQqul5zaWfbiM2vcwf+0O1r04Gfvc7j +-----END AGE ENCRYPTED FILE----- diff --git a/secrets/hamish.age b/secrets/hamish.age new file mode 100644 index 0000000..0ebd20a --- /dev/null +++ b/secrets/hamish.age @@ -0,0 +1,37 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEZCOVgxUSBNZHA0 +TisvQWwyUXJJU3JBd1pFeWZSVWNPYnBQNW5MMHN2ZUVCbWY1S3lrClBobFVsbFJj +QjNrQ3B4eUJBVTNrSUxYd0R5eXd1NUpkQ0R0Ymd2ajlPdFUKLT4gc3NoLWVkMjU1 +MTkgSk00dDZBIDFMY0tKRU1jazFscFRSdTlXMDBPdWpldVZIRjdiNGhBM2kzcGxx +UXNjbGcKZ2N1V0dWN21zZ0V2SUxMQUNJK0R1VlZCa0RKMVBLL0lhQjN1RXBEbXVN +QQotPiBzc2gtZWQyNTUxOSA5aEV5RFEgb1RhSWtKTUJMVGpxSysvbExxRUY3bGg5 +U3VvdHNOaWE0b2piYkcvdjBDawpiOC9LV2FldXQ4YkNRbjJqT25sdEpabG9TRHZV +cVVvZm1MVFR1QmZmVkdRCi0+IHNzaC1lZDI1NTE5IHU3WjNqdyBZUE9uYVg2WDg1 +S0dtV3BFYmppbnZ3MklFRFFXdVlGZkpmUjg2d211RW1jClNad2VZU0REOTVrREJE +U0lGc1pUejBzRkFHL05HZ0k4czgvUTNWR3NaMXcKLT4gc3NoLWVkMjU1MTkgV2c5 +M3J3IGR0ekF4L0FSaEVBR3BJVXFaQXZjNktHVmN6TWVXbWdkY0JBOWtGVzczd0EK +RjUyQTJrWVdsSXZUcTFFM0dzTW5HTHJxeUR3VDVnaXpHMWdTeHVXclhybwotPiBz +c2gtZWQyNTUxOSBQeEt3alEgWndrODAxRlE3cmxNL0ZtTW0zTlI3a0MvZncxZFE3 +NS9xWWdMck9pbkF5UQoxRUZNUUZaMlI2bG1JNk5kTUd1WXhoZXNrcitlNThVeU90 +K0ZvNEN2Y2RNCi0+IHNzaC1lZDI1NTE5IEIzZFhTQSBqNlF1akNrQ1o0UXdJeEc0 +dkgrUXNuMHp5VUU1eXNJUytRY1VXdW9aTjBFCkl2dHFyNkF5ckdTU0IzVzF3bU91 +eWhReElJaysxMXdsd0hFVHYwMk1qajQKLT4gc3NoLWVkMjU1MTkgUWZwS1ZnIGd5 +eXlUMEpSZGRWb0Z4OVFFelN3YlB3dklqT0ZrMVcxMlE1Ulc4ZHkxbHcKOFZvd2I4 +NUNHOTRrc1NWOGxzeTZhOFMxbUdpNklPNE43bFBMLzdxcVZHcwotPiBzc2gtZWQy +NTUxOSAwZHBkZ1EgUXR6dzlqaFhCS2FJSERndFJSaEkwRFIrMFpybnd5UTdaQUZM +cmQ1Q3ZSawp0T1ZnZGxIZ0V4QnFsTTB1V1NWNDdMajR6dEc5MmpVMThKSHNrMHVV +STFnCi0+IHNzaC1lZDI1NTE5IHVsMGt4USBqV3hXSGlrRDBNdWhmTEZRN2NLQkNu +aWFOeERHNm5UWllqRVdFMnMwN2tVCkVQL2lCMXhCYTVpTWJydEJHZmd1UlJ0T3J4 +Y3RLcGFqOVhuQTVncEc4QmMKLT4gc3NoLWVkMjU1MTkgWnc1SGt3IGJrYlljWndR +aysyNVExcnZKY1V4OHVnSzhpNFYyWUJTZy8yb2NpVE1FMHMKbGFhQlBOanhUaVRT +L21UWjNTNUwvMnh5dnpsTWRGNWJnbERoZ0cxMXVKdwotPiBzc2gtZWQyNTUxOSB6 +RzMrMXcgb0RSWXhSYk1USjRLdk0xVndRWFNrVVZpVE1ldG5qQUNGWFd2ZFRkM3lR +WQphYkdyMjBlRkkxRUR5eEdxOE1SMHh5N1VQUHJmRFdKNHdrQUxWUWIzZ0ZFCi0+ +IGA+TXxpRiFgLWdyZWFzZSAsIDZxfSVBeCA4fjZyCkFuYlBPWnQ1SDkwVFdiUFpr +ZC9MblJJSE0yRWRXQ1RuZFduMVoyU0cxRjh6UE5qWHpQeDNKY1FHKzJHUkcxcDAK +bVBXZmV6YWp3RFRaalkrT2JPcldaZ1NhNFljCi0tLSAxUUM4b0N4YTdMOW5rWWZ3 +RUtNV3VBYWV4bENhbFJZS2ZMUzkveGtabUZ3Cs10FGWYdOYr63rRA2P7jM9HI/9a +t2gFVJyA+AC0hPl/pDVabyrF48d8lWzk1IwVe3jfP5QHZxhHwc9vuu0crw3EJAmK +Q+QgythEzjF0ftCosDXLg5J8A3lkPlAe+km6T294oFxTW8pG/h8tu4rKukJWnYSU +E09AHZ795YX07jKvrN/U11HRd8g= +-----END AGE ENCRYPTED FILE----- diff --git a/secrets/logan.age b/secrets/logan.age new file mode 100644 index 0000000..5242c4f --- /dev/null +++ b/secrets/logan.age @@ -0,0 +1,37 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEZCOVgxUSBsSURv +VzMrb2x4ZHBEdjB2N01nZTBtTzlOOW9JYnpLZ0hhRHFJRmd2cFZRClFVaUtVTWFD +MWdtMTczcEhZSEVRK25aM1djN3p3MVlzSkp4UEFnOStxUkkKLT4gc3NoLWVkMjU1 +MTkgSk00dDZBIGRFeXkxMDhBYVFqNjdyLzRyQ0xHQWtib0JHbkZnK0R0ZTdVeHRm +T0l6azgKUWZobTdUYkphUmZBQWRocjhIcEF5eEk2amt4RDRxWjBFOFBjcWZ2dXQ1 +bwotPiBzc2gtZWQyNTUxOSA5aEV5RFEgK21WdkxyQmNFeXhMUXF4SGhWczFqczRG +ZHR2ZlIzaDNvc2Yrd2FPOG5RWQp5YzNBTGlZcXZlZ2M0VmEvdkxRNzNVMXh5K3FV +Ny9pZmt4S0dIakd4S2c0Ci0+IHNzaC1lZDI1NTE5IHU3WjNqdyBDbHFFRTFDaGRi +MWxpbzFYa0tUTUsxWFJya3hGUjVVVTIwcEpxNFhyNWpNClUwV2pCRlhXNWhwM2pk +TWlTeTVrbS9lN2wyU2JTVnhUb094Tm9OQ1VCMDgKLT4gc3NoLWVkMjU1MTkgV2c5 +M3J3IE1nL1ZaMzVZc1RHNXJycW0xaFBuVCtDS2YzRTVPYWZ2SUVpVmN3NVBBUU0K +TWc0Um4zNTcyaW5NUHRxS2dsZWNZa3FwWVVnSU9EVk9LNEVoUVN0SGg4ZwotPiBz +c2gtZWQyNTUxOSBQeEt3alEgemRWUm9LVEwvYkRtcHRjUzExeGZENHRUMWxGSkU0 +TWE1NnkraStwa0REUQo3Q0ZtWk9UTmsxMG9aNE9uaVptd3htZ1FCQzFZM0d0Q1Bw +TVFoWGlaamVNCi0+IHNzaC1lZDI1NTE5IEIzZFhTQSBuSUVqVHlJTGVKSTlydGxN +eUZjS2tybjJ0Tkw1ajBoRkJSN3E4SnV4RnlBCldES1ZvT1VObDhnL0FHUUVreW9F +bTRCMCtES3NJbDRhRjE4ZFU2VDdHTDAKLT4gc3NoLWVkMjU1MTkgUWZwS1ZnIGh5 +M3NBcFhpWXdjWklqNk1vMVZXRFMybDgzVTVXZE9uUDhMY3BQOXZIMVkKak5reisr +NkVqSFV1UFZVVWFxVmNBN2xGZ0F5RW10QmU1U05lNllHR21XdwotPiBzc2gtZWQy +NTUxOSAwZHBkZ1EgVzRWSFRCSitURWxEcW1Oa0ZXdkQ4SyswODM5cDVzWFpwT0hO +aGE3OXVVcwo4SFJsRGlGdWhEK0JUTlR0am0xVG1JcjR3Y2lJblVsTUJtWFFlZnVn +ajlNCi0+IHNzaC1lZDI1NTE5IHVsMGt4USB1L2d5SDJVTUp1Q01kYmE3M2wxc0JT +QzdtS0hOTlY2NUhHaFJHUU5HVGxNCkkxV0J0OC92TUNIMXh6aUJIMkxYc2x0bzF4 +OGRNcDlneUdTWUR4TWdvbTQKLT4gc3NoLWVkMjU1MTkgWnc1SGt3IC9XeWdBR1lB +RThIbytIK2pJUjl0Q1NyV1FETUtad1BPTzczVTVwK0pSQmMKUjJpRW12Z3hOQ1Js +V0h0bjg2UVhFbllTK3ZNOEZJVjlnS0d6bS96bUpMTQotPiBzc2gtZWQyNTUxOSB6 +RzMrMXcgVFFnMXBuVkMxOWxMaUJKMmRRQ2J1TXlhOHFITzF2ZlMwWUwwYjFzcFFo +dwpGdUJsdHhCSUplMTZnWkhPM1RBZWs3cmFiSlhhTnBBZlRTTGtiZWFjTEZJCi0+ +IE93OCk9Ly1ncmVhc2UgalVrLFEmMSAwb09BMFEKZUV4YWZabnU4S2V6T3FyUUk5 +bEZYU21WN2s5czA4WGg2T3V2dmM2bmE0QUMxbVNYNjlOcUVvTkJvZmY0V0libgp2 +M1pOUnRVCi0tLSBXTEhsQmhlZCtwMVNyY0dadlcyKzV2U25sRWoxMzhEY1l5KzNS +cVVaVnJBCsyrUAefxlWiCVPCOzXHaPlmcXrvChiS7udyIfSXKaiN4N/dxW2Y1h/F +unCbKUkW/qGO8cqyHzbudwl72iwRK6aqqmRVkTk8wd6+0XeWdPmxJCR07AMe1DEx +afv5xFidKkuaiglMPxI6TCy+YVH+2BQPhkEquvSkhJjnWJXqj7S/KQ9+Fjlz/ZcQ +zR8= +-----END AGE ENCRYPTED FILE----- diff --git a/secrets/root-ops.age b/secrets/root-ops.age new file mode 100644 index 0000000..b27ae57 --- /dev/null +++ b/secrets/root-ops.age @@ -0,0 +1,37 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEZCOVgxUSBKWHcv +a2NDQjdtZnE0TFpHSWR3dFdWeUpCd1A0LzlsZ1NudHN4dENTbmhvCmpvVjhCdXlH +citVTmlyZUh2UFl1OWQ2Y2d0L3dnTVNzNnFLekhqbnVUUkkKLT4gc3NoLWVkMjU1 +MTkgSk00dDZBIGR5ejRQYVRvSTB2TzA0cktYMU5sSlY5UXh5YkRpOTVDSWFoVmo5 +c2hLRk0KaUFlbFd0V1FzaGNWbUhiT1R5MG0vUEJtaVN4MjJ6RWM5MndWRGlqaTI3 +bwotPiBzc2gtZWQyNTUxOSA5aEV5RFEgbmQ5RjFNK2lPRHFaZjQrNTRrWGE1R2tM +aGIwazVRMHJWblZWMGQvbVBGYwpDU25rV2ZmZEQvUWFkSjlvTkNCK1hlYXUwRDE1 +SUI4TzV5WmtJZXBpTFlJCi0+IHNzaC1lZDI1NTE5IHU3WjNqdyBvZDFncmtaOWFH +SW1veDY3Z1NOV3VGVDQ5dW1TeUdZMHE5cmp0S1JSUkQwCkpiWU91K0xGd0RYMXha +MVp2ZTcxOWszWDJ6Ui8xSG1mSnFmd3U5WWZEVmMKLT4gc3NoLWVkMjU1MTkgV2c5 +M3J3IFZ2d1BhdFdjT0hFYWhjNDZnRXdHY1V6VStqWWxQQjlhNG95bVRPWGRqUXMK +bC9OWlExN0lDcHpkdXRHbVk1ZGlaQk9UNGpwdTVBVTNzbkJKN0d4ZlJVTQotPiBz +c2gtZWQyNTUxOSBQeEt3alEgSTkrQXFXdlJvcVlEOVlYZDBvZUF2bmgrR1FSUGJR +dTJSMWcrQ1ZXWG1nUQpFSldCdVFObXloTFMrUDQybjZzK3Jqck4yMUt6NGdLUEpp +VmZtR1VnaWRzCi0+IHNzaC1lZDI1NTE5IEIzZFhTQSBYdEY1YlV4djEvWmlCblpa +amdnRjk2VDdoN3BkemJVbldrMU9OeXk0Mnd3CnNsZ1BpWURyRHBSc2twblVmNE5v +QnM3UTJ4cDdwbjNHbi9pZ3FMdDFrMGcKLT4gc3NoLWVkMjU1MTkgUWZwS1ZnIFVs +S1Z0cFVZa1RaNEdrWWN1M1lhZUw4YXJoNWswNjNuWDc3Q0hRSFpTekkKUzkrSXRZ +LzNYS3pnMlBNcFprQjhxZjZqRUZYUE9NREJsdHdnczkyMEJSWQotPiBzc2gtZWQy +NTUxOSAwZHBkZ1EgSnhNNStteEpvZ0tFM3dLWDQxYk1xM1NMQnQvMTk2dWpzMFFs +dlMzcWVDSQpXcFZVRDArUUxWMHJoczJSNGFCOU9LZXlNQzFBQ3IxOFo1YmhVbHAy +cS9FCi0+IHNzaC1lZDI1NTE5IHVsMGt4USBIVGpPSGFzb2dvZjVkL3JPSVVnVzdj +NTFTSmFaS25lNHJYY3BkeTBLY1JrClh1VGZtdHNwaHQ3UzJIbmhYdDhadWU0MU1N +VGtmQmFYMGZHTUpiQlYxSkEKLT4gc3NoLWVkMjU1MTkgWnc1SGt3IDNlWmtZVjhk +VmVEUGxOY3ZaMHNhVVp3aUJzbE84alc3aTdYTSt3ZldjMU0KanZjMTVYNjNwazFr +N2xwampmaUJLSDVuTVBvNnBXektNU0JSbVZrN1RtNAotPiBzc2gtZWQyNTUxOSB6 +RzMrMXcgczdIZE9hSEt4eFJxTnV1d05qa0VVeUJRUE1PUWNMbnBPNW1Cb2RVQlFT +awo5UEFrdDg2cUZsMTI0b2FmYkd3TFQ1NjNYMHNkd3A5LzBxcjlNSERCUDJFCi0+ +ID8tZ3JlYXNlIDs+XSkgPVp8TSMtIHQtVSBFal4vcFR9CnZCOWdjaEMwcURwaWJP +U0YvRUd5SGdBMDE4SnpXUEN3VU9aWWtFQTB1eCtmOEM3Q2p5YkVaQ3QvSXVXUSt1 +YmsKUlV6Vy9VTVNqYkcxcXJSWkgzbnpidmx2clY2enRhLzF2MFZIdDhNbGtZZlU5 +cWk0Ci0tLSBEdmRaQm9FVEhkQWFGZWtyYllOM3YvNGZJQnRvZWI3YjZkdlh6a3Ay +VUJ3Ckgtz/OSIjtMrLDB75AIG+NnhV4476zzaLynMBPtCbQD5/Are2hwwfv3War9 +UKv7+MIb/VMLicfSQdooIN/ZutUo4QmaS/mrf72bGJqqplJaqLR8zc5rJZEyuDBj +5o8uY6IpJ7LEPm2FOAFcrMPHdSAS9y2+BpiPJfeF9vFgJ0IPZy26 +-----END AGE ENCRYPTED FILE----- diff --git a/secrets/root.age b/secrets/root.age new file mode 100644 index 0000000..3867d15 --- /dev/null +++ b/secrets/root.age @@ -0,0 +1,37 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEZCOVgxUSBscDBF +dmp4Ry9nV1Y2dWYvdjJtYnZNcmZhS2ZmQnB6ZWhvTUhrMGJPb0NVCitUUVJiRDlP +dzNjM01KK2w5blRHbExpU3k1Wm9mVDJ3N0dudVdQR3AxQkkKLT4gc3NoLWVkMjU1 +MTkgSk00dDZBIDhYRlpJZWREbDNSeldwbEM1ZXA2dUpMcDBJK3owdGpIWWlvT1Fa +TnJrbFUKQWMyY2dvUDJwUW50Wk1oSzNCTysvL2JPSDJ1V1dmSXRDRmRRK0R4OTVS +TQotPiBzc2gtZWQyNTUxOSA5aEV5RFEgbXVHNEg4c282dmRodEdheVdYVjAwb3Y5 +VUU3R095aDBJaTlzdlhkYkpSOApFcDFhZmlwdjg2VFdiVGI1Y3ljOC8wWFVqbE5o +VWgxUmVReUZ0NHl2TGpNCi0+IHNzaC1lZDI1NTE5IHU3WjNqdyBpQ1pYNXJwZVpy +QXhBQ3dySXg3Y3IxYW1FWEl1eW5ISGtva2pEdEQzUUFRCi9DMWg3R2pwR3dXaWta +UHRhNFZHT2w1MXF5VFNJU3EzSU1nSHdjVG5YeFUKLT4gc3NoLWVkMjU1MTkgV2c5 +M3J3IE9iS2cxQUZucHorOVJTeGEwaFZxTDU2ZE0wdXd2Rk8yUmZ2amxEaGxMem8K +Qlg3T3Bqbkc5S21Nc20wMTBRZUlUeUJucHY5RWhWbFg1S2VEWGtnK09VMAotPiBz +c2gtZWQyNTUxOSBQeEt3alEgOUxZWCthUkxlaG5MYmRQbTRSSjFZNnI5TndBSmZs +VDFjOGxXZlZxZmltYwp6TnBFMFdNbXArdHBuZThxeWwweGtFZmR6eEx2YXZ4U3U0 +bHpFODM2QmV3Ci0+IHNzaC1lZDI1NTE5IEIzZFhTQSBKVFVsbW5BV0lnM0ZkU2tC +U1VPbjRBY0M5ZW9TdEg1U2JtTHlGVjZ3TkFNCnNjRjFYMDBwSnBOMzZnSWhpSFF6 +d3M1SHFVdzJGUGxEYU9zOU0zOElRc3cKLT4gc3NoLWVkMjU1MTkgUWZwS1ZnIGRa +T01iT3FKUzNBcU92MUJEOXBzN1RuWGdhLzlrWGZxUDUvQnM0eUFXdzAKV3Jlb1Zn +MndtZ3BXNUVpUHNnSXB5RFd3MXEwYnFIZ1c0NFVRdmJBUGpwMAotPiBzc2gtZWQy +NTUxOSAwZHBkZ1EgT0RnMi8zUkUyaGNFWjFFazd6OVJKbWN3bXJwZDYwUUc1a3B5 +Q3krNEVqUQpRcEpCQWV2NWRVSURjR0szMmZzdEZoS0FXUC9uTmxuMmhJWnFZbDhZ +M1NVCi0+IHNzaC1lZDI1NTE5IHVsMGt4USBaYURCWWl0czdtQ0VlbWlBellIQ0dy +amlSMEpjUXlMWHkvMm1YVGNHVUhvCmwxa2JOMktncTVNRTUvNVVkZksvOVp5TE8w +MnJKWUhwNm9wSGZxeklIbU0KLT4gc3NoLWVkMjU1MTkgWnc1SGt3IGowTGFsNUZN +ekY0Qmp0MDNHTG9xS2M5c3h1L2VtZnNkd0c2aXc2ejhtVjAKd2huNHRldE5BTkNV +dGVFMEFzMERlOHNFZXFKUWQzRXIrUXZYUm9YM2ZDawotPiBzc2gtZWQyNTUxOSB6 +RzMrMXcgTkQ5TGxvOGUveUwxb2Jua0xoMUFTSU9TMWMyUzFCRDJEWitBTERCOEpD +cwovRkNBYy9JQU1UclBUUjd2YkkrQTlDak1OSTRpM0ozWE5VbmE5Y3pNb0JFCi0+ +IDtfZXAtZ3JlYXNlIGBpc21oYQpLcmd4OUVOMlJ1QXA2ZTJob0pUajFqWWphM1p5 +TkFtN3QxUTB5K2g0QWFNNGlyblFUa2hmdVFsNHMxZG9GbllQCmIvcTlyd05tMmZj +c3lKeEVjZklCYUliM05CeDIKLS0tIDUyaUwxQytCTnN2c2lTNEdibUxVcFdqblN5 +V1paV1Fyc1VQZDR0N0hZSTAK1B/SO9aHuG9iLuOJ6dar+tdeNznBZkRTZ9GoU1eT +TOEnE8+Iw+jy2egZsZM/g/dtwXdVQXQx3OhtgQnP2hnye84sTUqEGQvuZru1tJar +z7nXQcpShe+v5BclP9cQJSN9BgrXaamJP1IBdrZtNERBaMU7KQuBVSBZ789NUBbM +GaTRqoTaProG7Ex2XQ== +-----END AGE ENCRYPTED FILE----- diff --git a/secrets/secrets.nix b/secrets/secrets.nix new file mode 100644 index 0000000..5c3c3ac --- /dev/null +++ b/secrets/secrets.nix @@ -0,0 +1,46 @@ +# Used by ragenix nix only. +# Ensure that $RULES has been set via direnv +# Edit a key: `ragenix -i ~/.ssh/id_ed25519 -e secrets/someKey.age` +# run `ragenix -r -i /path/to/your/key` after modifying any keys below +# +# Re-keying is required after adding new hosts or keys: +# run `ragenix -r -i /path/to/your/key` +let + craige = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDtjE0YstRzlh+Zhlj03th9DYOkMqJ5xHUcderBq151K"; + ops = [craige]; + users = [craige]; + + airgead = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBanX/MOfoTT8Y/2x24yusGQzfxBqlaKxVbpNiqnAmKp"; + brighde = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOxma18HaXAQlD33jR5iIolSI9p2hTDAMkw6rlQXHnl7"; + ceitidh = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEGB8EUbqoarM4GmPgE2DBF4z/L6wVNc+lF27Z83XDUz"; + cuallaidh = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKfELhpKAIDCTFYrO4wXP9BrXsUlafcD5vELQwtF4LCl"; + dionach = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPcLVq/vaqNz+SzTKHd2mlw+jEYG+JYdYP/1mwK6lF0J"; + doilidh = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIVqs/F41PYoOPtThVRhLFjl+g/sH4aKRxki0CkZxj/7"; + eamhair = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMgjh98yNFdvLygrVdPaS8h6+1FoLRVCzzLbKr255zO0"; + iolear-beag = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA/57dNKaPjljQz+xc299xmT+njVL6AqEGuKr3SrFrxT"; + sanganto = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ2c9oj7yQLuIjQQR5fGV4FHPfhb4VpLnXeQJv15Hti+"; + sercanto = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIMxMEwo3nv7yHQOQEUt2HZdgTBfe5Y7xa1kmvC9qjbi"; + teintidh = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFhe0W7iAe9E00IUDo83nOY4BKfyoLVQPKlT8EZPvdwx"; + systems = [ + airgead + brighde + ceitidh + cuallaidh + dionach + doilidh + eamhair + iolear-beag + sanganto + sercanto + teintidh + ]; +in { + "root-ops.age".publicKeys = ops ++ systems; + "craige-ops.age".publicKeys = [craige] ++ systems; + "root.age".publicKeys = ops ++ systems; + "craige.age".publicKeys = [craige] ++ systems; + "fiona.age".publicKeys = ops ++ systems; + "hamish.age".publicKeys = ops ++ systems; + "logan.age".publicKeys = ops ++ systems; + "xander.age".publicKeys = ops ++ systems; +} diff --git a/secrets/xander.age b/secrets/xander.age new file mode 100644 index 0000000..f58228f --- /dev/null +++ b/secrets/xander.age @@ -0,0 +1,35 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEZCOVgxUSBSUU9Y +YVJBbDlYR1hDNDdJUVFRYUpYTlBjaVZlazV6bUlPa1UvLzV3TjBJClpneEZsVEc1 +K0lFd21HUjJUSnBmdy9OSmNMUzBtcHRlTTRwZUtNZVV2ZVEKLT4gc3NoLWVkMjU1 +MTkgSk00dDZBIDhYaTd3dFNDUTJvWmcxSks0aWZIeThhdU9XT3ovelBqQnZNcXF4 +MWR1bjAKVHBVdEdZeU5uNy9yQndUeHp5RUxDTkhPSHBoby9LaDBVRjVFNnhzWUlO +dwotPiBzc2gtZWQyNTUxOSA5aEV5RFEgdTJvQW1LUGY4NU1kNmVYZ1hXN3pIRXRE +cytyMWdoTHZqdEJDcnZCN1B5Ywo4UnNKdCtXQStSSWxmRnl6eldmZEd3cm9DNUNF +S1VJenNFUVRCZ3RzUE1RCi0+IHNzaC1lZDI1NTE5IHU3WjNqdyBQQ1BmMnlVK3pt +c1F5MTJQRGs3cHBkWUtwTUtRWDB4MVBJVlZuRkhSMTFnCnBPaXpJMk1zSFpIVGMx +NUdFT2VyUUEzeXpxR2pnSXk2bDZjb2ZZV3pqbk0KLT4gc3NoLWVkMjU1MTkgV2c5 +M3J3IEhvalpnQk52M3ROd0FhWEErRVVtYTNaM0YySU42WTdzTGFtK1RkalRzdzgK +WEpaVzNKSVpKdVIyZy9vL2YvTXlMcXhXaVZ4VGZrZEpaejJnK0RidG5McwotPiBz +c2gtZWQyNTUxOSBQeEt3alEgU3ptQXdZdlVzdUJST3hXTGpEMG1vSzR5S3Uzd2Jw +R0VpdVlnR3N6WHlTTQpMcE8wZ0EvVFZ2TTF0N01PVkl2WEFJY3lIN1NuUGtDOTZi +a0xlMFhvb0FJCi0+IHNzaC1lZDI1NTE5IEIzZFhTQSBSdTdHWkJCb2ZkY0tyYzEy +aU13UWk5RGV5MDRIWGwyOXBQcmlKV0R1U1JjCm1ueVV5WmVKMVU2cklaa0IxUCtI +NmRYeTVkTklNanJtbFpVWGE3ZVFIeVkKLT4gc3NoLWVkMjU1MTkgUWZwS1ZnIE80 +aGVQZUs0VzVTaHBqNnRwa3NhU3FjNkxqMHczbEdQcXlXWkhuTDVrUlUKSlRDTXM3 +QXY3V3FLUmlSOUYwdHdyc0sveDMzVUpQbTVueER5U21iU04xYwotPiBzc2gtZWQy +NTUxOSAwZHBkZ1EgWUxWZ0cyV0daK1lPUE93VzFEVFFnbGw4aUpXS1hOQUtQcXJT +cDBaVVFYMApwUCtpRTdpTzlta1hmQmZYdDlheEczeWU4WFcwWDdkZ1lvUkU2NFQ5 +a2tBCi0+IHNzaC1lZDI1NTE5IHVsMGt4USBlSzlYSS9XeHAvOVZ5a0FBV3ZkZGlK +QVREVExRR2NWWjFZVUk0cnF1UERBCmRNN3Y4TTVwRDNVQWFRMGNJcmN1QjZmOGZZ +QVJRQTZmT0RrYzhYUVJ2TWcKLT4gc3NoLWVkMjU1MTkgWnc1SGt3IEkrazBzeUdt +bVh4N3BuWGlzSWgzRm9yeVF1QkJTQWV5RVFhbTgydUVQU2MKR3V6VVRWbGtmdC9q +cE4waHgzeERNSzBaeVlpdS94eEdzSzhvazExWjlVOAotPiBzc2gtZWQyNTUxOSB6 +RzMrMXcgZ0IzcnVDQmlPM1VuRU1IQmVINUdSM3lnWFMxbmJNaXpsVndVMlRyT1RS +SQpZN2RURklHUnE4dm8rdUNFbndWRkdvSFRhSDFJTHAxY1NTUXZxS01xSERzCi0+ +IEMtZ3JlYXNlIFhRISJPIGIrNUEgVlg0L0kKZWZ4UjNaYnQxcnNZZldqQm1BCi0t +LSArUFpsNkdqLzVHVjRTcVRBR0NxTS8xTGVxVis4cGdRdFJYUW5aeitIeG9zCpKQ +++U8BCnn//2Q4nIzSEVU1E+jjVXGWXGX4LoU7KFEnjEifotQ126GxH1SQqzhYGZW +96Frfo7HFFmM1i9dkiq0Yw2mNZkL9rTjbdIKA+oseKQKJN+HDb08HY1oKfJoCAmT +YotZp05aO2hJYEFkNCVl8mOIyXSExNGJdSvqFS/kRcphX36T2Q== +-----END AGE ENCRYPTED FILE----- From dbf7a334bbabbd7f781e20bc9611f972d2a32585 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Sat, 24 Aug 2024 00:18:23 +1000 Subject: [PATCH 19/47] chore(nix): add nextcloud secrets --- profiles/nextcloud.nix | 7 +++---- secrets/nextcloud-adminpass.age | 35 +++++++++++++++++++++++++++++++++ secrets/nextcloud-dbpass.age | 35 +++++++++++++++++++++++++++++++++ secrets/secrets.nix | 2 ++ 4 files changed, 75 insertions(+), 4 deletions(-) create mode 100644 secrets/nextcloud-adminpass.age create mode 100644 secrets/nextcloud-dbpass.age diff --git a/profiles/nextcloud.nix b/profiles/nextcloud.nix index b1e27f3..eb3d409 100644 --- a/profiles/nextcloud.nix +++ b/profiles/nextcloud.nix @@ -1,12 +1,11 @@ # NixOps configuration for the hosts running Nextcloud { + age ? config.age, config, pkgs, lib, ... }: { - imports = [../secrets/nextcloud.nix]; - services.nextcloud = { enable = true; # Enable Nextcloud hostName = "cloud.mcwhirter.io"; # FQDN for the Nextcloud instance @@ -17,8 +16,8 @@ dbname = "nextcloud"; # Set the database name dbhost = "/run/postgresql"; # Set the database connection dbuser = "nextcloud"; # Set the database user - dbpassFile = "/run/keys/nextcloud-dbpass"; # Where to find the database password - adminpassFile = "/run/keys/nextcloud-admin"; # Where to find the admin password + dbpassFile = age.secrets.nextcloud.dbpass; # Where to find the database password + adminpassFile = age.secrets.nextcloud.adminpass; # Where to find the admin password adminuser = "root"; # Set the admin user name }; autoUpdateApps = { diff --git a/secrets/nextcloud-adminpass.age b/secrets/nextcloud-adminpass.age new file mode 100644 index 0000000..51d164d --- /dev/null +++ b/secrets/nextcloud-adminpass.age @@ -0,0 +1,35 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEZCOVgxUSBlK2lF +RHorTEwvNGIrQjA4YmlMM3U3UTV4WGZzZ1RvZHRKT0xhN0s1TVJRCmZaaithSTZZ +QmM0RHBkZHhYelZ5dHc4OXRNMkVGM1REcGVwbi9kaVJaUHcKLT4gc3NoLWVkMjU1 +MTkgSk00dDZBIGhmaGNtNDJKa2F2UWszOWZRNnpLVHpqNzZJdTkwMmZVeGtTVmpJ +YzdiUWMKT0ZtNWtidGE1UGJTTDd1R0RCNjh4aStDY09zMFZ4OGxiM1Z6RXozZDdD +SQotPiBzc2gtZWQyNTUxOSA5aEV5RFEgL2hCQnFVU0VXd3NMVHpab0dWK1ZFWGFx +TTZ1UGVmSU9ZVlU4TCtWOWRYbwo2UmtKellzYnBuYUVYZnpxdUN6bHhRSkU1UW5Q +eFBhZVFZS2oxa0N1c29ZCi0+IHNzaC1lZDI1NTE5IHU3WjNqdyBTT0REVTFEdjVS +d0dyR0N6R3J4aU9CdkhzR043UHdidUFaNlh3aFNKSW1zCjFpM0FLS292eWJidy9N +UzBtQ3Z3cUpZYWtiZzhxbU1wS2ZNeE9hTWloUE0KLT4gc3NoLWVkMjU1MTkgV2c5 +M3J3IHB2RFNQYVNkdGRMUEJrZGI3bTUwTW1Wb28vV2xDamdtUGI0cnliWHUzajgK +L3RDeFBNcXk5Y2Jua1N4dGxmRktsSkFoOVowYUlVTndnbEdiNlgzRmtCdwotPiBz +c2gtZWQyNTUxOSBQeEt3alEgT3YxblhjMWphNFQzWmdhZjFhK0NZWUxsbC9PbWNt +Q1VFeTRVZU95eUJnUQpkQmRrQndoZWdBcWEvYURPR1FNWmdGcDJlc042QjF6VUNM +blR3Mm5BOGRFCi0+IHNzaC1lZDI1NTE5IEIzZFhTQSA1Vk9ObVpqZFhwOXd6azJ2 +UXd3STRkZzNlNXJ4VVhGNmM4a0x2ZkR1Q1FrCndaVmNqMWRYd21OVVkxMEhhSTdo +b21TYWFKL1dSczg2eU8wTi9FUE9kUkEKLT4gc3NoLWVkMjU1MTkgUWZwS1ZnIDNL +N1J5M2tYN3cwT1piMitpRnR3dU1RbDczSldObmZLbkRlTXRMcEd0MUEKSjlselpF +WnQzbXd3aXJDbUs0QzZ5d3UzSlp0cHlGRlpTYUhsdXhXSHVFNAotPiBzc2gtZWQy +NTUxOSAwZHBkZ1EgOXJGWDk2STBqaTFFbVRqMDFvVlh3NTJDemR3N1U0c0IrT2tx +aStraGJ3NApCSHFQZVlzbWtTdkFWbytnS1dyd2Y5LzJIakMrRDZQK2pwZWpEKzlk +bDdnCi0+IHNzaC1lZDI1NTE5IHVsMGt4USAwcmFsc0xIQzVObWNDeTU3YXVuVjd4 +Yy9jRnZmT09DOHhnYlJIQUtOYnpnCkYrVzcrZkFsTURkUzlYbDhNR1hCZFFZaklH +blo0TytUcFBINTRqTE5JM28KLT4gc3NoLWVkMjU1MTkgWnc1SGt3IE9pN29ic0FI +TUJlT3o0cUs1YlNOUEdWcllWZmlrVGVFRG9TTzF3OHJwaE0KTzFhVEtxb0hmVXNG +R25lZVNKbkQ3TVhoRjlWR2JlQ016ZWVNVTZKSWlnSQotPiBzc2gtZWQyNTUxOSB6 +RzMrMXcgRC84ZDIyc3BId1NROVNodDNLNXJjaUN1ZDI3bTk4Q0lmelMzbUZHc1ds +awpzTjdqeXJwWTBRd2xlK3FrODVRZm9oZkdRMnJWUVgvL3luMXZEaExGYWxRCi0+ +IEApTS1ncmVhc2UgQ1xxMyBeT1tDTnxPID0KWmVJdTR2all6K2t1TnZlLzhYYUtS +R1Y4YTFQb2RaZnlFQzEzT0JNMjU1VWhYYkxCVWg2K1M4RmJNUVNjUk0xMQpkckND +MzJrTXlPUjJhQUY1WFQ0UE1OaUdtRk52SmdrK0NNdU5adHkxCi0tLSA0TUU2L1J2 +QkdRWmppaTI5L2twaGttUUlURE1MY3ZXVnVxZEVHNTJSK3BBCucjRXVgU2KZE8S3 +P695DXvhJHlpWrKEvjZAooTzzW26s1Z2Yk4sclXQEOFQaXx+aBHkeovdxi/gUA== +-----END AGE ENCRYPTED FILE----- diff --git a/secrets/nextcloud-dbpass.age b/secrets/nextcloud-dbpass.age new file mode 100644 index 0000000..1d64fdb --- /dev/null +++ b/secrets/nextcloud-dbpass.age @@ -0,0 +1,35 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEZCOVgxUSBBZ2dt +WkdZWDlDNkRRZkZZL2J0aFRUZm1ZUnBDbUNqUVhEK1I2UVBPaWg4CmoxSDVVR3RP +WmoySkcrMHBkd0dnLzZNbTgvUDlLSnZTUzRmK0FqelJtOVEKLT4gc3NoLWVkMjU1 +MTkgSk00dDZBIFpzc0gvTHJUVmxLbGh5RnNWZGdtdGg2aWp3U2hncllPZm05Yi8x +YWpXeEUKM1lBMXluSDh3YXJYajlQUVJ6R3FqRWZ0UzYrNXJHd0VhUXRNVHJJK1Q0 +NAotPiBzc2gtZWQyNTUxOSA5aEV5RFEgc2E0dHhWVXZUSVJSdGFrTXpxeFpHcU1u +Q2RRVXBnTHByZ2c1WlpIMTYxdwpWUkJUTWxEcGNGUGhnKzNVTk94OXN0YWRKTnJM +b3U4VFp6WEVsaXZ5d21vCi0+IHNzaC1lZDI1NTE5IHU3WjNqdyBOUFlRb3BXQ1Nu +dEhieTRwMW44NGRyVFhKVm9UNUtROWFDbWVsNWcwV2xvCnN6SzcvbWFoUWE5Mk01 +ejRIU25QUTNXZWtERXJxSEpXMnV6MjJHVlVJTHcKLT4gc3NoLWVkMjU1MTkgV2c5 +M3J3IEp3dEgwQkloS2c4dTBDZHdENGZvd3JwSG44aHUzdVkzMjg2SWo4SEFrRUEK +Tm1OakVtbDRLMDh6cCt4YmdxK25uaGV4UmhsWGI3MG9DOFo3bGdJNmx4WQotPiBz +c2gtZWQyNTUxOSBQeEt3alEgdWtKQVN6R2o3OXVXQTB3WWYxSWg1bmgxbnk3M1Ux +U001RGZqb2tYNjR4Zwp0MFFwVDBta2NXRmNpWlJKZSt2SXA1YVhiR1dHSWlaWFpn +TVIxck5pMjNnCi0+IHNzaC1lZDI1NTE5IEIzZFhTQSBWZGgyY0F1NjhQME5XNzdS +N0hwSmxZRnFkZmh4S0syMUdXaXhpYURMVGg0CkZpb3RvSExUNWJmVWtzL3krdzhB +U1RGVFM3SzlFengrTGFJUnBqYllTUlUKLT4gc3NoLWVkMjU1MTkgUWZwS1ZnIEtL +ZlAvM2xUTkQvTFExdmpIRWp0dDBrNjNnSitQaGFtSlVhQ0daVVJ0azgKamdJSzR0 +WWxHOVVZYytkS29IbG1YY0hvdkZmTnhodXEyN3VPK0djcE1CSQotPiBzc2gtZWQy +NTUxOSAwZHBkZ1EgYmJwcHFpWmo5aXhBRjNlQnpCWUxlbStOMVA4WklqOVFpdW5X +QnNmOWl6SQpUS3l4WEsxaVo3ZjgzZmpQR0RuZ0ZoMVRzTmErZDB3L3ZESUdXS2s0 +QWwwCi0+IHNzaC1lZDI1NTE5IHVsMGt4USA1ZmZiWnNTRUtwV2p5NGU2V1UwR1hG +OVdZTXAxc0dya0hXYVhjbVBzT1MwCmRzOGxzUGs4UkNSY3l5cTVZajdQV0liRjFF +UTZZaGtsdStqQ0RDdkhjOWMKLT4gc3NoLWVkMjU1MTkgWnc1SGt3IGN4OGtraWJG +ZmVsdlJOdGJEY1JQWm1BeUtyMzJFeUxtTG1HN1JFZVRoaEkKclBYNms5ZDZFMzFw +ekxVdlVzd29JOERwY1NyV3RnN0xyZVFJTXdPZU5uRQotPiBzc2gtZWQyNTUxOSB6 +RzMrMXcgWXVLNE1UZGFXS2lsSXMxN2o4aXdaR2ZMY0kvTDUxN0NDSHRyandvUWFG +YwpwdnNwL01QR0VxTE9aOHkxV1VqTG56MFdxMDNEYkZFRW1VaVdnWGlRSjRBCi0+ +IHc1dVV8Mn0tZ3JlYXNlIEpuNmsgclU5TQpRNVRsbmIxaU5CeVlWaDhiYnlkRzQ1 +Y2lIR0l4eUFTNFFQdk5JekVFQ2N3Q0JJK2grK2IwN0M2Sy9LbUJKNHEzCmxyTHlU +VGZVbU1Edmx3QXFuR2s4VXBWcDdnazFVMVM3b0lKUmR6WQotLS0gR1k3QUFEN3JU +Z3M5RFNoeW5tRVU5U1Q3ODNKRzR0OUVHc3Z4OEN5OHNRawrkiowgC6QAagO6PpAG +1ZTfpxGEOWCMhBTN1v2TIiIGdGrTARto03jq1MocduDJQCcpZx8uGY9o0EA= +-----END AGE ENCRYPTED FILE----- diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 5c3c3ac..14ece9d 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -43,4 +43,6 @@ in { "hamish.age".publicKeys = ops ++ systems; "logan.age".publicKeys = ops ++ systems; "xander.age".publicKeys = ops ++ systems; + "nextcloud-dbpass.age".publicKeys = ops ++ systems; + "nextcloud-adminpass.age".publicKeys = ops ++ systems; } From c7b8d97603b1bb8b46c3bcd6e846b4ca4f8d6479 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Sat, 24 Aug 2024 00:45:40 +1000 Subject: [PATCH 20/47] chore(nix): correct profile paths --- profiles/desktop_common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/profiles/desktop_common.nix b/profiles/desktop_common.nix index 6d6179c..edf8d2b 100644 --- a/profiles/desktop_common.nix +++ b/profiles/desktop_common.nix @@ -11,8 +11,8 @@ ../profiles/daedalus.nix ../profiles/openssh.nix ../profiles/powerManagement.nix - ../secrets/users-core.nix - ../secrets/users.nix + ../profiles/users-core.nix + ../profiles/users.nix ]; # Common Desktop Packages From b68225b9dd9b4f32114ea1ba7f599232f50e5bd9 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Sat, 24 Aug 2024 00:46:41 +1000 Subject: [PATCH 21/47] chore(nix): enable ragenix modules --- outputs.nix | 105 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 90 insertions(+), 15 deletions(-) diff --git a/outputs.nix b/outputs.nix index f24bfaf..bb4b9b7 100644 --- a/outputs.nix +++ b/outputs.nix @@ -34,20 +34,95 @@ in { overlays = []; }; }; - airgead = {imports = [hosts/airgead];}; - brighde = {imports = [hosts/brighde];}; - ceilidh = {imports = [hosts/ceilidh];}; - ceitidh = {imports = [hosts/ceitidh];}; - cuallaidh = {imports = [hosts/cuallaidh];}; - dhu = {imports = [hosts/dhu];}; - dionach = {imports = [hosts/dionach];}; - doilidh = {imports = [hosts/doilidh];}; - eamhair = {imports = [hosts/eamhair];}; - iolear-beag = {imports = [hosts/iolear-beag];}; - paidh-uachdar = {imports = [hosts/paidh-uachdar];}; - sanganto = {imports = [hosts/sanganto];}; - sercanto = {imports = [hosts/sercanto];}; - sithlainnir = {imports = [hosts/sithlainnir];}; - teintidh = {imports = [hosts/teintidh];}; + airgead = { + imports = [ + hosts/airgead + ragenix.nixosModules.default + ]; + }; + brighde = { + imports = [ + hosts/brighde + ragenix.nixosModules.default + ]; + }; + ceilidh = { + imports = [ + hosts/ceilidh + ragenix.nixosModules.default + ]; + }; + ceitidh = { + imports = [ + hosts/ceitidh + ragenix.nixosModules.default + ]; + }; + cuallaidh = { + imports = [ + hosts/cuallaidh + ragenix.nixosModules.default + ]; + }; + dhu = { + imports = [ + hosts/dhu + ragenix.nixosModules.default + ]; + }; + dionach = { + imports = [ + hosts/dionach + ragenix.nixosModules.default + ]; + }; + doilidh = { + imports = [ + hosts/doilidh + ragenix.nixosModules.default + ]; + }; + eamhair = { + imports = [ + hosts/eamhair + ragenix.nixosModules.default + ]; + }; + iolear-beag = { + imports = [ + hosts/iolear-beag + ragenix.nixosModules.default + ]; + }; + paidh-uachdar = { + imports = [ + hosts/paidh-uachdar + ragenix.nixosModules.default + ]; + }; + sanganto = { + imports = [ + hosts/sanganto + ragenix.nixosModules.default + ]; + }; + sercanto = { + imports = [ + hosts/sercanto + ragenix.nixosModules.default + ]; + }; + sithlainnir = { + imports = [ + hosts/sithlainnir + ragenix.nixosModules.default + ]; + }; + teintidh = { + imports = [ + hosts/teintidh + ragenix.nixosModules.default + ]; + }; }; } From 7f89513b6c3fd353bd5e4b1bd7d0b31ace5401aa Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Sat, 24 Aug 2024 01:34:35 +1000 Subject: [PATCH 22/47] chore(nix): add nextcloud age permissions --- profiles/nextcloud.nix | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/profiles/nextcloud.nix b/profiles/nextcloud.nix index eb3d409..fb0c98a 100644 --- a/profiles/nextcloud.nix +++ b/profiles/nextcloud.nix @@ -1,11 +1,26 @@ # NixOps configuration for the hosts running Nextcloud { - age ? config.age, config, pkgs, lib, ... }: { + age.secrets = { + nextcloud-dbpass = { + file = ../../secrets/nextcloud-dbpass.age; + path = "/run/keys/nextcloud-dbpass"; + mode = "0640"; + owner = "nextcloud"; + group = "nextcloud"; + }; + nextcloud-adminpass = { + file = ../../secrets/nextcloud-adminpass.age; + path = "/run/keys/nextcloud-adminpass"; + mode = "0640"; + owner = "nextcloud"; + group = "nextcloud"; + }; + }; services.nextcloud = { enable = true; # Enable Nextcloud hostName = "cloud.mcwhirter.io"; # FQDN for the Nextcloud instance @@ -16,8 +31,8 @@ dbname = "nextcloud"; # Set the database name dbhost = "/run/postgresql"; # Set the database connection dbuser = "nextcloud"; # Set the database user - dbpassFile = age.secrets.nextcloud.dbpass; # Where to find the database password - adminpassFile = age.secrets.nextcloud.adminpass; # Where to find the admin password + dbpassFile = config.age.secrets.nextcloud-dbpass.path; + adminpassFile = config.age.secrets.nextcloud-adminpass.path; adminuser = "root"; # Set the admin user name }; autoUpdateApps = { From 8570c7ee33bd60b029614cfde1999b34ebfe33f3 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Sat, 24 Aug 2024 19:22:00 +1000 Subject: [PATCH 23/47] chore(nix): add tt-rss secrets --- hosts/cuallaidh/default.nix | 1 - profiles/tt-rss.nix | 22 +++++++++------------- secrets/secrets.nix | 1 + secrets/tt-rss-dbpass.age | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 45 insertions(+), 14 deletions(-) create mode 100644 secrets/tt-rss-dbpass.age diff --git a/hosts/cuallaidh/default.nix b/hosts/cuallaidh/default.nix index 42d6b27..9efb72a 100644 --- a/hosts/cuallaidh/default.nix +++ b/hosts/cuallaidh/default.nix @@ -19,7 +19,6 @@ ../../profiles/nixpkgs-dev.nix ../../profiles/taskserver.nix ../../profiles/tt-rss.nix - ../../secrets/tt-rss.nix ]; deployment.targetHost = "172.105.171.16"; diff --git a/profiles/tt-rss.nix b/profiles/tt-rss.nix index 5d5b624..e846c6f 100644 --- a/profiles/tt-rss.nix +++ b/profiles/tt-rss.nix @@ -5,12 +5,20 @@ lib, ... }: { + age.secrets = { + tt-rss-dbpass = { + file = ../secrets/tt-rss-dbpass.age; + owner = "tt_rss"; + group = "tt_rss"; + mode = "0640"; + }; + }; services.tt-rss = { enable = true; # Enable TT-RSS database = { # Configure the database type = "pgsql"; # Database type - passwordFile = "/run/keys/tt-rss-dbpass"; # Where to find the password + passwordFile = config.age.secrets.tt-rss-dbpass; # Where to find the password }; email = { fromAddress = "news@mcwhirter.io"; # Address for outgoing email @@ -39,16 +47,6 @@ ]; }; - systemd = { - services = { - tt-rss = { - # Ensure tt-rss starts after nixops keys are loaded - after = ["tt-rss-dbpass-key.service"]; - wants = ["tt-rss-dbpass-key.service"]; - }; - }; - }; - services.postgresqlBackup.databases = ["tt_rss"]; services.nginx = { @@ -65,6 +63,4 @@ }; security.acme.certs = {"news.mcwhirter.io".email = "craige@mcwhirter.io";}; - - users.groups.keys.members = ["tt_rss"]; # Required due to NixOps issue #1204 } diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 14ece9d..3c17252 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -45,4 +45,5 @@ in { "xander.age".publicKeys = ops ++ systems; "nextcloud-dbpass.age".publicKeys = ops ++ systems; "nextcloud-adminpass.age".publicKeys = ops ++ systems; + "tt-rss-dbpass.age".publicKeys = ops ++ systems; } diff --git a/secrets/tt-rss-dbpass.age b/secrets/tt-rss-dbpass.age new file mode 100644 index 0000000..b478308 --- /dev/null +++ b/secrets/tt-rss-dbpass.age @@ -0,0 +1,35 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEZCOVgxUSBsTzdO +clFOUVMzRGlUTkF6eGo2djFOWHhpWkpacG5GbEFXZHNKSHBBREZvCnRvSEVqSUpF +Yk5zNDNkY21jejM1OFNxUTNGMEVtRnliNzZvZndyZnliWFkKLT4gc3NoLWVkMjU1 +MTkgSk00dDZBIFBVV1doL1JrVEY5L1JXRExSQ1o3ZHYvaFF5eFcxcHVERjNHWExW +VGc2Z0kKaitHRHZ0U0hOeUpJTHJaUStKTk9qbHo4aU9nOEJBMytrVUhDM1FNSTZz +dwotPiBzc2gtZWQyNTUxOSA5aEV5RFEgeDB1TmpjTmtzU1F6VjFBNUMxQWcxcFFV +MTA3d0huYlJ0Nk44Ym5Kd2JWMApDcE1GM1pKaW9TWW1Nd1QzclVlNHVDeGowVjhZ +T2F1NXZaUnQ4WWVHbVhZCi0+IHNzaC1lZDI1NTE5IHU3WjNqdyBNVXhYMW1DTXl1 +QmJ0dGN6UDRzb0cxeXdMN21VdzJuekZmOGZwQmIxb1dBCi81ZC9TM3ZOcEdrMVpG +NzFKWlFOeVFkVHk0MVBBNS9ZMlVkK1RML3poZG8KLT4gc3NoLWVkMjU1MTkgV2c5 +M3J3IFRvS0FUUStKdmRXbkRhemdwM2NKSUw3dmtKZkZ3Vk1VbllEZGpVOVVKUjAK +b1dnLzBEZGdSY0V4a05xVzJSYXdCTUdvVm9TL2ZjdGJwQ3lmc01hdEVQcwotPiBz +c2gtZWQyNTUxOSBQeEt3alEgb1ptc1J5ZWFsTEFETFdDbVVvZGhoRzZDaW9JYlE0 +MnFoWHh1bG5aVGxrUQpvWVcwWDBvenZJYjMzUFNBV2kxWjAwa0xjT1gzYWx2K0pq +SlpzYnVqYytjCi0+IHNzaC1lZDI1NTE5IEIzZFhTQSA0K09ISzNlVVY1RzlyMWJU +ZHVRZWV5QmV6WmNmeVMrUnA1MlNjWU83OUhnClI2Z1U0cG1udC9JUGQ2Tk9YZ3Z4 +azB3Mk02U0tPVUZaajJya1F4Q2twdjgKLT4gc3NoLWVkMjU1MTkgUWZwS1ZnIHJF +dDU4RUxiYlNJMUtLdFJDbU1JUzE5R1U0dkIwRE9TdFNwRDh6TWRiMWcKY1pqdFlK +WC9EMFZJUkJxdit0cUJvMU5kNldmQlk2N3BmMnJWbGpGYThsWQotPiBzc2gtZWQy +NTUxOSAwZHBkZ1Ega0ppUFQvLytEQnZ6VEJ0QWZFc1J3R1RUNS9jQ3FSODhhazhn +N3NHUThuQQptYWtKdk9pd00zMkk0VWRXbUZGN0ZnNjBWMUorZkdOaWRjeVFGa3NX +RXdJCi0+IHNzaC1lZDI1NTE5IHVsMGt4USBkWkFXN25SeU1sMWJTVS9Bc0JJdzkw +MVRkekIwaVFCOTB0cVREc2dWSFVFCkNxMmF4Vk01L2N5R0haQ2Z6cjdQdHRzTHEx +VHZKbGpGQ2pZUmRhdVpGTmsKLT4gc3NoLWVkMjU1MTkgWnc1SGt3IEZZV0plaWpJ +bnFqVStFK2dNV25ZYUtRa0Q5RDQwckZQQXlYbEFEaUQ1RWMKekFjNDZRaC9TTHpQ +OEJ6bU5tYXhXTktmMUJsMXRlZ0dUSEthcWVteDU5bwotPiBzc2gtZWQyNTUxOSB6 +RzMrMXcgZ3liVlF5M0pKMVExTzVjWVBjWUFIQjZaUE9ISmJXQUo0ay9HSjEydXdS +Zwo1cFEyMFBCWGd3NnR1Q1ZORnhnMmJWQXkzcDlRQVRnRjJWZUFjd2x4WFVZCi0+ +IDFfTGpoM20tZ3JlYXNlIHFDUzF4Un4KZ0RKV29ZY2UxQ0dFTERGdU1TQk9pWEF2 +aHVtUUwzd2p6c1dKRzFKekNyTno4Z202Z2RkS2JhdnF2N0tHUWZJWgowalNzN3pE +NzdtQ09zWDRwYzU5b0VaemFUUGljUncKLS0tIHdXNWhtWi83QnQ5bXFNZXp0MFR3 +UkI2TTlMd1lSS0toRnFwYWg1UHUyVmcK4yZHPD4ymOHd8MKfXFnyndhFbZrMdIIl ++nmCeTJWL6oVaf2fXnE39io5AuRD8TkQGpg5VvkJwvPZ +-----END AGE ENCRYPTED FILE----- From 19dcfd8084eb51786f775256abc9fc6638a1c38e Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Sat, 24 Aug 2024 19:54:26 +1000 Subject: [PATCH 24/47] chore(nix): add coturn secrets --- profiles/coturn.nix | 10 +++++++++- profiles/matrix.nix | 4 +--- secrets/coturn.age | 35 +++++++++++++++++++++++++++++++++++ secrets/secrets.nix | 1 + 4 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 secrets/coturn.age diff --git a/profiles/coturn.nix b/profiles/coturn.nix index e6825a6..2d217e7 100644 --- a/profiles/coturn.nix +++ b/profiles/coturn.nix @@ -5,7 +5,14 @@ lib, ... }: { - imports = [../secrets/coturn.nix]; + age.secrets = { + coturn = { + file = ../secrets/coturn.age; + owner = "turnserver"; + group = "turnserver"; + mode = "0640"; + }; + }; services = { coturn = { @@ -20,6 +27,7 @@ no-tcp-relay = true; # Disable TCP relay endpoints extraConfig = "\n cipher-list=\"HIGH\"\n no-loopback-peers\n no-multicast-peers\n "; secure-stun = true; # Require authentication of the STUN Binding request + static-auth-secret-file = config.age.secrets.coturn.path; cert = "/var/lib/acme/turn.mcwhirter.io/fullchain.pem"; pkey = "/var/lib/acme/turn.mcwhirter.io/key.pem"; min-port = 49152; # Lower bound of UDP relay endpoints diff --git a/profiles/matrix.nix b/profiles/matrix.nix index 4ddb145..b8e4631 100644 --- a/profiles/matrix.nix +++ b/profiles/matrix.nix @@ -5,8 +5,6 @@ lib, ... }: { - imports = [../secrets/matrix.nix]; - i18n = { extraLocaleSettings = { LC_COLLATE = "C.UTF-8"; # Ensure correct locale for postgres @@ -66,7 +64,7 @@ server_name = "mcwhirter.io"; # Server's public domain name tls_certificate_path = "/var/lib/acme/mcwhirter.io/fullchain.pem"; tls_private_key_path = "/var/lib/acme/mcwhirter.io/key.pem"; - turn_shared_secret = "IZI43ylg6aJdMwy5MyhUPqT8SJD4C3P1vDcIFMzqGvTXJiCjAEvnPcDCBZfig5Q6"; + turn_shared_secret = config.services.coturn.static-auth-secret; turn_uris = [ "turn:turn.mcwhirter.io:5349?transport=udp" "turn:turn.mcwhirter.io:5350?transport=udp" diff --git a/secrets/coturn.age b/secrets/coturn.age new file mode 100644 index 0000000..ff664ed --- /dev/null +++ b/secrets/coturn.age @@ -0,0 +1,35 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEZCOVgxUSB4c1pK +YkY3THNkS1BXN3F0bVlkYjB0S0syQzNEbDJNVit2M2Rab2RCSjJ3CnpTM3k0QnVE +UWU2QU8yV01rY2FuaGJsZTZjd2dWY2ViT3BxWExhUTRNU1UKLT4gc3NoLWVkMjU1 +MTkgSk00dDZBIFlJQjJGOHpkQXJtdkM3QkxSdEtTeDVzU3Y1MzNtVWZOU0tDRDd2 +blJJZzQKdWlTVi9sN0wvd1NIQUVhV0RXUktIQW12aUdaWDRUUUlkeXB3QVRENndS +bwotPiBzc2gtZWQyNTUxOSA5aEV5RFEgVHBrRk5LbHpPSkFNTVVFTXRJQW03RkJQ +QWkzdDQ2RCt1aHpTdHdZTnlrRQpVYkRDTzhtQ0lYMnlZV3pFZlgxdzBVVkdMeVQz +WlJkQjIvUlNaNmgwbkZjCi0+IHNzaC1lZDI1NTE5IHU3WjNqdyBndVpMWnNOVzZO +VTRHRlc2NHU0UkEzMEpOWHByUXluVFpSOCtRWVhEcHpNCnhIaUhUUHVjTlhPY0lW +TFd2MmIvNForbjZPZFJKVDh3QWZSejh1V1hSVmMKLT4gc3NoLWVkMjU1MTkgV2c5 +M3J3IGErUzhFd0tUUndMbmVqakt3SE0yd2Y0TGRSRjBoMVFPR2RPMzV3V0RHbTgK +eHo5dE1oM0RNL0RuZEVMWThlUUJiZGI2VmZvVDlpY21WMisrR01oK3VmSQotPiBz +c2gtZWQyNTUxOSBQeEt3alEgVUwyL3VFUVlSYjQ0OFhweUxOWTNablQxU01KZjBD +eUNrd2wwMVlwZFJFRQpPWjUra3k2TE81R3V6WXRFY2pXWXVvVS9qRjZOMjdPZHVu +Ri9lV3poKzRFCi0+IHNzaC1lZDI1NTE5IEIzZFhTQSBpa0NxNTJnNXZNZ0JtUmly +cldrTVZ0MFU1d0R1ZnNzUUNOR0RmdWlTUmljCnhuWmdZNndwVW8vYWlxclZQK0FM +RVVnN0dWZ212U1pvdUd0dnB6SmtUNnMKLT4gc3NoLWVkMjU1MTkgUWZwS1ZnIDFs +ZEtBZlc4MDNmcWtXUU9mKytZN2NxUmJ6SFZvcFBkditiNE1CN0piaWsKajJWMHVQ +bHh6ekV1d3M2T1RzaVdDZFhaNlJyOFRlUGV1YnloZFo0OHl3MAotPiBzc2gtZWQy +NTUxOSAwZHBkZ1Egd3doZGorWWpPem1kak42dWRicGV3ZVlKYjkwaUxEQXZQcDdU +SkN3a29Scwo1UVVoWGpucEtxRUZXd3czeDkva1YyejQ5YzN4SGx5eDFhTHNidFNj +SXVVCi0+IHNzaC1lZDI1NTE5IHVsMGt4USBCd2srQVF3RkJWbE8wRkJNWnNCU3Mw +cWNDbzN4YmhBL1ZlYURuZjVVT1M0ClBUQm9FVG9mcENSZkNCK1ptcVRVQWUrL2Zq +ZERWSFNPWGpXSll1d3BkOTAKLT4gc3NoLWVkMjU1MTkgWnc1SGt3IERKQzZZd2FK +VGJvdGlEL2ZvOGRlcXNXOUpybjhCZmJ2NFdmQ1gxWERKRVEKTXpwWmUvZG9UWUNR +enRNUXBoa1RKUmpCTzVRWFJtL29MNHl3WWl5b2R1awotPiBzc2gtZWQyNTUxOSB6 +RzMrMXcgeE1nMm1HdmhQU1ZYZkRBYml1NGdDaHZ4TDB5cXd5WHgxTldxckZaTEJ3 +MAp4NUlKYWZmZU9GZjVtVWNOQkJmRk1lWXpXY2dZdXFQT2g1VWp0QU56WU5RCi0+ +IHhRTC1ncmVhc2UKR01SMi8wNnRmNFloUDM4WksyREYyVGJ2ekVrdW9rZkg3MGk4 +bXJtRgotLS0gaDhiRHR0TVRObUppaDFjZFljYjVTN3lzTzVKVWdyZFRXNkFteEFs +UG43NArxMjjfXgYBXhon0SSpyPNqUQXp7jU5s7WKzj1OnjNgFYT4/9FxuUWVmf0A +wJjib8jXUERlIahSbcBUyTo3kLLLBegQRIbwjZdYhAFekYUE/Lr6pvQAaDwDf1R0 +1LaHz9Zy +-----END AGE ENCRYPTED FILE----- diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 3c17252..a90b3d4 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -43,6 +43,7 @@ in { "hamish.age".publicKeys = ops ++ systems; "logan.age".publicKeys = ops ++ systems; "xander.age".publicKeys = ops ++ systems; + "coturn.age".publicKeys = ops ++ systems; "nextcloud-dbpass.age".publicKeys = ops ++ systems; "nextcloud-adminpass.age".publicKeys = ops ++ systems; "tt-rss-dbpass.age".publicKeys = ops ++ systems; From d83ec40514c84be7ef4c662f7f0bf2ebf217e6dd Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Sat, 24 Aug 2024 21:18:41 +1000 Subject: [PATCH 25/47] chore(nix): corrected ncmpcpp overlay path --- hosts/sanganto/default.nix | 2 +- hosts/sercanto/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/sanganto/default.nix b/hosts/sanganto/default.nix index 8f07fa8..5ba1b98 100644 --- a/hosts/sanganto/default.nix +++ b/hosts/sanganto/default.nix @@ -32,7 +32,7 @@ "openssl-1.0.2u" ]; }; - overlays = [(import ../overlays/ncmpcpp.nix)]; + overlays = [(import ../../overlays/ncmpcpp.nix)]; }; boot = { diff --git a/hosts/sercanto/default.nix b/hosts/sercanto/default.nix index fcc81c9..e2463fb 100644 --- a/hosts/sercanto/default.nix +++ b/hosts/sercanto/default.nix @@ -34,7 +34,7 @@ "openssl-1.0.2u" ]; }; - overlays = [(import ../overlays/ncmpcpp.nix)]; + overlays = [(import ../../overlays/ncmpcpp.nix)]; }; boot = { From d6757e875b4ad52e807ae6cc9ba36e34595d8ce6 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Sat, 24 Aug 2024 21:57:40 +1000 Subject: [PATCH 26/47] chore(daedalus): bumped to v6.0.0 --- flake.lock | 150 +++++++++++++++++++++++++++++++++++------- flake.nix | 2 +- profiles/daedalus.nix | 11 ++-- 3 files changed, 132 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index d709128..7fa0798 100644 --- a/flake.lock +++ b/flake.lock @@ -728,6 +728,23 @@ "type": "github" } }, + "cardano-playground": { + "flake": false, + "locked": { + "lastModified": 1723217743, + "narHash": "sha256-Jt2onBMJI4O53EEi6QoyXdivOlEoPmZ/KSgfBLHgN6M=", + "owner": "input-output-hk", + "repo": "cardano-playground", + "rev": "afd96579a3fda70ddbf414b0d5c5a40193750175", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "next-2024-07-24", + "repo": "cardano-playground", + "type": "github" + } + }, "cardano-shell": { "flake": false, "locked": { @@ -824,6 +841,40 @@ "type": "github" } }, + "cardano-shell_7": { + "flake": false, + "locked": { + "lastModified": 1651849514, + "narHash": "sha256-g5vqy7WoRusIq7eOwSXLLH/+VKHJUSbErhnrzfLvmBU=", + "owner": "input-output-hk", + "repo": "cardano-shell", + "rev": "0d1d5f036c73d18e641412d2c58d4acda592d493", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "cardano-shell", + "rev": "0d1d5f036c73d18e641412d2c58d4acda592d493", + "type": "github" + } + }, + "cardano-wallet-unpatched": { + "flake": false, + "locked": { + "lastModified": 1722103243, + "narHash": "sha256-2Ilm37Lt0nnFOgVx9AFIf8go6JfKhPoE9Im7H5sscxM=", + "owner": "cardano-foundation", + "repo": "cardano-wallet", + "rev": "ceb90fcac0e7ddf9e30705ce1e9d5780222fc3fd", + "type": "github" + }, + "original": { + "owner": "cardano-foundation", + "ref": "v2024-07-27", + "repo": "cardano-wallet", + "type": "github" + } + }, "colmena": { "inputs": { "flake-compat": "flake-compat_12", @@ -944,24 +995,25 @@ }, "daedalus": { "inputs": { - "nixpkgs": [ - "daedalus", - "tullia", - "nixpkgs" - ], + "cardano-playground": "cardano-playground", + "cardano-shell": "cardano-shell_7", + "cardano-wallet-unpatched": "cardano-wallet-unpatched", + "flake-compat": "flake-compat_13", + "nix-bundle-exe": "nix-bundle-exe", + "nixpkgs": "nixpkgs_30", "tullia": "tullia_7" }, "locked": { - "lastModified": 1673276601, - "narHash": "sha256-ImXTFG8KgQvLNfFpApRUjmZZPoBwf+5ZjXhBrRw+XPA=", + "lastModified": 1723205985, + "narHash": "sha256-z4Pj91APyMPKnuHWfmXDnxioKSieQlGnqaKnXl36jAw=", "owner": "input-output-hk", "repo": "daedalus", - "rev": "2990f5a44189097b3de2e7e7a19caa8062a8ae7b", + "rev": "72e26ae0ee1e600972e28704db50554115f38f4f", "type": "github" }, "original": { "owner": "input-output-hk", - "ref": "5.2.0", + "ref": "6.0.0", "repo": "daedalus", "type": "github" } @@ -1528,6 +1580,22 @@ } }, "flake-compat_13": { + "flake": false, + "locked": { + "lastModified": 1635892615, + "narHash": "sha256-harGbMZr4hzat2BWBU+Y5OYXlu+fVz7E4WeQzHi5o8A=", + "owner": "input-output-hk", + "repo": "flake-compat", + "rev": "eca47d3377946315596da653862d341ee5341318", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_14": { "flake": false, "locked": { "lastModified": 1650374568, @@ -1543,7 +1611,7 @@ "type": "github" } }, - "flake-compat_14": { + "flake-compat_15": { "flake": false, "locked": { "lastModified": 1696426674, @@ -2370,7 +2438,7 @@ }, "gomod2nix_7": { "inputs": { - "nixpkgs": "nixpkgs_30", + "nixpkgs": "nixpkgs_31", "utils": "utils_12" }, "locked": { @@ -3137,7 +3205,7 @@ }, "iohkNix_6": { "inputs": { - "nixpkgs": "nixpkgs_34" + "nixpkgs": "nixpkgs_35" }, "locked": { "lastModified": 1629993366, @@ -3600,6 +3668,22 @@ "type": "github" } }, + "nix-bundle-exe": { + "flake": false, + "locked": { + "lastModified": 1682949567, + "narHash": "sha256-K9PT8LVvTLOm3gX9ZFxag0X85DFgB2vvJB+S12disWw=", + "owner": "3noch", + "repo": "nix-bundle-exe", + "rev": "3522ae68aa4188f4366ed96b41a5881d6a88af97", + "type": "github" + }, + "original": { + "owner": "3noch", + "repo": "nix-bundle-exe", + "type": "github" + } + }, "nix-nomad": { "inputs": { "flake-compat": "flake-compat_3", @@ -3839,7 +3923,7 @@ }, "nix-nomad_7": { "inputs": { - "flake-compat": "flake-compat_13", + "flake-compat": "flake-compat_14", "flake-utils": [ "daedalus", "tullia", @@ -4056,7 +4140,7 @@ "nix2container_8": { "inputs": { "flake-utils": "flake-utils_24", - "nixpkgs": "nixpkgs_31" + "nixpkgs": "nixpkgs_32" }, "locked": { "lastModified": 1658567952, @@ -4132,11 +4216,11 @@ }, "nix_4": { "inputs": { - "flake-compat": "flake-compat_14", + "flake-compat": "flake-compat_15", "flake-parts": "flake-parts", "git-hooks-nix": "git-hooks-nix", "libgit2": "libgit2", - "nixpkgs": "nixpkgs_35", + "nixpkgs": "nixpkgs_36", "nixpkgs-23-11": "nixpkgs-23-11", "nixpkgs-regression": "nixpkgs-regression_4" }, @@ -5342,6 +5426,22 @@ } }, "nixpkgs_30": { + "locked": { + "lastModified": 1688392541, + "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-22.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_31": { "locked": { "lastModified": 1653581809, "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", @@ -5357,7 +5457,7 @@ "type": "github" } }, - "nixpkgs_31": { + "nixpkgs_32": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -5372,7 +5472,7 @@ "type": "github" } }, - "nixpkgs_32": { + "nixpkgs_33": { "locked": { "lastModified": 1653920503, "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=", @@ -5388,7 +5488,7 @@ "type": "github" } }, - "nixpkgs_33": { + "nixpkgs_34": { "locked": { "lastModified": 1665087388, "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", @@ -5404,7 +5504,7 @@ "type": "github" } }, - "nixpkgs_34": { + "nixpkgs_35": { "locked": { "lastModified": 1691003216, "narHash": "sha256-Qq/MPkhS12Bl0X060pPvX3v9ac3f2rRQfHjjozPh/Qs=", @@ -5418,7 +5518,7 @@ "type": "indirect" } }, - "nixpkgs_35": { + "nixpkgs_36": { "locked": { "lastModified": 1723688146, "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", @@ -5434,7 +5534,7 @@ "type": "github" } }, - "nixpkgs_36": { + "nixpkgs_37": { "locked": { "lastModified": 1724098845, "narHash": "sha256-D5HwjQw/02fuXbR4LCTo64koglP2j99hkDR79/3yLOE=", @@ -5940,7 +6040,7 @@ "daedalus": "daedalus", "iohkNix": "iohkNix_6", "nix": "nix_4", - "nixpkgs": "nixpkgs_36", + "nixpkgs": "nixpkgs_37", "nixpkgsUnstable": "nixpkgsUnstable", "ragenix": "ragenix", "utils": "utils_13" @@ -6382,7 +6482,7 @@ ], "n2c": "n2c_7", "nixago": "nixago_7", - "nixpkgs": "nixpkgs_33", + "nixpkgs": "nixpkgs_34", "yants": "yants_7" }, "locked": { @@ -6594,7 +6694,7 @@ "inputs": { "nix-nomad": "nix-nomad_7", "nix2container": "nix2container_8", - "nixpkgs": "nixpkgs_32", + "nixpkgs": "nixpkgs_33", "std": "std_7" }, "locked": { diff --git a/flake.nix b/flake.nix index 71b0b25..a123a3e 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ inputs = { cardano-node.url = "github:input-output-hk/cardano-node/?ref=1.35.7"; colmena.url = github:zhaofengli/colmena/?ref=v0.4.0; - daedalus.url = "github:input-output-hk/daedalus/?ref=5.2.0"; + daedalus.url = github:input-output-hk/daedalus/?ref=6.0.0; iohkNix.url = "github:input-output-hk/iohk-nix/?ref=df1da282f996ec46b33379407df99613a1fbafdd"; nix.url = "github:NixOS/nix/?ref=2.24.3"; nixpkgs.url = github:NixOS/nixpkgs/?ref=nixos-24.05; diff --git a/profiles/daedalus.nix b/profiles/daedalus.nix index 5878066..cb875cc 100644 --- a/profiles/daedalus.nix +++ b/profiles/daedalus.nix @@ -2,16 +2,17 @@ { config, pkgs, - daedalus, lib, ... }: let - daedalusProject = import daedalus.daedalus {}; - daedalusMainnet = daedalusProject.daedalus; - #daedalusFlight = daedalusProject.daedalus {--argstr cluster mainnet_flight -o daedalusFlight}; + flake = builtins.getFlake (toString ../.); + daedalusMainnet = import flake.inputs.daedalus.packages."${pkgs.system}".daedalus-mainnet; + #daedalusPreview = import flake.inputs.daedalus.packages."${pkgs.system}".daedalus-preview; + #daedalusPreprod = import flake.inputs.daedalus.packages."${pkgs.system}".daedalus-preprod; in { environment.systemPackages = [ daedalusMainnet - #daedalusFlight + #daedalusPreview + #daedalusPreprod ]; } From 7b6d4cf302a71f099f84efba985070f8d5b60a9d Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Sun, 25 Aug 2024 19:22:49 +1000 Subject: [PATCH 27/47] chore(daedalus): use flake binaries --- outputs.nix | 3 +++ profiles/daedalus.nix | 16 ++++++---------- profiles/desktop_common.nix | 1 + 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/outputs.nix b/outputs.nix index bb4b9b7..f395c7a 100644 --- a/outputs.nix +++ b/outputs.nix @@ -34,6 +34,9 @@ in { overlays = []; }; }; + defaults = { + _module.args.inputs = inputs; + }; airgead = { imports = [ hosts/airgead diff --git a/profiles/daedalus.nix b/profiles/daedalus.nix index cb875cc..cdc4733 100644 --- a/profiles/daedalus.nix +++ b/profiles/daedalus.nix @@ -1,18 +1,14 @@ # NixOps configuration for the hosts running Daedalus { config, - pkgs, + inputs, lib, + pkgs, ... -}: let - flake = builtins.getFlake (toString ../.); - daedalusMainnet = import flake.inputs.daedalus.packages."${pkgs.system}".daedalus-mainnet; - #daedalusPreview = import flake.inputs.daedalus.packages."${pkgs.system}".daedalus-preview; - #daedalusPreprod = import flake.inputs.daedalus.packages."${pkgs.system}".daedalus-preprod; -in { +}: { environment.systemPackages = [ - daedalusMainnet - #daedalusPreview - #daedalusPreprod + inputs.daedalus.packages."${pkgs.system}".daedalus-mainnet + #inputs.daedalus.packages."${pkgs.system}".daedalus-preprod + #inputs.daedalus.packages."${pkgs.system}".daedalus-preview ]; } diff --git a/profiles/desktop_common.nix b/profiles/desktop_common.nix index edf8d2b..42799e7 100644 --- a/profiles/desktop_common.nix +++ b/profiles/desktop_common.nix @@ -1,5 +1,6 @@ # Common configuration for MIO desktops { + inputs, config, pkgs, ... From 396867141c32ec26f6068597918217e8b258ef7f Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Sun, 25 Aug 2024 20:49:01 +1000 Subject: [PATCH 28/47] chore(iog): use flake input --- profiles/iog.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/profiles/iog.nix b/profiles/iog.nix index bcda846..3cbb90c 100644 --- a/profiles/iog.nix +++ b/profiles/iog.nix @@ -1,11 +1,13 @@ # NixOps configuration for the hosts utilising IOHK resources { config, + inputs, pkgs, lib, - nix, ... -}: { +}: let + nix = inputs.nix.packages."${pkgs.system}".nix; +in { imports = [../profiles/terminal-recording.nix ../profiles/nix-direnv.nix]; nix = { @@ -13,16 +15,12 @@ settings = { substituters = [ "https://cache.nixos.org" - "https://erc20.cachix.org" "https://cache.iog.io" - "s3://iohk-vit-bitte/infra/binary-cache/?region=eu-central-1" ]; trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" - "erc20.cachix.org-1:SSf1RXfccF4/rwiwgBrbV7n8EBn0xciuU/TMdtor8LE=" "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" "iohk.cachix.org-1:DpRUyj7h7V830dp/i6Nti+NEO2/nhblbov/8MW7Rqoo=" - "vit-testnet-0:0lvkEoYh+XrBh7pr4bXjsUisUkUxsyLvvWBIJwym/RM=" ]; }; extraOptions = '' From 4a87506ee967f714e075a78c033014aa806fca3d Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Sun, 25 Aug 2024 22:27:23 +1000 Subject: [PATCH 29/47] chore(matrix): corrected secret path --- profiles/matrix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/matrix.nix b/profiles/matrix.nix index b8e4631..223cda2 100644 --- a/profiles/matrix.nix +++ b/profiles/matrix.nix @@ -64,7 +64,7 @@ server_name = "mcwhirter.io"; # Server's public domain name tls_certificate_path = "/var/lib/acme/mcwhirter.io/fullchain.pem"; tls_private_key_path = "/var/lib/acme/mcwhirter.io/key.pem"; - turn_shared_secret = config.services.coturn.static-auth-secret; + turn_shared_secret = "${config.services.coturn.static-auth-secret-file}"; turn_uris = [ "turn:turn.mcwhirter.io:5349?transport=udp" "turn:turn.mcwhirter.io:5350?transport=udp" From 0f04e3b1dfd174576303148145b5775b2de01658 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Sun, 25 Aug 2024 22:34:32 +1000 Subject: [PATCH 30/47] chore(cuallaidh): updated acme email --- hosts/cuallaidh/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hosts/cuallaidh/default.nix b/hosts/cuallaidh/default.nix index 9efb72a..88e0bc1 100644 --- a/hosts/cuallaidh/default.nix +++ b/hosts/cuallaidh/default.nix @@ -53,8 +53,9 @@ security.acme = { acceptTerms = true; - certs = {"git.mcwhirter.io" = {email = "craige@mcwhirter.io";};}; - certs = {"source.mcwhirter.io" = {email = "craige@mcwhirter.io";};}; + defaults.email = "acme@mcwhirter.io"; + certs = {"git.mcwhirter.io" = {};}; + certs = {"source.mcwhirter.io" = {};}; }; system.stateVersion = "19.03"; # The version of NixOS originally installed From ab06414f29af5a89e70d8a9e046979d08b61d6b0 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Sun, 25 Aug 2024 22:39:13 +1000 Subject: [PATCH 31/47] chore(nextcloud): corrected secrets path --- profiles/nextcloud.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/profiles/nextcloud.nix b/profiles/nextcloud.nix index fb0c98a..44b68c4 100644 --- a/profiles/nextcloud.nix +++ b/profiles/nextcloud.nix @@ -7,14 +7,14 @@ }: { age.secrets = { nextcloud-dbpass = { - file = ../../secrets/nextcloud-dbpass.age; + file = ../secrets/nextcloud-dbpass.age; path = "/run/keys/nextcloud-dbpass"; mode = "0640"; owner = "nextcloud"; group = "nextcloud"; }; nextcloud-adminpass = { - file = ../../secrets/nextcloud-adminpass.age; + file = ../secrets/nextcloud-adminpass.age; path = "/run/keys/nextcloud-adminpass"; mode = "0640"; owner = "nextcloud"; From 0fa045e932cac22aa55f9aa56be11d056c92b23d Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Sun, 25 Aug 2024 22:42:46 +1000 Subject: [PATCH 32/47] chore(tt-rss): corrected secrets path --- profiles/tt-rss.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/tt-rss.nix b/profiles/tt-rss.nix index e846c6f..1326a46 100644 --- a/profiles/tt-rss.nix +++ b/profiles/tt-rss.nix @@ -18,7 +18,7 @@ database = { # Configure the database type = "pgsql"; # Database type - passwordFile = config.age.secrets.tt-rss-dbpass; # Where to find the password + passwordFile = "${config.age.secrets.tt-rss-dbpass.path}"; # Where to find the password }; email = { fromAddress = "news@mcwhirter.io"; # Address for outgoing email From c3d252eeef0d70c092d4d44df0cea3cd2f49d09f Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Mon, 26 Aug 2024 00:57:23 +1000 Subject: [PATCH 33/47] chore(cardano-node): convert to using flake --- flake.nix | 2 +- hosts/airgead/default.nix | 2 +- outputs.nix | 2 + profiles/cardano-node.nix | 44 ++++++++++++++++----- secrets/cardano/cardano-kes.age | 61 ++++++++++++++++++++++++++++++ secrets/cardano/cardano-opcert.age | 41 ++++++++++++++++++++ secrets/cardano/cardano-vrf.age | 38 +++++++++++++++++++ secrets/secrets.nix | 3 ++ 8 files changed, 181 insertions(+), 12 deletions(-) create mode 100644 secrets/cardano/cardano-kes.age create mode 100644 secrets/cardano/cardano-opcert.age create mode 100644 secrets/cardano/cardano-vrf.age diff --git a/flake.nix b/flake.nix index a123a3e..4f23cf2 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ cardano-node.url = "github:input-output-hk/cardano-node/?ref=1.35.7"; colmena.url = github:zhaofengli/colmena/?ref=v0.4.0; daedalus.url = github:input-output-hk/daedalus/?ref=6.0.0; - iohkNix.url = "github:input-output-hk/iohk-nix/?ref=df1da282f996ec46b33379407df99613a1fbafdd"; + iohkNix.url = github:input-output-hk/iohk-nix/?ref=df1da282f996ec46b33379407df99613a1fbafdd; nix.url = "github:NixOS/nix/?ref=2.24.3"; nixpkgs.url = github:NixOS/nixpkgs/?ref=nixos-24.05; nixpkgsUnstable.url = github:NixOS/nixpkgs/?ref=nixos-unstable; diff --git a/hosts/airgead/default.nix b/hosts/airgead/default.nix index 5ed7eee..dc9f6e4 100644 --- a/hosts/airgead/default.nix +++ b/hosts/airgead/default.nix @@ -1,6 +1,7 @@ # NixOps configuration for airgead { config, + inputs, pkgs, lib, ... @@ -8,7 +9,6 @@ imports = [ ../../networks/linode.nix ../../profiles/cardano-node.nix - ../../secrets/airgead.nix ]; deployment.targetHost = "172.105.187.96"; diff --git a/outputs.nix b/outputs.nix index f395c7a..0d68ca4 100644 --- a/outputs.nix +++ b/outputs.nix @@ -1,5 +1,6 @@ { self, + cardano-node, colmena, daedalus, nix, @@ -40,6 +41,7 @@ in { airgead = { imports = [ hosts/airgead + cardano-node.nixosModules.cardano-node ragenix.nixosModules.default ]; }; diff --git a/profiles/cardano-node.nix b/profiles/cardano-node.nix index ec52b3a..174720c 100644 --- a/profiles/cardano-node.nix +++ b/profiles/cardano-node.nix @@ -1,19 +1,42 @@ # NixOps configuration for the hosts running a Cardano node { config, + inputs, pkgs, lib, - cardano-node, - iohkNix, ... }: let - cardanoNodeProject = import (cardano-node + "/nix") { - gitrev = cardano-node.rev; + cardanoNodeProject = import (inputs.cardano-node + "/nix") { + gitrev = inputs.cardano-node.rev; }; in { - imports = [../secrets/cardano/producers.nix "${cardano-node.cardano-node}/nix/nixos"]; + age.secrets = { + cardano-kes = { + file = ../secrets/cardano/cardano-kes.age; + path = "/run/keys/cardano-kes"; + owner = "cardano-node"; + group = "cardano-node"; + mode = "0600"; + }; + cardano-opcert = { + file = ../secrets/cardano/cardano-opcert.age; + path = "/run/keys/cardano-opcert"; + owner = "cardano-node"; + group = "cardano-node"; + mode = "0600"; + }; + cardano-vrf = { + file = ../secrets/cardano/cardano-vrf.age; + path = "/run/keys/cardano-vrf"; + owner = "cardano-node"; + group = "cardano-node"; + mode = "0600"; + }; + }; - environment.systemPackages = [cardanoNodeProject.cardano-cli]; + #imports = [../secrets/cardano/producers.nix]; + + environment.systemPackages = [inputs.cardano-node.packages.${pkgs.system}.cardano-cli]; services = { cardano-node = { @@ -21,8 +44,9 @@ in { environment = "mainnet"; hostAddr = "0.0.0.0"; nodeConfig = - iohkNix.cardanoLib.environments.mainnet.nodeConfig + inputs.cardano-node.environments.x86_64-linux.mainnet // { + Protocol = "Cardano"; hasPrometheus = ["127.0.0.1" 12798]; setupScribes = [ { @@ -33,9 +57,9 @@ in { ]; defaultScribes = [["JournalSK" "cardano"]]; }; - kesKey = "/run/keys/cardano-kes"; - vrfKey = "/run/keys/cardano-vrf"; - operationalCertificate = "/run/keys/cardano-opcert"; + kesKey = "${config.age.secrets.cardano-kes.path}"; + vrfKey = "${config.age.secrets.cardano-vrf.path}"; + operationalCertificate = "${config.age.secrets.cardano-opcert.path}"; }; }; diff --git a/secrets/cardano/cardano-kes.age b/secrets/cardano/cardano-kes.age new file mode 100644 index 0000000..ad43b47 --- /dev/null +++ b/secrets/cardano/cardano-kes.age @@ -0,0 +1,61 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEZCOVgxUSBpMC84 +S09IcHB5aFVVb3pIRkhUbWNuRGRkbHlUUlZDTG5WakZFSENaVEJvCk1RUVhaNGpQ +SURDQ0YydStCcDg5OGl1NEYzYjJ2TWNHZTlHdUZRYURNb0UKLT4gc3NoLWVkMjU1 +MTkgSk00dDZBIEd4dEtMdXY1TnFNaWwwbDdURGlXNWJDb3V0SXYybURpdVZqM21n +STJmMU0KV1JaYmRXbjhoK1QvWXBEZzc5a09EMGhZZWhzb0tReGkxSW80aWFqb0ZN +MAotPiBzc2gtZWQyNTUxOSA5aEV5RFEgbVg5c1RqVHBOQUxreDg5c2pnNEJ2dzFD +ZkFiRnEvQUZ0dmFDdEhQOTN3WQp5cE0zOWE1cVhFR0czUitxa1ovOWtrayt5WG1z +Yk4vZGkzZTJoaUpNMEdnCi0+IHNzaC1lZDI1NTE5IHU3WjNqdyBmYmQ1YTZQRmtu +bmtoalNXSFRrdUFRRVEzTHZ6YVh1Nlh2YWY2WE5Vam5VCkdtWGZWdnNRNDByL3Zh +QkpVMFNya1IwY1BkMWRlY0ovT21QN21yMVpTSWMKLT4gc3NoLWVkMjU1MTkgV2c5 +M3J3IHRKaWVuTUM1b0hoQ1ZkS29RWFVyQ3FDcXhUWWlEd0FBOGhwWnQ5a2Rqd2MK +WXF4ZmQvUU81Z0RnWTNIZFRUVTVJSkNHcDFOclUzSGxMMWpBMlpvLzZEWQotPiBz +c2gtZWQyNTUxOSBQeEt3alEgZVNudVB1UDBTd0FTVjB4andQWEJ0SXpsWUszR3dI +OFlmakh0NTZIemJrNAo4OE1lNlJpZ3NWVHdvSG8rK0laN3J3cGxKd2t5K1Jnb1lV +NmZCOGhFNE5jCi0+IHNzaC1lZDI1NTE5IEIzZFhTQSA5TjdkL21wcmhTdE9Td2Z5 +c1FrdU1pVFRCNzMyKzIwYTNvNjBzZStoUTFnCkx5UjUwUzYyWm53dWg1ZDUrazNy +NUFLMlJwUWNhSVIwc2haenBmL0lQcU0KLT4gc3NoLWVkMjU1MTkgUWZwS1ZnIEZG +cDZLTlA4cUxqR08xbCtDRldRZkNzK2c1Z1lBZGNvNTh3NjJwM2tpM2cKYlBTRDYz +aGlMMWxUV2MyOTVwMndBWTM0SDhKaTlTS0hsYm1kZUJNYnd3QQotPiBzc2gtZWQy +NTUxOSAwZHBkZ1EgWk9uTTM1TjdzWDZXODU3UUVZdGJ1d1c2eWNnOGRaaEowUDQ1 +clRGWkN5ZwpGd2RDYWtHYW1YTURmN1dNZEtCdFF4YWZjV1NhS0ZqdE01czYwcXkr +czRBCi0+IHNzaC1lZDI1NTE5IHVsMGt4USBTd2pKTFptK01WZVhEQ0g2by81SlUz +MTc1eFE0T3g5TnhGKzIxbU5YRDFJCnJHWVNWV0dNUXFXaFdIRUZMVVdnbUI5TzV2 +WURGWXhMQmFYQUphMDluaGsKLT4gc3NoLWVkMjU1MTkgWnc1SGt3IHhXUk9qTktH +NHJySXp3ZS9XVEFGUFU5VFM3OUN0NDZUOC9lY2NZbkV6d1EKVUhXQ1VEQVUralls +b1Job3BtK2JmSFZQTWZRb1hrMFc5aUNEczdZY3dRVQotPiBzc2gtZWQyNTUxOSB6 +RzMrMXcgUjlOcmg5cXVSdTlHVVJDZUE3THdjb1YybmZmSExCM2IvZ29lNVpNYi9R +MApjOEVmditLQXM0Zzd2WFRSeThBaEo4aEtnME5BQWJsYUxUUTZWSXlQREEwCi0+ +IFA1Y0w8LWdyZWFzZSAmQWogcixOK34Kc1cvRVpiandaUHAvMXJvSUZoVzZPaWpx +L1ozeTdKZkcKLS0tIGcxTi9hZVVuWDZxblg2TEFNSk5zTk00SmtmWUhKb2FHc3JV +aFMrdUFPTGsK0DCthsP/cg/SkY56up9zt7WqxzMtLvo4Bv3O+EMK2WknyR/g+QJx +QKKBkILmt07R+MpDBlHA1X8AOH5iT7tNNNplp2dztzFC6pRL/v2hBIVL+abqmAMj +pG9TEt+FISgd1PxTS55cHugUaC8LJNi7wa/4sBwTTI+Rnl4KHZBo5BiGUq61dX6j +fd6pZXSmptT4dBVV2ZETyBYoOqe74cPe5gVQfVMzXI4xnKRhe9va4qnmoEZV2YQD +MUl8JtRGVbeIPvQdM8fQjcaZNNw5rhYMMadJtuo5beqG1z+i+tAxJISBv+NU3rNv +FTaDPKXlP1UvsK+SgPFZYI6VMZiFo9ZoMYSYiirO6jHXOQutzo11qy0wzToQTpU8 +zRe9QbMzuhgGewQEfZYayQzTQa5yQDvCH1fTVqtcDeQVB1/xw9DpwLFDfV/kGN8o +T2KBv3d2hOqP74vNOoSMsBE9PxcB9hdKQ347mBueN9c245FuRH188+VV1wYG0CTD +ogd4zyt3NRT2HM06YiR5fNGo7kHLjoREPQFabiyKmpWIQ/Mpa3/fC7LaBZqQe1hS +fnhh3/STGv4kpAJN7iADrsqN/JDNAiAkTSWVHabu5zxPwOgRyQ4/HS3SpvhatNxG +TuNNiMKbn28rjaoRK2pepkw5RHbGLjtapiTqDF0uqoyQfPCL02NDToKprbuJYM7v +/4xhmREPA/FJWxMMDEGY+vvIlyYYHfaogipZpodT02+mjSLTeLIv7bTBFh+sD1M+ +el7T6bKhfZo8dXqoaFyhAj8b0yCwVMeGmDIfnJmPWTnHAHPvM7iX2Xd1Q0fshgN+ +BtU1GKIQs0g7W8JTcvtpZbxtB0phFQT0SJXdDoFbE1lQl13wcecy2QL7KHywG8/R +tSMKgSrhcb23BffId5a2xtLoYvr4EmxWHT8+4boWF0UwPArOLCH1kz2OiQb0/avC +Lm78KVqlIC0ck8dk6wDRUzGAFB4kQpsFEhfk+OHTQuhSzqFlo/AWsldNhosZF2SA +roOMZlfmabJPPPcidpnV+xbyzL7NWF5uPgJvVN4pDCcfow79g+QH2sztIjcFOLHt +5hZimXHm/0aVpxRbTKFOrEiDIthDK0QWZCxJCvl0BmeFrRzTtSNPUHlEEcVdcCFo +15kKS5BS4r4Ma7xD4Hdwn0DxjeWN69TGSrHJTNgCTiy9SG2roAp/gaB9aXHBTvRh +53kKFLNRe5yKuOeMIjH1Kbvh4G4nUoSKK0bFRbG6KUsDFh66g/OD84zQi53k2l/X +liGARABrqmmmuzUJEdfrV2EZuxj7xFAey8MBFGqdTn0ERugIPueJEM2znSkp6w+m +7fxx8JxL2B0oXLEZaV+N6jc9unBA/IhrczF3Mal1zVFx8GlrZyO+ZQmr9J1FkICc +BM6oxuMLb74J3O7gURSaSBBQJd3/bWukyGDZzSkhphiRwHQ+KAfbtEM18XknFiwZ +XG0bXNjMSGXMCDoo9z1YcD8DJRa07H4JoH2rElniTUVmussgi/k+thHojW2BURk1 +iNrtBqIbP0YWnqBsxE/UWX630qY15+OfkWW0fd+wUUtV5CYFOaLDp273VOhSYLPB +3YBFdZH0VE8YH/ZJy6Dn8xigX4EWHB1ZdslHWwyPPRMX0CWIJN0flXdnQhAtBhHe +J2an1vTb7K+H0149FP5R9pJLMZDZu+TEY972c3Td/v4A2hQkEPqLnKy5sXqajFDk +u9y25CR1i4oSVeZqI5M6cFeiVchmzeP3TPKV9duLpL8iw63uUi+hKzkxC/CCA000 +5RRvoN4+QaZnmkl3y2OuVbYVGdW1fK54 +-----END AGE ENCRYPTED FILE----- diff --git a/secrets/cardano/cardano-opcert.age b/secrets/cardano/cardano-opcert.age new file mode 100644 index 0000000..b6856db --- /dev/null +++ b/secrets/cardano/cardano-opcert.age @@ -0,0 +1,41 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEZCOVgxUSBxQWlJ +ejRsWG1HY2hHUDFoK1IrV1B6UUxSa2o2c3NiTTI1V2w5QmROR2hrCmI3OEV4cm4y +NlFVRm9BWjl6dTJkazY5bXIyRU56T3pLVnNkeDA5dXp5L0UKLT4gc3NoLWVkMjU1 +MTkgSk00dDZBIEJ5b1EwQ3RuUEZXNCt6LzJ0YW0zc040czBDbVhwdDhCSGZkVUZV +UnVjbjAKYXNnUzFUS1BCTVJvaEg1dDNRNFk3Z3IrL0pBM3BKZitpNUFzVUFnWk5K +MAotPiBzc2gtZWQyNTUxOSA5aEV5RFEgcmJKOTN6L3NaR1NzSnhFTlNGQTc1MFhn +VVI2WWdhekdvS3RNOVdmd1hDQQpLSFNwMWhZZzkrZVRqdU55QlZkd0pmSUl1WjVw +QlhhTHRvNDIyZzN4UDQwCi0+IHNzaC1lZDI1NTE5IHU3WjNqdyB2c20yY3lWS1Zu +eDliNi9CWHZSaWxiUkFtR0tGaEZhaDcreWlnRG0zRTE4CnFtQ0tkUGxLKzhKNWhR +VFVhcHMvK2ZUVFpBV2FMdUx1NEpzcmRIMUIvU0UKLT4gc3NoLWVkMjU1MTkgV2c5 +M3J3IG42eUxQTW4va3BRbW1JbnhxWTA5NE8vazNUVzhzcEJ2SDhJYk85VGhqUjAK +Sk1LMXhSUXg0WmhnUVNKWDJyNTlCUFAxL3VpRWdkV3lqeXRwallKeU1hawotPiBz +c2gtZWQyNTUxOSBQeEt3alEgVzBFa3hjNjFYQjAvaHRZNk5qNE81OFRZLzdsUWRz +dDFNdjNXOVlXeStHUQp1Q3ZYMU45Vk84VENnYzlrWU81Uk5wTXlRaGZ2d1lwdGNN +NWQyNzdhQ0JrCi0+IHNzaC1lZDI1NTE5IEIzZFhTQSBCc1lDWEU1ajVENHpncURG +c3hERzBERStDN3BTZ1I2dEZNM3ExMDNSVjB3CkdGaGkrb1ozRjRpRmxBYmJleUN5 +ODlscXdzY09VM3pBNjluSHJ5Mk5WaFkKLT4gc3NoLWVkMjU1MTkgUWZwS1ZnIHZW +MFYvY1hXa1YvcEU4OVlaRkdPU2dWMFJCMjdvekluV01RTDB2ZjdOVkEKYTNhaFJB +cHVpRGJXNCszTmxTVGw2c0lhM3BnNWREVDFJUTZKL2oxWnQ0WQotPiBzc2gtZWQy +NTUxOSAwZHBkZ1EgTHFuS0VvRjNrRVo4UHRLVzQ0QSswN1dUeDEvQUhTTVBNeC9C +em5kaEpSVQpQMGNxZ2xrRnpQTFZXMGVUeXhYZWEvTUdRSVZMSDhrOWpiZ0MvbVZk +VUF3Ci0+IHNzaC1lZDI1NTE5IHVsMGt4USBsZWsyNmhRRGdZVDVya0VtUFUzSU11 +bmdTU29CTmJrazl4REFMMGx4Q0JzClVtWUtJcUZ6V0lDODc5dFJDTHU0WklkT1Mr +ajMzaGtwNGRHM3FsQm1yaUEKLT4gc3NoLWVkMjU1MTkgWnc1SGt3IHVJYnZrWnoz +WlJvWEkrVHFDSGhORC8rMWlsaUV0eTdoempCOG9yRDJ0RWMKMk5GY3FRWElYdXd0 +bVBCajA5YjNaREtLNTZLZ00yaWFPMDVwR2djWU1DZwotPiBzc2gtZWQyNTUxOSB6 +RzMrMXcgQW5iaHZJS3I5OVRHa3B4OXptQjdSbkUyRDRsNlVLVFd2WXBxVmpYeVlV +RQpONThJRU9vTHBUdWRpZTJ2UXRNL1RzNzU1cjVlMXN2RjNCeTVtcncyZ1BBCi0+ +IDxHLWdyZWFzZSBPX24yIHhCPF9WRzkgRjEkYSBOWDM4ClhTd1RGVUx4NVNCSFAr +a0RHL3lnYnNsUEp2MFFJeVJha0EKLS0tIHNVVlBNeTZESUppNW93ZmlvcmNTWFV3 +aFRhcFc4RCtzL2hOWCtabnU1K00K09y1sG6p0grkLk3YzDMSayhsnIyHVgTX7R7H +BxpIPqQXH9kvw6Bm5XkG10hmgSraLKfKN+tGceWGSZRj1AC/kicY6NmixppUpBRb +5ZrffqerYsgqPa7j2b/Cy/2ifmbT1/YfGhFHb3SImc7XeDZpvVxy4GJWDcUTkfu5 +3434k3ZHGTDAULEx47Vd0o+QLCCGBIXIAzOXpJifzPuc1jjxTv4+VI2COQdD3cw/ +2eSTQrxuJo+2iTgNkssE39xTyHxssKCZTBJ7ig1dRmI7B+xkCEGKgT33if03KvqZ +nPNJ8ul4Y6n+hrBa0LuI3suLW95wk/D5WjWouX3A8JAp+B3BN/Zl1Ov9LowccvF5 +y6yTLTqbVZsCpccVr+lasJYl6/K5PEqReoMVpoWrEO+AZA3VEPu7GA/J8NBF8/fS +I6pPVI7SDTmpnA4/05izvNJtGgfc5q2BL83xkL5yy6wsDm+YhaoxJpb1zVPPmAVX +MdqFods3EfzXTlaKihLp9GghfQsZbq15HwAF3Q3szf11YQwR98w= +-----END AGE ENCRYPTED FILE----- diff --git a/secrets/cardano/cardano-vrf.age b/secrets/cardano/cardano-vrf.age new file mode 100644 index 0000000..464d5e7 --- /dev/null +++ b/secrets/cardano/cardano-vrf.age @@ -0,0 +1,38 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEZCOVgxUSBGQ0hB +K012ZWtYKzFYL3dGcG4zK2RCYjk3R0wyWnBNTFNQajNINDVVNFNVCkpsalhDTEtj +blJQY0MyV3lwc2p1M1dkdVAxSWpWY29IOUdoeGxFeFFrRDgKLT4gc3NoLWVkMjU1 +MTkgSk00dDZBIDNpbUQvd3ZBdlZDQzY1UU9FWk5rK2loYkNDaTlmcG5VWm00WCto +RXlUR1UKbnVGNnZ3dTA5Q3hTc3YzYlV1SkxqMFNEQmJBVU5Yd215ZmtEQTFhN2dK +SQotPiBzc2gtZWQyNTUxOSA5aEV5RFEgbGYvYkhyWlJNQzQ4NUFUbENHQlZxZlVM +UjE4d0FEN2pJUDVFVGRjTy9XZwpyRE1hWHpNZ0pMems3TnhJMCt0RTFObnFSYWpC +dFpUTEFIOEVpU3BTWXBJCi0+IHNzaC1lZDI1NTE5IHU3WjNqdyA0QmF1ZkVRR05w +cDV3TjVNWVgwTE1YSS8xbGJkaGFvZmVWZm4yWm5xRG5rCjRKQnJKbGozeUFqTmt6 +NVVqV3hoZms5Z240TU4wY1lCL1l3UHFJdnpGbzAKLT4gc3NoLWVkMjU1MTkgV2c5 +M3J3IDBSS3R2dXk3NFBaZElYWDI3d3Btai9sMjBHV2xvSnJyMXJIbDZheFZiMWsK +MW9rMkZ1UEJ1VkJJSGNCcDdVWXdZeFgraTBhbFphT21ITmVSWUpDYUJqYwotPiBz +c2gtZWQyNTUxOSBQeEt3alEgY3VKSmNaWG9uYnZaRG9oZHVCek5vQUQ1dmwzSGZC +UHhSZ21NQ292RXpqcwp6WVU1MFV4NjYxaUhkVHIvWHpQb3AwaU5zRFVRRjBSZEtj +UXN0amtncUg0Ci0+IHNzaC1lZDI1NTE5IEIzZFhTQSBxU0dWSnVPaUJEYmdpSXdQ +NW4zcjAyN2NwTUpRY0Z4OVNLTEFhczJDazBVCnNNYm9wNXpBWmJjSzVUQWw1amE4 +ZGFwdFNoUHFvVXpZTWk2YzdWakNTOG8KLT4gc3NoLWVkMjU1MTkgUWZwS1ZnIGxm +eTgvWjBIRTNUVzdlSitoZ3RrY2JpR0UxTWNBdVNmRk1VbGd6S0FBV1UKaWRnZ3hG +M3grNDN1Q2FIbmVLTGp6Vkp4YTVwSWpnT1E5WjA5M3VDRFJPQQotPiBzc2gtZWQy +NTUxOSAwZHBkZ1EgdXBucnhOVThEVFJKNXJTUXNpOVVHV0FzR0ZBbjF3V01oeG5i +NTZieTgyawpPak45UmRXOUpVREJ2MWhZZ1orWnFaVTJ0Rmc1TzlVb3BhUS9jVU1T +NXpvCi0+IHNzaC1lZDI1NTE5IHVsMGt4USBrS3AxaGFHd3JKcWtHUWt2V2xUNGZs +ZjFqR29yNWdxQzM5MU5PQytGaVdvCjdpVEZaZnZjQnU3bmIyTVp3UlRuTnJxYzZp +NWxIN0FIZ0ZENzhLNUk5SHMKLT4gc3NoLWVkMjU1MTkgWnc1SGt3IGZrZ0U3N0M5 +Lzc1ZlovK29OV1h5QU5ZNkhaRFdjNWRQcHF2OWl1M1Jzd1EKYzVHdktjZFZ5S2Ev +TWsvd2hMV1ljS1EybHVjNHdYNUt2b0wxTzA2TGtGVQotPiBzc2gtZWQyNTUxOSB6 +RzMrMXcgV0RrU1lnTTZ0L0o5RlIwbUZUNVlQaEgzbGZadmtIeVpmQWhxV1NyY1J4 +VQpVQWNKTGlTUElBczNuTlVmbnUzQXNIbVhYYW1jK1RyRlZWN0F1WXVHamVvCi0+ +IGNycy1ncmVhc2UgLzdHXk1HQCBCCjQ2a05YbFp6Ni9DRmJoQ1lVVEFpNXEydFpI +cHB3TVphSXcKLS0tIDdOajBjU1NqaXM1dFo2Rk5mWWMvMnpMdWJVcEZZY2g0MWlx +NWhkaTJPKzgKOTYgpJXvf47nS1vCC2kA3G7+oplnot1p73dyTg7kW/mJUeBhXqjf +OX24j8Ovx9paVbyCMIvyRjEJzL58m8S0hFo1wDTL2HGIopyAFIXNTu6ScUJKqWMw +HsB8wZcMxlQghYv0ABmqZJwNqFCRf+CbXeGBqGLNC1WtYndHXj68i7diqTF3IxYs +wpxk3rjLaeJdgSh6+frIb9rh7mck7brKJrPU04/RZBx9EJ3nGPFVBPYK8zTezqCD +cN4rv7deV2dwS7nj7laPtzhignXP0tJVvuSgHYwqh39U//1Lv9y1xoMyEbDNJqcP +AIkapF5A0uv5sL8OoQbfUYqO1xbf8/IRsxJP4ybTiA== +-----END AGE ENCRYPTED FILE----- diff --git a/secrets/secrets.nix b/secrets/secrets.nix index a90b3d4..1449651 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -43,6 +43,9 @@ in { "hamish.age".publicKeys = ops ++ systems; "logan.age".publicKeys = ops ++ systems; "xander.age".publicKeys = ops ++ systems; + "cardano/cardano-kes.age".publicKeys = ops ++ systems; + "cardano/cardano-vrf.age".publicKeys = ops ++ systems; + "cardano/cardano-opcert.age".publicKeys = ops ++ systems; "coturn.age".publicKeys = ops ++ systems; "nextcloud-dbpass.age".publicKeys = ops ++ systems; "nextcloud-adminpass.age".publicKeys = ops ++ systems; From bfa192faff0f5f9224438e9d4ba39cc7acc9aafb Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Sun, 8 Sep 2024 23:11:01 +1000 Subject: [PATCH 34/47] chore(nixos): bumped to HEAD of 24.05 --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 7fa0798..bf2cfbc 100644 --- a/flake.lock +++ b/flake.lock @@ -5536,11 +5536,11 @@ }, "nixpkgs_37": { "locked": { - "lastModified": 1724098845, - "narHash": "sha256-D5HwjQw/02fuXbR4LCTo64koglP2j99hkDR79/3yLOE=", + "lastModified": 1725407940, + "narHash": "sha256-tiN5Rlg/jiY0tyky+soJZoRzLKbPyIdlQ77xVgREDNM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f1bad50880bae73ff2d82fafc22010b4fc097a9c", + "rev": "6f6c45b5134a8ee2e465164811e451dcb5ad86e3", "type": "github" }, "original": { From 982d47bf94d0c3d97989dfd55d0ad60f56e6d888 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Sun, 8 Sep 2024 23:35:21 +1000 Subject: [PATCH 35/47] chore(dhu): disable until buld issues are resolved --- outputs.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/outputs.nix b/outputs.nix index 0d68ca4..e49f959 100644 --- a/outputs.nix +++ b/outputs.nix @@ -69,12 +69,12 @@ in { ragenix.nixosModules.default ]; }; - dhu = { - imports = [ - hosts/dhu - ragenix.nixosModules.default - ]; - }; + #dhu = { + # imports = [ + # hosts/dhu + # ragenix.nixosModules.default + # ]; + #}; dionach = { imports = [ hosts/dionach From 8b553e632a5069228d19d84a5229daec61772262 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Mon, 9 Sep 2024 00:30:13 +1000 Subject: [PATCH 36/47] chore(ceitidh): move deployment to outputs Also add to active tag --- hosts/ceitidh/default.nix | 4 +--- outputs.nix | 5 +++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hosts/ceitidh/default.nix b/hosts/ceitidh/default.nix index de2fd9d..4441c6e 100644 --- a/hosts/ceitidh/default.nix +++ b/hosts/ceitidh/default.nix @@ -7,11 +7,9 @@ }: { imports = [ ../../networks/pi3B_rack.nix - ../../profiles/cyclone-ibis.nix + #../../profiles/cyclone-ibis.nix ]; - # Comment out deployment when building the SD Image. - deployment.targetHost = "10.42.0.203"; networking.hostName = "ceitidh"; # Define your hostname. environment.systemPackages = with pkgs; [ diff --git a/outputs.nix b/outputs.nix index e49f959..8b6b543 100644 --- a/outputs.nix +++ b/outputs.nix @@ -38,6 +38,7 @@ in { defaults = { _module.args.inputs = inputs; }; + # Comment out deployment line when building the SD Image. airgead = { imports = [ hosts/airgead @@ -62,6 +63,10 @@ in { hosts/ceitidh ragenix.nixosModules.default ]; + deployment = { + tags = ["active"]; + targetHost = "10.42.0.203"; + }; }; cuallaidh = { imports = [ From d9d4e7645599da812fc270ec114e99a821a632e7 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Mon, 9 Sep 2024 08:16:39 +1000 Subject: [PATCH 37/47] chore(cuallaidh): disable broken services --- hosts/cuallaidh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/cuallaidh/default.nix b/hosts/cuallaidh/default.nix index 88e0bc1..2b5c758 100644 --- a/hosts/cuallaidh/default.nix +++ b/hosts/cuallaidh/default.nix @@ -13,8 +13,8 @@ ../../profiles/ipv6.nix ../../profiles/mastodon.nix ../../profiles/matrix.nix - ../../profiles/mcwhirter.io.nix - ../../profiles/minecraftServer.nix + #../../profiles/mcwhirter.io.nix + #../../profiles/minecraftServer.nix ../../profiles/nextcloud.nix ../../profiles/nixpkgs-dev.nix ../../profiles/taskserver.nix From d669f8be0c8bd04e0c925158b7897d1bfb1790c7 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Mon, 9 Sep 2024 08:18:26 +1000 Subject: [PATCH 38/47] chore(paidh-uachdar): disable temporarily --- hosts/paidh-uachdar/default.nix | 2 +- outputs.nix | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hosts/paidh-uachdar/default.nix b/hosts/paidh-uachdar/default.nix index 89e9601..7c792e9 100644 --- a/hosts/paidh-uachdar/default.nix +++ b/hosts/paidh-uachdar/default.nix @@ -11,7 +11,7 @@ ../../profiles/openssh.nix ../../profiles/pi_common.nix ../../profiles/users-ops.nix # MIO Ops users - ../../secrets/wireless.nix # Hey look! A squirrel! + #../../secrets/wireless.nix # Hey look! A squirrel! ]; # Comment out deployment when building the SD Image. diff --git a/outputs.nix b/outputs.nix index 8b6b543..d752db1 100644 --- a/outputs.nix +++ b/outputs.nix @@ -104,12 +104,12 @@ in { ragenix.nixosModules.default ]; }; - paidh-uachdar = { - imports = [ - hosts/paidh-uachdar - ragenix.nixosModules.default - ]; - }; + #paidh-uachdar = { + # imports = [ + # hosts/paidh-uachdar + # ragenix.nixosModules.default + # ]; + #}; sanganto = { imports = [ hosts/sanganto From e23d0389f012811990a5f2bb1d203418840e6d7f Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Mon, 9 Sep 2024 16:02:02 +1000 Subject: [PATCH 39/47] chore(brighde): add active tag --- hosts/airgead/default.nix | 2 -- outputs.nix | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hosts/airgead/default.nix b/hosts/airgead/default.nix index dc9f6e4..39d9a76 100644 --- a/hosts/airgead/default.nix +++ b/hosts/airgead/default.nix @@ -11,8 +11,6 @@ ../../profiles/cardano-node.nix ]; - deployment.targetHost = "172.105.187.96"; - networking.hostName = "airgead"; # Define your hostname. system.stateVersion = "20.03"; # The version of NixOS originally installed diff --git a/outputs.nix b/outputs.nix index d752db1..f7b7ea4 100644 --- a/outputs.nix +++ b/outputs.nix @@ -45,6 +45,10 @@ in { cardano-node.nixosModules.cardano-node ragenix.nixosModules.default ]; + deployment = { + tags = ["active"]; + targetHost = "172.105.187.96"; + }; }; brighde = { imports = [ From 7ecb06ba14e6b41c1bbf6cf2a7676429948fecfb Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Mon, 9 Sep 2024 16:04:52 +1000 Subject: [PATCH 40/47] chore(brighde): add active tag --- hosts/brighde/default.nix | 1 - outputs.nix | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hosts/brighde/default.nix b/hosts/brighde/default.nix index a9b990a..67bb417 100644 --- a/hosts/brighde/default.nix +++ b/hosts/brighde/default.nix @@ -16,7 +16,6 @@ efi.canTouchEfiVariables = true; }; - deployment.targetHost = "10.42.0.124"; networking.hostName = "brighde"; # A poetess, sage, woman of wisdom, healing system.stateVersion = "22.05"; # The version of NixOS originally installed diff --git a/outputs.nix b/outputs.nix index f7b7ea4..97cf022 100644 --- a/outputs.nix +++ b/outputs.nix @@ -55,6 +55,10 @@ in { hosts/brighde ragenix.nixosModules.default ]; + deployment = { + tags = ["active"]; + targetHost = "10.42.0.124"; + }; }; ceilidh = { imports = [ From c05590435ea4866806777c96c41907b81bd14af4 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Mon, 9 Sep 2024 16:09:26 +1000 Subject: [PATCH 41/47] chore(cuallaidh): add active tag --- hosts/cuallaidh/default.nix | 2 -- outputs.nix | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hosts/cuallaidh/default.nix b/hosts/cuallaidh/default.nix index 2b5c758..c720b32 100644 --- a/hosts/cuallaidh/default.nix +++ b/hosts/cuallaidh/default.nix @@ -21,8 +21,6 @@ ../../profiles/tt-rss.nix ]; - deployment.targetHost = "172.105.171.16"; - networking.hostName = "cuallaidh"; # Define your hostname. networking.interfaces.eth0.ipv6.addresses = [ { diff --git a/outputs.nix b/outputs.nix index 97cf022..a9cebc1 100644 --- a/outputs.nix +++ b/outputs.nix @@ -81,6 +81,10 @@ in { hosts/cuallaidh ragenix.nixosModules.default ]; + deployment = { + tags = ["active"]; + targetHost = "172.105.171.16"; + }; }; #dhu = { # imports = [ From 86fc97845a8d8289bdecbd302a97cc8c030543db Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Mon, 9 Sep 2024 16:11:27 +1000 Subject: [PATCH 42/47] chore(dionach): add active tag --- hosts/dionach/default.nix | 2 -- outputs.nix | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hosts/dionach/default.nix b/hosts/dionach/default.nix index 570c0ff..ef2ba11 100644 --- a/hosts/dionach/default.nix +++ b/hosts/dionach/default.nix @@ -10,8 +10,6 @@ ../../profiles/steam.nix ]; - deployment.targetHost = "10.42.0.190"; - # Use the GRUB 2 boot loader. boot = { loader.grub = { diff --git a/outputs.nix b/outputs.nix index a9cebc1..0b7d179 100644 --- a/outputs.nix +++ b/outputs.nix @@ -97,6 +97,10 @@ in { hosts/dionach ragenix.nixosModules.default ]; + deployment = { + tags = ["active"]; + targetHost = "10.42.0.190"; + }; }; doilidh = { imports = [ From ca0c82fc49c9b2ab8530aa0be4433fe472db2b9c Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Mon, 9 Sep 2024 16:15:51 +1000 Subject: [PATCH 43/47] chore(doilidh): add active tag --- hosts/doilidh/default.nix | 2 -- outputs.nix | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hosts/doilidh/default.nix b/hosts/doilidh/default.nix index afb6ed0..4e43e9e 100644 --- a/hosts/doilidh/default.nix +++ b/hosts/doilidh/default.nix @@ -7,8 +7,6 @@ }: { imports = [../../networks/pi3B_rack.nix]; - # Comment out deployment when building the SD Image. - deployment.targetHost = "10.42.0.204"; networking.hostName = "doilidh"; # Define your hostname. environment.systemPackages = with pkgs; []; diff --git a/outputs.nix b/outputs.nix index 0b7d179..a910dae 100644 --- a/outputs.nix +++ b/outputs.nix @@ -107,6 +107,10 @@ in { hosts/doilidh ragenix.nixosModules.default ]; + deployment = { + tags = ["active"]; + targetHost = "10.42.0.204"; + }; }; eamhair = { imports = [ From f221d1c55d91c74717bc7bf659b06d2500d9cbae Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Mon, 9 Sep 2024 16:18:53 +1000 Subject: [PATCH 44/47] chore(eamhair): add active tag --- hosts/eamhair/default.nix | 2 -- outputs.nix | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hosts/eamhair/default.nix b/hosts/eamhair/default.nix index 7d86e98..5b21fb0 100644 --- a/hosts/eamhair/default.nix +++ b/hosts/eamhair/default.nix @@ -7,8 +7,6 @@ }: { imports = [../../networks/pi3B_rack.nix]; - # Comment out deployment when building the SD Image. - deployment.targetHost = "10.42.0.205"; networking.hostName = "eamhair"; # Define your hostname. environment.systemPackages = with pkgs; []; diff --git a/outputs.nix b/outputs.nix index a910dae..9272db0 100644 --- a/outputs.nix +++ b/outputs.nix @@ -117,6 +117,10 @@ in { hosts/eamhair ragenix.nixosModules.default ]; + deployment = { + tags = ["active"]; + targetHost = "10.42.0.205"; + }; }; iolear-beag = { imports = [ From 3c4e886095591b8b4cd2ddd479fa6964e49a1f5d Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Mon, 9 Sep 2024 16:22:26 +1000 Subject: [PATCH 45/47] chore(iolear-beag): add active tag --- hosts/iolear-beag/default.nix | 1 - outputs.nix | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hosts/iolear-beag/default.nix b/hosts/iolear-beag/default.nix index 9a40049..43ff396 100644 --- a/hosts/iolear-beag/default.nix +++ b/hosts/iolear-beag/default.nix @@ -14,7 +14,6 @@ boot.loader.grub.enable = true; boot.loader.grub.device = "/dev/sda"; - deployment.targetHost = "10.42.0.127"; networking.hostName = "iolear-beag"; # Define your hostname. system.stateVersion = "18.09"; # The version of NixOS originally installed diff --git a/outputs.nix b/outputs.nix index 9272db0..dd4aca7 100644 --- a/outputs.nix +++ b/outputs.nix @@ -127,6 +127,10 @@ in { hosts/iolear-beag ragenix.nixosModules.default ]; + deployment = { + tags = ["inactive"]; + targetHost = "10.42.0.127"; + }; }; #paidh-uachdar = { # imports = [ From f74f1e63bfdba85833b8b06db55d195e960d4556 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Mon, 9 Sep 2024 16:29:08 +1000 Subject: [PATCH 46/47] chore(sithlainnir): add inactive tag --- hosts/sithlainnir/default.nix | 1 - outputs.nix | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hosts/sithlainnir/default.nix b/hosts/sithlainnir/default.nix index db2c09c..4d200a1 100644 --- a/hosts/sithlainnir/default.nix +++ b/hosts/sithlainnir/default.nix @@ -14,7 +14,6 @@ boot.loader.grub.enable = true; boot.loader.grub.device = "/dev/sda"; - deployment.targetHost = "10.42.0.114"; networking.hostName = "sithlainnir"; # Define your hostname. system.stateVersion = "18.09"; # The version of NixOS originally installed diff --git a/outputs.nix b/outputs.nix index dd4aca7..465d422 100644 --- a/outputs.nix +++ b/outputs.nix @@ -155,6 +155,10 @@ in { hosts/sithlainnir ragenix.nixosModules.default ]; + deployment = { + tags = ["inactive"]; + targetHost = "10.42.0.114"; + }; }; teintidh = { imports = [ From f4680c204eec59b696d30109e0f36e79c0be1f17 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Mon, 9 Sep 2024 16:35:08 +1000 Subject: [PATCH 47/47] chore(teintidh): add inactive tag --- hosts/teintidh/default.nix | 1 - outputs.nix | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hosts/teintidh/default.nix b/hosts/teintidh/default.nix index 7ee6e12..00d38d7 100644 --- a/hosts/teintidh/default.nix +++ b/hosts/teintidh/default.nix @@ -15,7 +15,6 @@ boot.loader.grub.enable = true; boot.loader.grub.device = "/dev/sda"; - deployment.targetHost = "10.42.0.127"; networking.hostName = "teintidh"; # Define your hostname. system.stateVersion = "18.09"; # The version of NixOS originally installed diff --git a/outputs.nix b/outputs.nix index 465d422..2236f76 100644 --- a/outputs.nix +++ b/outputs.nix @@ -165,6 +165,10 @@ in { hosts/teintidh ragenix.nixosModules.default ]; + deployment = { + tags = ["inactive"]; + targetHost = "10.42.0.127"; + }; }; }; }