From d599d5b640fbf9788a9223d2f3738eba1853aadd Mon Sep 17 00:00:00 2001 From: Kiara Grouwstra Date: Tue, 25 Mar 2025 15:47:17 +0100 Subject: [PATCH] switch launch shell to root flake's nixpkgs, see #279 --- launch/.terraform.lock.hcl | 4 ++-- launch/default.nix | 6 +++++- npins/sources.json | 12 ++++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/launch/.terraform.lock.hcl b/launch/.terraform.lock.hcl index f90c28b6..33548dcd 100644 --- a/launch/.terraform.lock.hcl +++ b/launch/.terraform.lock.hcl @@ -4,13 +4,13 @@ provider "registry.opentofu.org/hashicorp/external" { version = "2.3.4" hashes = [ - "h1:F45RHS5NlHBWkfcW61rwkA7Z2P+p3Rxvq75XMhNeFHE=", + "h1:HfVaWMC7Tz+tRfoWZtGCX2MATcgX3HsexoirWdi/voo=", ] } provider "registry.opentofu.org/hashicorp/null" { version = "3.2.3" hashes = [ - "h1:P9gA/YsRU4Q+STK6EkCOjTHYUop/+1LfIbX7QMNHfPk=", + "h1:qTlGDGC3RmXIPLgwsIh4LHG/DrAR6T6L+Wn6egnQnwE=", ] } diff --git a/launch/default.nix b/launch/default.nix index 8d01c0ef..8518f575 100644 --- a/launch/default.nix +++ b/launch/default.nix @@ -1,7 +1,11 @@ { system ? builtins.currentSystem, sources ? import ../npins, - pkgs ? import sources.nixpkgs { + inputs ? import sources.flake-inputs { + root = ../.; + }, + # match the same version of opentofu that is deployed by the root flake + pkgs ? import inputs.nixpkgs { inherit system; }, }: diff --git a/npins/sources.json b/npins/sources.json index 4701917c..c1177097 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -1,5 +1,17 @@ { "pins": { + "flake-inputs": { + "type": "Git", + "repository": { + "type": "GitHub", + "owner": "fricklerhandwerk", + "repo": "flake-inputs" + }, + "branch": "main", + "revision": "559574c9cbb8af262f3944b67d60fbf0f6ad03c3", + "url": "https://github.com/fricklerhandwerk/flake-inputs/archive/559574c9cbb8af262f3944b67d60fbf0f6ad03c3.tar.gz", + "hash": "0gbhmp6x2vdzvfnsvqzal3g8f8hx2ia6r73aibc78kazf78m67x6" + }, "htmx": { "type": "GitRelease", "repository": {