diff --git a/.envrc b/.envrc index 2d8e9fb7..2f734f13 100644 --- a/.envrc +++ b/.envrc @@ -6,5 +6,5 @@ [ -f .envrc.local ] && source_env .envrc.local DEVSHELL_TARGET=${DEVSHELL_TARGET:-default} -. "$(nix eval .#__std.direnv_lib)" +. "$(nix eval --no-write-lock-file --no-update-lock-file .#__std.direnv_lib)" use std nix "//automation/devshells:${DEVSHELL_TARGET}" diff --git a/.gitignore b/.gitignore index ce1c63f5..b6b1487c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ .std # nixos/nix +flake.lock result* # cargo diff --git a/flake.nix b/flake.nix index a88f8584..c232164c 100644 --- a/flake.nix +++ b/flake.nix @@ -1,61 +1,37 @@ { description = "Flake containing Bitte clusters"; - inputs.std.url = "github:divnix/std"; - # 21.11 doesn't yet fullfill all contracts that std consumes - # inputs.std.inputs.nixpkgs.follows = "nixpkgs"; - inputs.n2c.url = "github:nlewo/nix2container"; - inputs.data-merge.url = "github:divnix/data-merge"; - inputs.capsules.url = "github:input-output-hk/devshell-capsules"; - inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-21.11"; - nixpkgs-docker.url = "github:nixos/nixpkgs/ff691ed9ba21528c1b4e034f36a04027e4522c58"; - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - - nix.url = "github:nixos/nix/2.8.1"; - agenix.url = "github:ryantm/agenix"; - agenix-cli.url = "github:cole-h/agenix-cli"; - ragenix.url = "github:yaxitech/ragenix"; - deploy.url = "github:input-output-hk/deploy-rs"; - - terranix.url = "github:terranix/terranix"; - terranix.inputs.nixpkgs.follows = "blank"; - - utils.url = "github:numtide/flake-utils"; - blank.url = "github:divnix/blank"; - - nomad-driver-nix.url = "github:input-output-hk/nomad-driver-nix"; - - # Vector >= 0.20.0 versions require nomad-follower watch-config format fix - nomad-follower.url = "github:input-output-hk/nomad-follower"; - fenix = { - url = "github:nix-community/fenix"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; - }; + # --- Public Inputs -------- + # intended to defer locking to the consumer + inputs = { + nixpkgs.url = "nixos-21_11"; + nixpkgs-unstable.url = "nixpkgs-unstable"; + nix.url = "nix-2_10"; ops-lib = { - url = "github:input-output-hk/ops-lib"; + url = "ops-lib"; flake = false; }; - - # DEPRECATED: will be replaces by cicero soon - hydra.url = "github:kreisys/hydra/hydra-server-includes"; - hydra.inputs.nix.follows = "nix"; - hydra.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = { self, - hydra, nixpkgs, nixpkgs-unstable, - utils, - deploy, - ragenix, nix, - fenix, ... - } @ inputs: + } @ pub: let + inherit (inputs) std utils; + + priv = (import ./lib/call-flake.nix) { + type = "path"; + path = ./private; + # needs to be updated any time private inputs are touched + narHash = "sha256-WpyvDOGanWmgh1bk/KF8L0SL/wkJq9oB6aswlIDtNRs="; + } {}; + + inputs = priv.inputs // pub; + in inputs.std.growOn { inherit inputs; cellsFrom = ./nix; @@ -86,10 +62,8 @@ # soil -- TODO: remove soil (let overlays = [ - fenix.overlay - nix.overlay - hydra.overlay - deploy.overlay + inputs.hydra.overlay + # inputs.deploy.overlay localPkgsOverlay terraformProvidersOverlay (_: prev: {inherit (self.packages."${prev.system}") bitte;}) @@ -171,4 +145,17 @@ nixosModule.imports = builtins.attrValues self.nixosModules; devshellModule = import ./devshellModule.nix; }); + + nixConfig = { + flake-registry = "https://raw.githubusercontent.com/input-output-hk/flake-registry/iog/flake-registry.json"; + + extra-substituters = [ + "https://nix-community.cachix.org" + "https://cache.iog.io" + ]; + extra-trusted-public-keys = [ + "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + ]; + }; } diff --git a/lib/call-flake.nix b/lib/call-flake.nix new file mode 100644 index 00000000..f55cafff --- /dev/null +++ b/lib/call-flake.nix @@ -0,0 +1,17 @@ +let + url = "https://raw.githubusercontent.com/NixOS/nix/0c62b4ad0f80d2801a7e7caabf20cc8e50182540/src/libexpr/flake/call-flake.nix"; + callFlake = import (builtins.fetchurl { + inherit url; + sha256 = "sha256:1dmi01s1g3mnvb098iik3w38fxmkwg1q1ajk7mwk83kc5z13v2r7"; + }); +in + # flake can either be a flake ref expressed as an attribute set or a path to source tree + flake: { + # subdir of source root containing the flake.nix + dir ? "", + }: let + src = builtins.fetchTree flake; + in + if dir == "" + then callFlake (builtins.readFile "${src}/flake.lock") src dir + else callFlake (builtins.readFile "${src}/${dir}/flake.lock") src dir diff --git a/lib/default.nix b/lib/default.nix index bed4c1e1..38982ffd 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -5,6 +5,7 @@ inherit (inputs) nixpkgs deploy; bitte = inputs.self; in rec { + callFlake = scopedImport {inherit (inputs) nix;} ./call-flake.nix; terralib = import ./terralib.nix {inherit lib nixpkgs;}; warningsModule = import ./warnings.nix; @@ -19,7 +20,10 @@ in rec { mkBitteStack = import ./mk-bitte-stack.nix {inherit mkCluster mkDeploy lib nixpkgs bitte;}; mkDeploy = import ./mk-deploy.nix {inherit deploy lib;}; - mkSystem = import ./mk-system.nix {inherit nixpkgs bitte;}; + mkSystem = import ./mk-system.nix { + inherit nixpkgs bitte; + priv = inputs; + }; mkVaultResources = kv.mkVaultResources; mkConsulResources = kv.mkConsulResources; diff --git a/lib/mk-system.nix b/lib/mk-system.nix index 7046a385..96af120b 100644 --- a/lib/mk-system.nix +++ b/lib/mk-system.nix @@ -1,6 +1,7 @@ { nixpkgs, bitte, + priv, }: { pkgs, # Different mkSystem service levels: @@ -26,7 +27,7 @@ ++ modules; specialArgs = { inherit nodeName self inputs; - inherit (bitte.inputs) terranix nomad-driver-nix nomad-follower; + inherit (priv) terranix nomad-driver-nix nomad-follower; bittelib = bitte.lib; inherit (bitte.lib) terralib; }; diff --git a/nix/automation/devshells.nix b/nix/automation/devshells.nix index d139cfaf..b2e6c8e5 100644 --- a/nix/automation/devshells.nix +++ b/nix/automation/devshells.nix @@ -30,7 +30,6 @@ in { capsules.base capsules.tools capsules.integrations - capsules.hooks ]; }; cli = std.lib.mkShell { diff --git a/overlay.nix b/overlay.nix index 20c413fe..de8fc5e3 100644 --- a/overlay.nix +++ b/overlay.nix @@ -12,6 +12,7 @@ in rec { nixFlakes = nixUnstable; nixUnstable = builtins.throw "use pkgs.nix directly"; + inherit (inputs.nix.packages.${prev.system}) nix; # Packages specifically needing an unstable nixpkgs pinned latest available version inherit diff --git a/flake.lock b/private/flake.lock similarity index 69% rename from flake.lock rename to private/flake.lock index 514ff75d..55209dbd 100644 --- a/flake.lock +++ b/private/flake.lock @@ -5,17 +5,16 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1641576265, - "narHash": "sha256-G4W39k5hdu2kS13pi/RhyTOySAo7rmrs7yMUZRH0OZI=", + "lastModified": 1652712410, + "narHash": "sha256-hMJ2TqLt0DleEnQFGUHK9sV2aAzJPU8pZeiZoqRozbE=", "owner": "ryantm", "repo": "agenix", - "rev": "08b9c96878b2f9974fc8bde048273265ad632357", + "rev": "7e5e58b98c3dcbf497543ff6f22591552ebfe65b", "type": "github" }, "original": { - "owner": "ryantm", - "repo": "agenix", - "type": "github" + "id": "agenix", + "type": "indirect" } }, "agenix-cli": { @@ -56,6 +55,25 @@ "type": "github" } }, + "agenix-cli_3": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1641404293, + "narHash": "sha256-0+QVY1sDhGF4hAN6m2FdKZgm9V1cuGGjY4aitRBnvKg=", + "owner": "cole-h", + "repo": "agenix-cli", + "rev": "77fccec4ed922a0f5f55ed964022b0db7d99f07d", + "type": "github" + }, + "original": { + "owner": "cole-h", + "repo": "agenix-cli", + "type": "github" + } + }, "agenix_2": { "inputs": { "nixpkgs": "nixpkgs_3" @@ -75,8 +93,28 @@ } }, "agenix_3": { + "inputs": { + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1641576265, + "narHash": "sha256-G4W39k5hdu2kS13pi/RhyTOySAo7rmrs7yMUZRH0OZI=", + "owner": "ryantm", + "repo": "agenix", + "rev": "08b9c96878b2f9974fc8bde048273265ad632357", + "type": "github" + }, + "original": { + "owner": "ryantm", + "repo": "agenix", + "type": "github" + } + }, + "agenix_4": { "inputs": { "nixpkgs": [ + "capsules", + "bitte", "capsules", "bitte", "ragenix", @@ -97,9 +135,11 @@ "type": "github" } }, - "agenix_4": { + "agenix_5": { "inputs": { "nixpkgs": [ + "capsules", + "bitte", "capsules", "ragenix", "nixpkgs" @@ -119,9 +159,11 @@ "type": "github" } }, - "agenix_5": { + "agenix_6": { "inputs": { "nixpkgs": [ + "capsules", + "bitte", "ragenix", "nixpkgs" ] @@ -140,6 +182,49 @@ "type": "github" } }, + "agenix_7": { + "inputs": { + "nixpkgs": [ + "capsules", + "ragenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1652712410, + "narHash": "sha256-hMJ2TqLt0DleEnQFGUHK9sV2aAzJPU8pZeiZoqRozbE=", + "owner": "ryantm", + "repo": "agenix", + "rev": "7e5e58b98c3dcbf497543ff6f22591552ebfe65b", + "type": "github" + }, + "original": { + "owner": "ryantm", + "repo": "agenix", + "type": "github" + } + }, + "agenix_8": { + "inputs": { + "nixpkgs": [ + "ragenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1652712410, + "narHash": "sha256-hMJ2TqLt0DleEnQFGUHK9sV2aAzJPU8pZeiZoqRozbE=", + "owner": "ryantm", + "repo": "agenix", + "rev": "7e5e58b98c3dcbf497543ff6f22591552ebfe65b", + "type": "github" + }, + "original": { + "owner": "ryantm", + "repo": "agenix", + "type": "github" + } + }, "bats-assert": { "flake": false, "locked": { @@ -172,6 +257,22 @@ "type": "github" } }, + "bats-assert_3": { + "flake": false, + "locked": { + "lastModified": 1636059754, + "narHash": "sha256-ewME0l27ZqfmAwJO4h5biTALc9bDLv7Bl3ftBzBuZwk=", + "owner": "bats-core", + "repo": "bats-assert", + "rev": "34551b1d7f8c7b677c1a66fc0ac140d6223409e5", + "type": "github" + }, + "original": { + "owner": "bats-core", + "repo": "bats-assert", + "type": "github" + } + }, "bats-support": { "flake": false, "locked": { @@ -204,16 +305,69 @@ "type": "github" } }, + "bats-support_3": { + "flake": false, + "locked": { + "lastModified": 1548869839, + "narHash": "sha256-Gr4ntadr42F2Ks8Pte2D4wNDbijhujuoJi4OPZnTAZU=", + "owner": "bats-core", + "repo": "bats-support", + "rev": "d140a65044b2d6810381935ae7f0c94c7023c8c3", + "type": "github" + }, + "original": { + "owner": "bats-core", + "repo": "bats-support", + "type": "github" + } + }, "bitte": { "inputs": { "agenix": "agenix_2", "agenix-cli": "agenix-cli_2", + "blank": "blank", + "capsules": "capsules_2", + "data-merge": "data-merge", + "deploy": "deploy_2", + "fenix": "fenix_4", + "hydra": "hydra_2", + "n2c": "n2c", + "nix": "nix_4", + "nixpkgs": "nixpkgs_23", + "nixpkgs-docker": "nixpkgs-docker", + "nixpkgs-unstable": "nixpkgs-unstable_2", + "nomad-driver-nix": "nomad-driver-nix_2", + "nomad-follower": "nomad-follower_2", + "ops-lib": "ops-lib_2", + "ragenix": "ragenix_3", + "std": "std", + "terranix": "terranix_2", + "utils": "utils_10" + }, + "locked": { + "lastModified": 1661533230, + "narHash": "sha256-RyXQxSlAq4yWcHtEg6Qhm2BiATQsmd7vFi6sp8JQDAI=", + "owner": "input-output-hk", + "repo": "bitte", + "rev": "879f07a5368e6421b5e8a221cbc56566482f2a2a", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "bitte", + "type": "github" + } + }, + "bitte_2": { + "inputs": { + "agenix": "agenix_3", + "agenix-cli": "agenix-cli_3", "blank": "blank_2", "deploy": "deploy", "fenix": "fenix_2", "hydra": "hydra", "nix": "nix", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_9", "nixpkgs-unstable": "nixpkgs-unstable", "nomad": "nomad", "nomad-driver-nix": "nomad-driver-nix", @@ -271,8 +425,28 @@ "capsules": { "inputs": { "bitte": "bitte", + "iogo": "iogo_2", + "nixpkgs": "nixpkgs_30", + "ragenix": "ragenix_4" + }, + "locked": { + "lastModified": 1659466315, + "narHash": "sha256-VqR1PaC7lb4uT/s38lDNYvwhF2yQuD13KwGBoMCxF4g=", + "owner": "input-output-hk", + "repo": "devshell-capsules", + "rev": "125b8665c6139e3a127d243534a4f0ce36e3a335", + "type": "github" + }, + "original": { + "id": "capsules", + "type": "indirect" + } + }, + "capsules_2": { + "inputs": { + "bitte": "bitte_2", "iogo": "iogo", - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_17", "ragenix": "ragenix_2" }, "locked": { @@ -313,6 +487,8 @@ "fenix": "fenix", "flake-compat": "flake-compat", "nixpkgs": [ + "capsules", + "bitte", "capsules", "bitte", "deploy", @@ -340,6 +516,8 @@ "fenix": "fenix_3", "flake-compat": "flake-compat_2", "nixpkgs": [ + "capsules", + "bitte", "deploy", "fenix", "nixpkgs" @@ -360,6 +538,29 @@ "type": "github" } }, + "deploy_3": { + "inputs": { + "fenix": [ + "fenix" + ], + "flake-compat": "flake-compat_3", + "nixpkgs": "nixpkgs_32", + "utils": "utils_12" + }, + "locked": { + "lastModified": 1661212356, + "narHash": "sha256-+9P849WIb/zhAMWXrW9g0IRd7vFRj5a5acLTtOFyY48=", + "owner": "input-output-hk", + "repo": "deploy-rs", + "rev": "4da8eb9fc3e611adf4bbe8c8df5b1fc604c4f906", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "deploy-rs", + "type": "github" + } + }, "devshell": { "locked": { "lastModified": 1632436039, @@ -436,6 +637,60 @@ } }, "devshell_6": { + "inputs": { + "flake-utils": "flake-utils_9", + "nixpkgs": [ + "capsules", + "bitte", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1650900878, + "narHash": "sha256-qhNncMBSa9STnhiLfELEQpYC1L4GrYHNIzyCZ/pilsI=", + "owner": "numtide", + "repo": "devshell", + "rev": "d97df53b5ddaa1cfbea7cddbd207eb2634304733", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "devshell_7": { + "locked": { + "lastModified": 1637098489, + "narHash": "sha256-IWBYLSNSENI/fTrXdYDhuCavxcgN9+RERrPM81f6DXY=", + "owner": "numtide", + "repo": "devshell", + "rev": "e8c2d4967b5c498b12551d1bb49352dcf9efa3e4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "devshell_8": { + "locked": { + "lastModified": 1632436039, + "narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=", + "owner": "numtide", + "repo": "devshell", + "rev": "7a7a7aa0adebe5488e5abaec688fd9ae0f8ea9c6", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "devshell_9": { "inputs": { "flake-utils": [ "std", @@ -487,7 +742,7 @@ }, "fenix": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_7", "rust-analyzer-src": "rust-analyzer-src" }, "locked": { @@ -507,6 +762,8 @@ "fenix_2": { "inputs": { "nixpkgs": [ + "capsules", + "bitte", "capsules", "bitte", "nixpkgs-unstable" @@ -529,7 +786,7 @@ }, "fenix_3": { "inputs": { - "nixpkgs": "nixpkgs_18", + "nixpkgs": "nixpkgs_20", "rust-analyzer-src": "rust-analyzer-src_3" }, "locked": { @@ -549,6 +806,8 @@ "fenix_4": { "inputs": { "nixpkgs": [ + "capsules", + "bitte", "nixpkgs-unstable" ], "rust-analyzer-src": "rust-analyzer-src_4" @@ -567,6 +826,24 @@ "type": "github" } }, + "fenix_5": { + "inputs": { + "nixpkgs": "nixpkgs_33", + "rust-analyzer-src": "rust-analyzer-src_5" + }, + "locked": { + "lastModified": 1661496076, + "narHash": "sha256-rnnDAGYlbOAVBd+dIEaY81PsNdm1EnKAfEON+gtR3wM=", + "owner": "nix-community", + "repo": "fenix", + "rev": "b5cae8a0efb6b02c1874f4d278c87291804199af", + "type": "github" + }, + "original": { + "id": "fenix", + "type": "indirect" + } + }, "flake-compat": { "flake": false, "locked": { @@ -599,13 +876,104 @@ "type": "github" } }, - "flake-utils": { + "flake-compat_3": { + "flake": false, "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "lastModified": 1627913399, + "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "locked": { + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_10": { + "locked": { + "lastModified": 1634851050, + "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_11": { + "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_12": { + "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_13": { + "locked": { + "lastModified": 1656928814, + "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_14": { + "locked": { + "lastModified": 1634851050, + "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", "type": "github" }, "original": { @@ -646,11 +1014,11 @@ }, "flake-utils_4": { "locked": { - "lastModified": 1634851050, - "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "type": "github" }, "original": { @@ -661,11 +1029,11 @@ }, "flake-utils_5": { "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "lastModified": 1634851050, + "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", "owner": "numtide", "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", "type": "github" }, "original": { @@ -676,11 +1044,11 @@ }, "flake-utils_6": { "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "owner": "numtide", "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "type": "github" }, "original": { @@ -706,11 +1074,11 @@ }, "flake-utils_8": { "locked": { - "lastModified": 1656928814, - "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", "owner": "numtide", "repo": "flake-utils", - "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "type": "github" }, "original": { @@ -721,11 +1089,11 @@ }, "flake-utils_9": { "locked": { - "lastModified": 1634851050, - "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", + "lastModified": 1642700792, + "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", "owner": "numtide", "repo": "flake-utils", - "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", + "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", "type": "github" }, "original": { @@ -737,11 +1105,15 @@ "hydra": { "inputs": { "nix": [ + "capsules", + "bitte", "capsules", "bitte", "nix" ], "nixpkgs": [ + "capsules", + "bitte", "capsules", "bitte", "nixpkgs" @@ -765,9 +1137,37 @@ "hydra_2": { "inputs": { "nix": [ + "capsules", + "bitte", "nix" ], "nixpkgs": [ + "capsules", + "bitte", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1631062883, + "narHash": "sha256-JZ6/gjHyX50fHCYpXy/FrX9C0e9k8X9In5Jb/SQYlT8=", + "owner": "kreisys", + "repo": "hydra", + "rev": "785326948be4b1cc2ce77435c806521565e9af45", + "type": "github" + }, + "original": { + "owner": "kreisys", + "ref": "hydra-server-includes", + "repo": "hydra", + "type": "github" + } + }, + "hydra_3": { + "inputs": { + "nix": "nix_6", + "nixpkgs": [ + "hydra", + "nix", "nixpkgs" ] }, @@ -876,11 +1276,47 @@ "type": "github" } }, + "inclusive_6": { + "inputs": { + "stdlib": "stdlib_6" + }, + "locked": { + "lastModified": 1628098927, + "narHash": "sha256-Ft4sdf7VPL8MQtu18AAPiN2s5pUsbv+3RxqzJSa/yzg=", + "owner": "input-output-hk", + "repo": "nix-inclusive", + "rev": "13123eb7a8c3359738a4756b8d645729e8655b27", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "nix-inclusive", + "type": "github" + } + }, + "inclusive_7": { + "inputs": { + "stdlib": "stdlib_7" + }, + "locked": { + "lastModified": 1628098927, + "narHash": "sha256-Ft4sdf7VPL8MQtu18AAPiN2s5pUsbv+3RxqzJSa/yzg=", + "owner": "input-output-hk", + "repo": "nix-inclusive", + "rev": "13123eb7a8c3359738a4756b8d645729e8655b27", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "nix-inclusive", + "type": "github" + } + }, "iogo": { "inputs": { "devshell": "devshell_3", "inclusive": "inclusive_3", - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_16", "utils": "utils_6" }, "locked": { @@ -897,6 +1333,27 @@ "type": "github" } }, + "iogo_2": { + "inputs": { + "devshell": "devshell_7", + "inclusive": "inclusive_6", + "nixpkgs": "nixpkgs_29", + "utils": "utils_11" + }, + "locked": { + "lastModified": 1658302707, + "narHash": "sha256-E0FA1CEMQlfAsmtLBRoQE7IY4ItKlBdxZ44YX0tK5Hg=", + "owner": "input-output-hk", + "repo": "bitte-iogo", + "rev": "8751660009202bc95ea3a29e304c393c140a4231", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "bitte-iogo", + "type": "github" + } + }, "lowdown-src": { "flake": false, "locked": { @@ -977,6 +1434,39 @@ "type": "github" } }, + "lowdown-src_6": { + "flake": false, + "locked": { + "lastModified": 1617481909, + "narHash": "sha256-SqnfOFuLuVRRNeVJr1yeEPJue/qWoCp5N6o5Kr///p4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "148f9b2f586c41b7e36e73009db43ea68c7a1a4d", + "type": "github" + }, + "original": { + "owner": "kristapsdz", + "ref": "VERSION_0_8_4", + "repo": "lowdown", + "type": "github" + } + }, + "lowdown-src_7": { + "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": { @@ -995,8 +1485,8 @@ }, "n2c": { "inputs": { - "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_19" + "flake-utils": "flake-utils_7", + "nixpkgs": "nixpkgs_21" }, "locked": { "lastModified": 1650568002, @@ -1015,7 +1505,7 @@ "nix": { "inputs": { "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_8", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { @@ -1036,7 +1526,7 @@ "nix_2": { "inputs": { "lowdown-src": "lowdown-src_2", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1604400356, @@ -1055,7 +1545,7 @@ "nix_3": { "inputs": { "lowdown-src": "lowdown-src_3", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_12", "nixpkgs-regression": "nixpkgs-regression_2" }, "locked": { @@ -1075,7 +1565,7 @@ "nix_4": { "inputs": { "lowdown-src": "lowdown-src_4", - "nixpkgs": "nixpkgs_20", + "nixpkgs": "nixpkgs_22", "nixpkgs-regression": "nixpkgs-regression_3" }, "locked": { @@ -1096,7 +1586,7 @@ "nix_5": { "inputs": { "lowdown-src": "lowdown-src_5", - "nixpkgs": "nixpkgs_22", + "nixpkgs": "nixpkgs_24", "nixpkgs-regression": "nixpkgs-regression_4" }, "locked": { @@ -1113,6 +1603,45 @@ "type": "github" } }, + "nix_6": { + "inputs": { + "lowdown-src": "lowdown-src_6", + "nixpkgs": "nixpkgs_34" + }, + "locked": { + "lastModified": 1631008103, + "narHash": "sha256-LBWrS3qB9+5yQLpnh77b9sXilldsfDAXVYlj2m1lyI4=", + "owner": "NixOS", + "repo": "nix", + "rev": "6678e98411cd3bfe8143a4ba1b35d1451babce32", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nix", + "type": "github" + } + }, + "nix_7": { + "inputs": { + "lowdown-src": "lowdown-src_7", + "nixpkgs": "nixpkgs_35", + "nixpkgs-regression": "nixpkgs-regression_5" + }, + "locked": { + "lastModified": 1645189081, + "narHash": "sha256-yZA+07JTG9Z610DceiYyzm+C08yHhcIgfl/Cp7lY3ho=", + "owner": "nixos", + "repo": "nix", + "rev": "9bc03adbba5334663901c1136203bc07e4776be9", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nix", + "type": "github" + } + }, "nixago": { "inputs": { "flake-utils": [ @@ -1171,16 +1700,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1627969475, - "narHash": "sha256-MhVtkVt1MFfaDY3ObJu54NBcsaPk19vOBZ8ouhjO4qs=", - "owner": "NixOS", + "lastModified": 1638587357, + "narHash": "sha256-2ySMW3QARG8BsRPmwe7clTbdCuaObromOKewykP+UJc=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "bd27e2e8316ac6eab11aa35c586e743286f23ecf", + "rev": "e34c5379866833f41e2a36f309912fa675d687c7", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "ref": "nixos-21.11", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-docker": { @@ -1199,6 +1730,22 @@ "type": "github" } }, + "nixpkgs-docker_2": { + "locked": { + "lastModified": 1652739558, + "narHash": "sha256-znGkjGugajqF/sFS+H4+ENmGTaVPFE0uu1JjQZJLEaQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ff691ed9ba21528c1b4e034f36a04027e4522c58", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ff691ed9ba21528c1b4e034f36a04027e4522c58", + "type": "github" + } + }, "nixpkgs-regression": { "locked": { "lastModified": 1643052045, @@ -1259,6 +1806,21 @@ "type": "indirect" } }, + "nixpkgs-regression_5": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "indirect" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1646331602, @@ -1292,6 +1854,37 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1602702596, + "narHash": "sha256-fqJ4UgOb4ZUnCDIapDb4gCrtAah5Rnr2/At3IzMitig=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ad0d20345219790533ebe06571f82ed6b034db31", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-20.09-small", + "type": "indirect" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1638887115, + "narHash": "sha256-emjtIeqyJ84Eb3X7APJruTrwcfnHQKs55XGljj62prs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1bd4bbd49bef217a3d1adea43498270d6e779d65", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-21.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_12": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -1306,7 +1899,7 @@ "type": "indirect" } }, - "nixpkgs_11": { + "nixpkgs_13": { "locked": { "lastModified": 1641909823, "narHash": "sha256-Uxo+Wm6c/ijNhaJlYtFLJG9mh75FYZaBreMC2ZE0nEY=", @@ -1322,7 +1915,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_14": { "locked": { "lastModified": 1647350163, "narHash": "sha256-OcMI+PFEHTONthXuEQNddt16Ml7qGvanL3x8QOl2Aao=", @@ -1338,7 +1931,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_15": { "locked": { "lastModified": 1644525281, "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", @@ -1354,7 +1947,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_16": { "locked": { "lastModified": 1646506091, "narHash": "sha256-sWNAJE2m+HOh1jtXlHcnhxsj6/sXrHgbqVNcVRlveK4=", @@ -1370,7 +1963,7 @@ "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_17": { "locked": { "lastModified": 1658119717, "narHash": "sha256-4upOZIQQ7Bc4CprqnHsKnqYfw+arJeAuU+QcpjYBXW0=", @@ -1386,7 +1979,7 @@ "type": "github" } }, - "nixpkgs_16": { + "nixpkgs_18": { "locked": { "lastModified": 1644525281, "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", @@ -1402,7 +1995,7 @@ "type": "github" } }, - "nixpkgs_17": { + "nixpkgs_19": { "locked": { "lastModified": 1652576347, "narHash": "sha256-52Wu7hkcIRcS4UenSSrt01J2sAbbQ6YqxZIDpuEPL/c=", @@ -1417,54 +2010,54 @@ "type": "github" } }, - "nixpkgs_18": { + "nixpkgs_2": { "locked": { - "lastModified": 1644525281, - "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", - "owner": "nixos", + "lastModified": 1640418986, + "narHash": "sha256-a8GGtxn2iL3WAkY5H+4E0s3Q7XJt6bTOvos9qqxT5OQ=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", + "rev": "5c37ad87222cfc1ec36d6cd1364514a9efc2f7f2", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_19": { + "nixpkgs_20": { "locked": { - "lastModified": 1642451377, - "narHash": "sha256-hvAuYDUN8XIrcQKE6wDw4LjTCcwrTp2B1i1i/5vfDMQ=", - "owner": "NixOS", + "lastModified": 1644525281, + "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "e5b47c5c21336e3fdd887d24c7e34363fa09c6d7", + "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_21": { "locked": { - "lastModified": 1644972330, - "narHash": "sha256-6V2JFpTUzB9G+KcqtUR1yl7f6rd9495YrFECslEmbGw=", + "lastModified": 1642451377, + "narHash": "sha256-hvAuYDUN8XIrcQKE6wDw4LjTCcwrTp2B1i1i/5vfDMQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "19574af0af3ffaf7c9e359744ed32556f34536bd", + "rev": "e5b47c5c21336e3fdd887d24c7e34363fa09c6d7", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_20": { + "nixpkgs_22": { "locked": { "lastModified": 1645296114, "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=", @@ -1479,7 +2072,7 @@ "type": "indirect" } }, - "nixpkgs_21": { + "nixpkgs_23": { "locked": { "lastModified": 1652559422, "narHash": "sha256-jPVTNImBTUIFdtur+d4IVot6eXmsvtOcBm0TzxmhWPk=", @@ -1495,7 +2088,7 @@ "type": "github" } }, - "nixpkgs_22": { + "nixpkgs_24": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -1510,7 +2103,7 @@ "type": "indirect" } }, - "nixpkgs_23": { + "nixpkgs_25": { "locked": { "lastModified": 1641909823, "narHash": "sha256-Uxo+Wm6c/ijNhaJlYtFLJG9mh75FYZaBreMC2ZE0nEY=", @@ -1526,7 +2119,7 @@ "type": "github" } }, - "nixpkgs_24": { + "nixpkgs_26": { "locked": { "lastModified": 1647350163, "narHash": "sha256-OcMI+PFEHTONthXuEQNddt16Ml7qGvanL3x8QOl2Aao=", @@ -1542,7 +2135,7 @@ "type": "github" } }, - "nixpkgs_25": { + "nixpkgs_27": { "locked": { "lastModified": 1644525281, "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", @@ -1558,13 +2151,13 @@ "type": "github" } }, - "nixpkgs_26": { + "nixpkgs_28": { "locked": { - "lastModified": 1658311025, - "narHash": "sha256-GqagY5YmaZB3YaO41kKcQhe5RcpS83wnsW8iCu5Znqo=", + "lastModified": 1653117584, + "narHash": "sha256-5uUrHeHBIaySBTrRExcCoW8fBBYVSDjDYDU5A6iOl+k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cd8d1784506a7c7eb0796772b73437e0b82fad57", + "rev": "f4dfed73ee886b115a99e5b85fdfbeb683290d83", "type": "github" }, "original": { @@ -1574,6 +2167,22 @@ "type": "github" } }, + "nixpkgs_29": { + "locked": { + "lastModified": 1646506091, + "narHash": "sha256-sWNAJE2m+HOh1jtXlHcnhxsj6/sXrHgbqVNcVRlveK4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3e644bd62489b516292c816f70bf0052c693b3c7", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_3": { "locked": { "lastModified": 1627969475, @@ -1588,29 +2197,29 @@ "type": "indirect" } }, - "nixpkgs_4": { + "nixpkgs_30": { "locked": { - "lastModified": 1644972330, - "narHash": "sha256-6V2JFpTUzB9G+KcqtUR1yl7f6rd9495YrFECslEmbGw=", - "owner": "NixOS", + "lastModified": 1661336769, + "narHash": "sha256-5Sf9tMd1Jdm+lTBGspbQ4kEoYCDKpUhEVAZHRcm6mGU=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "19574af0af3ffaf7c9e359744ed32556f34536bd", + "rev": "03428dbaaa23d6bf458770907b0927b377c873a8", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_31": { "locked": { - "lastModified": 1644525281, - "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", + "lastModified": 1660305968, + "narHash": "sha256-r0X1pZCSEA6mzt5OuTA7nHuLmvnbkwgpFAh1iLIx4GU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", + "rev": "c4a0efdd5a728e20791b8d8d2f26f90ac228ee8d", "type": "github" }, "original": { @@ -1620,7 +2229,53 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_32": { + "locked": { + "lastModified": 1645433236, + "narHash": "sha256-4va4MvJ076XyPp5h8sm5eMQvCrJ6yZAbBmyw95dGyw4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7f9b6e2babf232412682c09e57ed666d8f84ac2d", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "nixpkgs_33": { + "locked": { + "lastModified": 1661361016, + "narHash": "sha256-Bjf6ZDnDc6glTwIIItvwfcaeJ5zWFM6GYfPajSArdUY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b784c5ae63dd288375af1b4d37b8a27dd8061887", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_34": { + "locked": { + "lastModified": 1624862269, + "narHash": "sha256-JFcsh2+7QtfKdJFoPibLFPLgIW6Ycnv8Bts9a7RYme0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f77036342e2b690c61c97202bf48f2ce13acc022", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-21.05-small", + "type": "indirect" + } + }, + "nixpkgs_35": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -1635,57 +2290,166 @@ "type": "indirect" } }, + "nixpkgs_36": { + "locked": { + "lastModified": 1641909823, + "narHash": "sha256-Uxo+Wm6c/ijNhaJlYtFLJG9mh75FYZaBreMC2ZE0nEY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "f0f67400bc49c44f305d6fe17698a2f1ce1c29a0", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_37": { + "locked": { + "lastModified": 1660305968, + "narHash": "sha256-r0X1pZCSEA6mzt5OuTA7nHuLmvnbkwgpFAh1iLIx4GU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c4a0efdd5a728e20791b8d8d2f26f90ac228ee8d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_38": { + "locked": { + "lastModified": 1658311025, + "narHash": "sha256-GqagY5YmaZB3YaO41kKcQhe5RcpS83wnsW8iCu5Znqo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "cd8d1784506a7c7eb0796772b73437e0b82fad57", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_39": { + "locked": { + "lastModified": 1636823747, + "narHash": "sha256-oWo1nElRAOZqEf90Yek2ixdHyjD+gqtS/pAgwaQ9UhQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "f6a2ed2082d9a51668c86ba27d0b5496f7a2ea93", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1644972330, + "narHash": "sha256-6V2JFpTUzB9G+KcqtUR1yl7f6rd9495YrFECslEmbGw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "19574af0af3ffaf7c9e359744ed32556f34536bd", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1627969475, + "narHash": "sha256-MhVtkVt1MFfaDY3ObJu54NBcsaPk19vOBZ8ouhjO4qs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "bd27e2e8316ac6eab11aa35c586e743286f23ecf", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1644972330, + "narHash": "sha256-6V2JFpTUzB9G+KcqtUR1yl7f6rd9495YrFECslEmbGw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "19574af0af3ffaf7c9e359744ed32556f34536bd", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_7": { "locked": { - "lastModified": 1638452135, - "narHash": "sha256-5Il6hgrTgcWIsB7zug0yDFccYXx7pJCw8cwJdXMuLfM=", + "lastModified": 1644525281, + "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "43cdc5b364511eabdcad9fde639777ffd9e5bab1", + "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", - "rev": "43cdc5b364511eabdcad9fde639777ffd9e5bab1", "type": "github" } }, "nixpkgs_8": { "locked": { - "lastModified": 1602702596, - "narHash": "sha256-fqJ4UgOb4ZUnCDIapDb4gCrtAah5Rnr2/At3IzMitig=", + "lastModified": 1632864508, + "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad0d20345219790533ebe06571f82ed6b034db31", + "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-20.09-small", + "ref": "nixos-21.05-small", "type": "indirect" } }, "nixpkgs_9": { "locked": { - "lastModified": 1638887115, - "narHash": "sha256-emjtIeqyJ84Eb3X7APJruTrwcfnHQKs55XGljj62prs=", - "owner": "NixOS", + "lastModified": 1638452135, + "narHash": "sha256-5Il6hgrTgcWIsB7zug0yDFccYXx7pJCw8cwJdXMuLfM=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "1bd4bbd49bef217a3d1adea43498270d6e779d65", + "rev": "43cdc5b364511eabdcad9fde639777ffd9e5bab1", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-21.11", + "owner": "nixos", "repo": "nixpkgs", + "rev": "43cdc5b364511eabdcad9fde639777ffd9e5bab1", "type": "github" } }, "nomad": { "inputs": { "nix": "nix_2", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_11", "utils": "utils_2" }, "locked": { @@ -1708,7 +2472,7 @@ "devshell": "devshell", "inclusive": "inclusive", "nix": "nix_3", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_13", "utils": "utils_3" }, "locked": { @@ -1730,7 +2494,7 @@ "devshell": "devshell_4", "inclusive": "inclusive_4", "nix": "nix_5", - "nixpkgs": "nixpkgs_23", + "nixpkgs": "nixpkgs_25", "utils": "utils_8" }, "locked": { @@ -1747,11 +2511,33 @@ "type": "github" } }, + "nomad-driver-nix_3": { + "inputs": { + "devshell": "devshell_8", + "inclusive": "inclusive_7", + "nix": "nix_7", + "nixpkgs": "nixpkgs_36", + "utils": "utils_13" + }, + "locked": { + "lastModified": 1649338225, + "narHash": "sha256-hET+b7XhDLSuVQwXLI2V5nYCcdvxQQj9BAG8z4ta6CE=", + "owner": "input-output-hk", + "repo": "nomad-driver-nix", + "rev": "010b09c680887d0cade86e8ac136c3a04609e04a", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "nomad-driver-nix", + "type": "github" + } + }, "nomad-follower": { "inputs": { "devshell": "devshell_2", "inclusive": "inclusive_2", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_14", "utils": "utils_4" }, "locked": { @@ -1772,7 +2558,7 @@ "inputs": { "devshell": "devshell_5", "inclusive": "inclusive_5", - "nixpkgs": "nixpkgs_24", + "nixpkgs": "nixpkgs_26", "utils": "utils_9" }, "locked": { @@ -1823,9 +2609,9 @@ }, "ragenix": { "inputs": { - "agenix": "agenix_3", - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_13", + "agenix": "agenix_4", + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_15", "rust-overlay": "rust-overlay" }, "locked": { @@ -1844,9 +2630,9 @@ }, "ragenix_2": { "inputs": { - "agenix": "agenix_4", - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_16", + "agenix": "agenix_5", + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_18", "rust-overlay": "rust-overlay_2" }, "locked": { @@ -1863,49 +2649,82 @@ "type": "github" } }, - "ragenix_3": { + "ragenix_3": { + "inputs": { + "agenix": "agenix_6", + "flake-utils": "flake-utils_8", + "nixpkgs": "nixpkgs_27", + "rust-overlay": "rust-overlay_3" + }, + "locked": { + "lastModified": 1641119695, + "narHash": "sha256-fksD2ftdEdFfB4BiB9iQCJt2QJ/CJogqk4mBNy9rY/0=", + "owner": "yaxitech", + "repo": "ragenix", + "rev": "71147db3f221d0a5c86b393d5c60d51b70f39fe3", + "type": "github" + }, + "original": { + "owner": "yaxitech", + "repo": "ragenix", + "type": "github" + } + }, + "ragenix_4": { + "inputs": { + "agenix": "agenix_7", + "flake-utils": "flake-utils_11", + "nixpkgs": "nixpkgs_31", + "rust-overlay": "rust-overlay_4" + }, + "locked": { + "lastModified": 1645147603, + "narHash": "sha256-xraqK0vwr+AF9om7b3xIaP5AqEQqMb1DLVuUjGzM+98=", + "owner": "input-output-hk", + "repo": "ragenix", + "rev": "194a625a97262f704b619acfccf27a5b9e6faea8", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "ragenix", + "type": "github" + } + }, + "ragenix_5": { "inputs": { - "agenix": "agenix_5", - "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_25", - "rust-overlay": "rust-overlay_3" + "agenix": "agenix_8", + "flake-utils": "flake-utils_12", + "nixpkgs": "nixpkgs_37", + "rust-overlay": "rust-overlay_5" }, "locked": { - "lastModified": 1641119695, - "narHash": "sha256-fksD2ftdEdFfB4BiB9iQCJt2QJ/CJogqk4mBNy9rY/0=", + "lastModified": 1660607130, + "narHash": "sha256-pi3hcrJPSR7+woB8VSbryGInSPKZE6lO1wDLg3Ykw3Q=", "owner": "yaxitech", "repo": "ragenix", - "rev": "71147db3f221d0a5c86b393d5c60d51b70f39fe3", + "rev": "47cec29d0c9f1da3a03cfff7406bd10cc7968926", "type": "github" }, "original": { - "owner": "yaxitech", - "repo": "ragenix", - "type": "github" + "id": "ragenix", + "type": "indirect" } }, "root": { "inputs": { "agenix": "agenix", "agenix-cli": "agenix-cli", - "blank": "blank", "capsules": "capsules", - "data-merge": "data-merge", - "deploy": "deploy_2", - "fenix": "fenix_4", - "hydra": "hydra_2", - "n2c": "n2c", - "nix": "nix_4", - "nixpkgs": "nixpkgs_21", - "nixpkgs-docker": "nixpkgs-docker", - "nixpkgs-unstable": "nixpkgs-unstable_2", - "nomad-driver-nix": "nomad-driver-nix_2", - "nomad-follower": "nomad-follower_2", - "ops-lib": "ops-lib_2", - "ragenix": "ragenix_3", - "std": "std", - "terranix": "terranix_2", - "utils": "utils_10" + "deploy": "deploy_3", + "fenix": "fenix_5", + "hydra": "hydra_3", + "nixpkgs-docker": "nixpkgs-docker_2", + "nomad-driver-nix": "nomad-driver-nix_3", + "ragenix": "ragenix_5", + "std": "std_2", + "terranix": "terranix_3", + "utils": "utils_14" } }, "rust-analyzer-src": { @@ -1976,15 +2795,36 @@ "type": "github" } }, + "rust-analyzer-src_5": { + "flake": false, + "locked": { + "lastModified": 1661454537, + "narHash": "sha256-+euf4tPX5vyVN05TBTRhVspOeNZPlmJdOf3ISu1JO6M=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "ca8093e282cdcdfb94d2d8adc224b7d05b151f8e", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "rust-overlay": { "inputs": { "flake-utils": [ + "capsules", + "bitte", "capsules", "bitte", "ragenix", "flake-utils" ], "nixpkgs": [ + "capsules", + "bitte", "capsules", "bitte", "ragenix", @@ -2008,11 +2848,15 @@ "rust-overlay_2": { "inputs": { "flake-utils": [ + "capsules", + "bitte", "capsules", "ragenix", "flake-utils" ], "nixpkgs": [ + "capsules", + "bitte", "capsules", "ragenix", "nixpkgs" @@ -2035,10 +2879,14 @@ "rust-overlay_3": { "inputs": { "flake-utils": [ + "capsules", + "bitte", "ragenix", "flake-utils" ], "nixpkgs": [ + "capsules", + "bitte", "ragenix", "nixpkgs" ] @@ -2057,15 +2905,87 @@ "type": "github" } }, + "rust-overlay_4": { + "inputs": { + "flake-utils": [ + "capsules", + "ragenix", + "flake-utils" + ], + "nixpkgs": [ + "capsules", + "ragenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660358625, + "narHash": "sha256-uv+ZtOAEeM5tw78CLdRQmbZyDZYc0piSflthG2kNnrc=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "18354cce8137aaef0d505d6f677e9bbdd542020d", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_5": { + "inputs": { + "flake-utils": [ + "ragenix", + "flake-utils" + ], + "nixpkgs": [ + "ragenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660358625, + "narHash": "sha256-uv+ZtOAEeM5tw78CLdRQmbZyDZYc0piSflthG2kNnrc=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "18354cce8137aaef0d505d6f677e9bbdd542020d", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "std": { "inputs": { "devshell": "devshell_6", + "nixpkgs": "nixpkgs_28", + "yants": "yants_2" + }, + "locked": { + "lastModified": 1652784712, + "narHash": "sha256-ofwGapSWqzUVgIxwwmjlrOVogfjV4yd6WpY8fNfMc2o=", + "owner": "divnix", + "repo": "std", + "rev": "3667d2d868352b0bf47c83440da48bee9f2fab47", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "std", + "type": "github" + } + }, + "std_2": { + "inputs": { + "devshell": "devshell_9", "dmerge": "dmerge", - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_13", "mdbook-kroki-preprocessor": "mdbook-kroki-preprocessor", "nixago": "nixago", - "nixpkgs": "nixpkgs_26", - "yants": "yants_2" + "nixpkgs": "nixpkgs_38", + "yants": "yants_3" }, "locked": { "lastModified": 1661370377, @@ -2076,9 +2996,8 @@ "type": "github" }, "original": { - "owner": "divnix", - "repo": "std", - "type": "github" + "id": "std", + "type": "indirect" } }, "stdlib": { @@ -2156,12 +3075,44 @@ "type": "github" } }, + "stdlib_6": { + "locked": { + "lastModified": 1590026685, + "narHash": "sha256-E5INrVvYX/P/UpcoUFDAsuHem+lsqT+/teBs9O7oc9Q=", + "owner": "manveru", + "repo": "nix-lib", + "rev": "99088cf7febcdb21afd375a335dcafa959bef3ed", + "type": "github" + }, + "original": { + "owner": "manveru", + "repo": "nix-lib", + "type": "github" + } + }, + "stdlib_7": { + "locked": { + "lastModified": 1590026685, + "narHash": "sha256-E5INrVvYX/P/UpcoUFDAsuHem+lsqT+/teBs9O7oc9Q=", + "owner": "manveru", + "repo": "nix-lib", + "rev": "99088cf7febcdb21afd375a335dcafa959bef3ed", + "type": "github" + }, + "original": { + "owner": "manveru", + "repo": "nix-lib", + "type": "github" + } + }, "terranix": { "inputs": { "bats-assert": "bats-assert", "bats-support": "bats-support", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "nixpkgs": [ + "capsules", + "bitte", "capsules", "bitte", "blank" @@ -2212,12 +3163,29 @@ "type": "github" } }, + "terranix-examples_3": { + "locked": { + "lastModified": 1636300201, + "narHash": "sha256-0n1je1WpiR6XfCsvi8ZK7GrpEnMl+DpwhWaO1949Vbc=", + "owner": "terranix", + "repo": "terranix-examples", + "rev": "a934aa1cf88f6bd6c6ddb4c77b77ec6e1660bd5e", + "type": "github" + }, + "original": { + "owner": "terranix", + "repo": "terranix-examples", + "type": "github" + } + }, "terranix_2": { "inputs": { "bats-assert": "bats-assert_2", "bats-support": "bats-support_2", - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_10", "nixpkgs": [ + "capsules", + "bitte", "blank" ], "terranix-examples": "terranix-examples_2" @@ -2236,6 +3204,28 @@ "type": "github" } }, + "terranix_3": { + "inputs": { + "bats-assert": "bats-assert_3", + "bats-support": "bats-support_3", + "flake-utils": "flake-utils_14", + "nixpkgs": "nixpkgs_39", + "terranix-examples": "terranix-examples_3" + }, + "locked": { + "lastModified": 1657512701, + "narHash": "sha256-zctvB0zpPY2C1HkMyEK6NFNuPVNGcU9b8gv9HafBd2A=", + "owner": "terranix", + "repo": "terranix", + "rev": "67e2c7c3ec58f3b1b6ea6434b0558f0233ca7a36", + "type": "github" + }, + "original": { + "owner": "terranix", + "repo": "terranix", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1637014545, @@ -2266,6 +3256,65 @@ "type": "github" } }, + "utils_11": { + "locked": { + "lastModified": 1633020561, + "narHash": "sha256-4uAiRqL9nP3d/NQ8VBqjQ5iZypHaM+X/FyWpXVXkwTA=", + "owner": "kreisys", + "repo": "flake-utils", + "rev": "2923532a276a5595ee64376ec1b3db6ed8503c52", + "type": "github" + }, + "original": { + "owner": "kreisys", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_12": { + "locked": { + "lastModified": 1637014545, + "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_13": { + "locked": { + "lastModified": 1633020561, + "narHash": "sha256-4uAiRqL9nP3d/NQ8VBqjQ5iZypHaM+X/FyWpXVXkwTA=", + "owner": "kreisys", + "repo": "flake-utils", + "rev": "2923532a276a5595ee64376ec1b3db6ed8503c52", + "type": "github" + }, + "original": { + "owner": "kreisys", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_14": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "id": "flake-utils", + "type": "indirect" + } + }, "utils_2": { "locked": { "lastModified": 1601282935, @@ -2405,7 +3454,7 @@ }, "yants": { "inputs": { - "nixpkgs": "nixpkgs_17" + "nixpkgs": "nixpkgs_19" }, "locked": { "lastModified": 1645126146, @@ -2422,6 +3471,29 @@ } }, "yants_2": { + "inputs": { + "nixpkgs": [ + "capsules", + "bitte", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1645126146, + "narHash": "sha256-XQ1eg4gzXoc7Tl8iXak1uCt3KnsTyxqPtLE+vOoDnrQ=", + "owner": "divnix", + "repo": "yants", + "rev": "77df2be1b3cce9f571c6cf451f786b266a6869cc", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "yants", + "type": "github" + } + }, + "yants_3": { "inputs": { "nixpkgs": [ "std", diff --git a/private/flake.nix b/private/flake.nix new file mode 100644 index 00000000..05bcf0ae --- /dev/null +++ b/private/flake.nix @@ -0,0 +1,33 @@ +{ + # private inputs are combined with inputs, but do not propagate to consumer lock files + # they have the added benefit of being pulled lazily, which means they are not evaluated + # by the consumer if they are not needed + inputs = { + utils.url = "flake-utils"; + + nixpkgs-docker.url = "github:nixos/nixpkgs/ff691ed9ba21528c1b4e034f36a04027e4522c58"; + + agenix-cli.url = "github:cole-h/agenix-cli"; + + deploy.url = "github:input-output-hk/deploy-rs"; + deploy.inputs.fenix.follows = "fenix"; + + terranix.url = "github:terranix/terranix"; + + nomad-driver-nix.url = "github:input-output-hk/nomad-driver-nix"; + + # DEPRECATED: will be replaces by cicero soon + hydra.url = "github:kreisys/hydra/hydra-server-includes"; + }; + + outputs = { + std, + agenix, + ragenix, + fenix, + capsules, + ... + } @ inputs: {inherit inputs;}; + + nixConfig.flake-registry = "https://raw.githubusercontent.com/input-output-hk/flake-registry/iog/flake-registry.json"; +}