From c1c738b1a46a3a108e422495755a08a545bb6d9a Mon Sep 17 00:00:00 2001 From: ibizaman Date: Mon, 25 Dec 2023 23:31:59 -0800 Subject: [PATCH] make demos use selfhostblock provided inputs refs #61 --- demo/homeassistant/flake.lock | 54 ++++++++++++++++------------------- demo/homeassistant/flake.nix | 11 ++----- demo/nextcloud/flake.lock | 54 ++++++++++++++++------------------- demo/nextcloud/flake.nix | 11 ++----- 4 files changed, 54 insertions(+), 76 deletions(-) diff --git a/demo/homeassistant/flake.lock b/demo/homeassistant/flake.lock index 2450985..59b9b72 100644 --- a/demo/homeassistant/flake.lock +++ b/demo/homeassistant/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -35,11 +35,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1687681650, - "narHash": "sha256-M2If+gRcfpmaJy/XbfSsRzLlPpoU4nr0NHnKKl50fd8=", + "lastModified": 1703255338, + "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1c9db9710cb23d60570ad4d7ab829c2d34403de3", + "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", "type": "github" }, "original": { @@ -51,11 +51,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1687031877, - "narHash": "sha256-yMFcVeI+kZ6KD2QBrFPNsvBrLq2Gt//D0baHByMrjFY=", + "lastModified": 1703351344, + "narHash": "sha256-9FEelzftkE9UaJ5nqxidaJJPEhe9TPhbypLHmc2Mysc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e2e2059d19668dab1744301b8b0e821e3aae9c99", + "rev": "7790e078f8979a9fcd543f9a47427eeaba38f268", "type": "github" }, "original": { @@ -67,16 +67,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1686628398, - "narHash": "sha256-jXEuS/dex59Oon4tll+Jb8aVl6B8HX/aREigHjt2S6E=", - "owner": "nixos", + "lastModified": 1703134684, + "narHash": "sha256-SQmng1EnBFLzS7WSRyPM9HgmZP2kLJcPAz+Ug/nug6o=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "202850e1a11a939364cef0f326cb1352b3f2d8cd", + "rev": "d6863cbcbbb80e71cecfc03356db1cda38919523", "type": "github" }, "original": { - "owner": "nixos", - "ref": "master", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -99,29 +99,23 @@ }, "root": { "inputs": { - "nixpkgs": "nixpkgs", - "selfhostblocks": "selfhostblocks", - "sops-nix": "sops-nix" + "selfhostblocks": "selfhostblocks" } }, "selfhostblocks": { "inputs": { "flake-utils": "flake-utils", "nix-flake-tests": "nix-flake-tests", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs", "nmdsrc": "nmdsrc", - "sops-nix": [ - "sops-nix" - ] + "sops-nix": "sops-nix" }, "locked": { - "lastModified": 1702146861, - "narHash": "sha256-pckbbwq4M6AwuQw1u+Y+Xg9DlkSUZK0m2J/Z70ObNyA=", + "lastModified": 1703575610, + "narHash": "sha256-W22MujiE5xxibKu9M7usXhGD04ntrLXegMxuY6FYCX4=", "owner": "ibizaman", "repo": "selfhostblocks", - "rev": "da2e1ff0e1ea6f0d9e881c92d4926558588f0222", + "rev": "7a62b5b89c406fbf80ac6dfb678c0d5c62a771ea", "type": "github" }, "original": { @@ -136,11 +130,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1687398569, - "narHash": "sha256-e/umuIKFcFtZtWeX369Hbdt9r+GQ48moDmlTcyHWL28=", + "lastModified": 1703387502, + "narHash": "sha256-JnWuQmyanPtF8c5yAEFXVWzaIlMxA3EAZCh8XNvnVqE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2ff6973350682f8d16371f8c071a304b8067f192", + "rev": "e523e89763ff45f0a6cf15bcb1092636b1da9ed3", "type": "github" }, "original": { diff --git a/demo/homeassistant/flake.nix b/demo/homeassistant/flake.nix index 09b14fc..33c5359 100644 --- a/demo/homeassistant/flake.nix +++ b/demo/homeassistant/flake.nix @@ -2,18 +2,13 @@ description = "Home Assistant example for Self Host Blocks"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - sops-nix.url = "github:Mic92/sops-nix"; - selfhostblocks.url = "github:ibizaman/selfhostblocks"; - selfhostblocks.inputs.nixpkgs.follows = "nixpkgs"; - selfhostblocks.inputs.sops-nix.follows = "sops-nix"; }; - outputs = inputs@{ self, nixpkgs, sops-nix, selfhostblocks, ... }: { + outputs = inputs@{ self, selfhostblocks, ... }: { colmena = { meta = { - nixpkgs = import nixpkgs { + nixpkgs = import selfhostblocks.inputs.nixpkgs { system = "x86_64-linux"; }; specialArgs = inputs; @@ -22,7 +17,7 @@ myserver = { config, ... }: { imports = [ ./configuration.nix - sops-nix.nixosModules.default + selfhostblocks.inputs.sops-nix.nixosModules.default selfhostblocks.nixosModules.x86_64-linux.default ]; diff --git a/demo/nextcloud/flake.lock b/demo/nextcloud/flake.lock index 439f3f4..59b9b72 100644 --- a/demo/nextcloud/flake.lock +++ b/demo/nextcloud/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -35,11 +35,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1687681650, - "narHash": "sha256-M2If+gRcfpmaJy/XbfSsRzLlPpoU4nr0NHnKKl50fd8=", + "lastModified": 1703255338, + "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1c9db9710cb23d60570ad4d7ab829c2d34403de3", + "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", "type": "github" }, "original": { @@ -51,11 +51,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1687031877, - "narHash": "sha256-yMFcVeI+kZ6KD2QBrFPNsvBrLq2Gt//D0baHByMrjFY=", + "lastModified": 1703351344, + "narHash": "sha256-9FEelzftkE9UaJ5nqxidaJJPEhe9TPhbypLHmc2Mysc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e2e2059d19668dab1744301b8b0e821e3aae9c99", + "rev": "7790e078f8979a9fcd543f9a47427eeaba38f268", "type": "github" }, "original": { @@ -67,16 +67,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1686628398, - "narHash": "sha256-jXEuS/dex59Oon4tll+Jb8aVl6B8HX/aREigHjt2S6E=", - "owner": "nixos", + "lastModified": 1703134684, + "narHash": "sha256-SQmng1EnBFLzS7WSRyPM9HgmZP2kLJcPAz+Ug/nug6o=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "202850e1a11a939364cef0f326cb1352b3f2d8cd", + "rev": "d6863cbcbbb80e71cecfc03356db1cda38919523", "type": "github" }, "original": { - "owner": "nixos", - "ref": "master", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -99,29 +99,23 @@ }, "root": { "inputs": { - "nixpkgs": "nixpkgs", - "selfhostblocks": "selfhostblocks", - "sops-nix": "sops-nix" + "selfhostblocks": "selfhostblocks" } }, "selfhostblocks": { "inputs": { "flake-utils": "flake-utils", "nix-flake-tests": "nix-flake-tests", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs", "nmdsrc": "nmdsrc", - "sops-nix": [ - "sops-nix" - ] + "sops-nix": "sops-nix" }, "locked": { - "lastModified": 1703412385, - "narHash": "sha256-nPOnGY7V54rZezB0RelV2Kvqtv7yd84247y8AJg66rY=", + "lastModified": 1703575610, + "narHash": "sha256-W22MujiE5xxibKu9M7usXhGD04ntrLXegMxuY6FYCX4=", "owner": "ibizaman", "repo": "selfhostblocks", - "rev": "40f0f233c247b26f98b8912ffab0feb8283744d1", + "rev": "7a62b5b89c406fbf80ac6dfb678c0d5c62a771ea", "type": "github" }, "original": { @@ -136,11 +130,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1687398569, - "narHash": "sha256-e/umuIKFcFtZtWeX369Hbdt9r+GQ48moDmlTcyHWL28=", + "lastModified": 1703387502, + "narHash": "sha256-JnWuQmyanPtF8c5yAEFXVWzaIlMxA3EAZCh8XNvnVqE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2ff6973350682f8d16371f8c071a304b8067f192", + "rev": "e523e89763ff45f0a6cf15bcb1092636b1da9ed3", "type": "github" }, "original": { diff --git a/demo/nextcloud/flake.nix b/demo/nextcloud/flake.nix index 981596f..f175d54 100644 --- a/demo/nextcloud/flake.nix +++ b/demo/nextcloud/flake.nix @@ -2,18 +2,13 @@ description = "Home Assistant example for Self Host Blocks"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - sops-nix.url = "github:Mic92/sops-nix"; - selfhostblocks.url = "github:ibizaman/selfhostblocks"; - selfhostblocks.inputs.nixpkgs.follows = "nixpkgs"; - selfhostblocks.inputs.sops-nix.follows = "sops-nix"; }; - outputs = inputs@{ self, nixpkgs, sops-nix, selfhostblocks, ... }: { + outputs = inputs@{ self, selfhostblocks, ... }: { colmena = { meta = { - nixpkgs = import nixpkgs { + nixpkgs = import selfhostblocks.inputs.nixpkgs { system = "x86_64-linux"; }; specialArgs = inputs; @@ -22,7 +17,7 @@ myserver = { config, ... }: { imports = [ ./configuration.nix - sops-nix.nixosModules.default + selfhostblocks.inputs.sops-nix.nixosModules.default selfhostblocks.nixosModules.x86_64-linux.default ];