From 56878e1a42057d5b640aaa88c52930e76615bb7d Mon Sep 17 00:00:00 2001 From: matthewcroughan Date: Wed, 23 Mar 2022 23:53:17 +0000 Subject: [PATCH] Fix examples --- examples/flake.lock | 68 ++++++++++++++++++++++++++++++++++++++++++++- examples/flake.nix | 6 ++-- 2 files changed, 71 insertions(+), 3 deletions(-) diff --git a/examples/flake.lock b/examples/flake.lock index b926986..f89872e 100644 --- a/examples/flake.lock +++ b/examples/flake.lock @@ -1,6 +1,40 @@ { "nodes": { + "examples": { + "inputs": { + "nixinate": "nixinate_2", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "narHash": "sha256-1iruH96Aame+4NAAwSwVZAbHzfnKxhMLjgoVvJar6ls=", + "path": "./examples", + "type": "path" + }, + "original": { + "path": "./examples", + "type": "path" + } + }, "nixinate": { + "inputs": { + "examples": "examples", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1646587087, + "narHash": "sha256-SwOHL/tte1H8VvftnxtWCr5FIlZaGvNy57P9sMSrZ5Q=", + "owner": "matthewcroughan", + "repo": "nixinate", + "rev": "886c6a2b3bef14cacf6c3021df0a75bb57f9fbc7", + "type": "github" + }, + "original": { + "owner": "matthewcroughan", + "repo": "nixinate", + "type": "github" + } + }, + "nixinate_2": { "inputs": { "nixpkgs": "nixpkgs" }, @@ -46,10 +80,42 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1647893727, + "narHash": "sha256-pOi7VdCb+s5Cwh5CS7YEZVRgH9uCmE87J5W7iXv29Ck=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "1ec61dd4167f04be8d05c45780818826132eea0d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1641147223, + "narHash": "sha256-eJnmISYGR7LeqEev4bsI/qcU0SgeFKHs3jnL4vMGL+k=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "08370e1e271f6fe00d302bebbe510fe0e2c611ca", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-21.11", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "nixinate": "nixinate", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_4" } } }, diff --git a/examples/flake.nix b/examples/flake.nix index 628edf1..9c6a426 100644 --- a/examples/flake.nix +++ b/examples/flake.nix @@ -1,7 +1,9 @@ +# TODO: use a relative path to nixinate, so that everything is contained within this repo. +# This would rely upon https://github.com/NixOS/nix/pull/5437 being merged. { inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-21.11"; - nixinate.url = "path:///etc/nixos/nixinate"; + nixinate.url = "github:matthewcroughan/nixinate"; }; outputs = { self, nixpkgs, nixinate }: { @@ -10,7 +12,7 @@ myMachine = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ - { + { _module.args.nixinate = { host = "itchy.scratchy.com"; sshUser = "matthew";