From f1c20107db227aef93cb65861b05eda2bc848574 Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@private.storage>
Date: Thu, 24 Feb 2022 11:58:46 +0000
Subject: [PATCH] Have another cleanup from Tom
---
morph/grid/local/grid.nix | 4 +---
morph/grid/production/grid.nix | 4 +---
morph/grid/testing/grid.nix | 4 +---
3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/morph/grid/local/grid.nix b/morph/grid/local/grid.nix
index f1e19805..088d9e8c 100644
--- a/morph/grid/local/grid.nix
+++ b/morph/grid/local/grid.nix
@@ -1,8 +1,6 @@
let
- pkgs = import <nixpkgs> { };
-
gridlib = import ../../lib;
- grid-config = pkgs.lib.trivial.importJSON ./config.json;
+ grid-config = builtins.fromJSON (builtins.readFile ./config.json);
ssh-users = let
ssh-users-file = ./public-keys/users.nix;
diff --git a/morph/grid/production/grid.nix b/morph/grid/production/grid.nix
index 3570dfef..91310433 100644
--- a/morph/grid/production/grid.nix
+++ b/morph/grid/production/grid.nix
@@ -1,9 +1,7 @@
# See morph/grid/local/grid.nix for additional commentary.
let
- pkgs = import <nixpkgs> { };
-
gridlib = import ../../lib;
- grid-config = pkgs.lib.trivial.importJSON ./config.json;
+ grid-config = builtins.fromJSON (builtins.readFile ./config.json);
# Module with per-grid configuration
grid-module = {config, ...}: {
diff --git a/morph/grid/testing/grid.nix b/morph/grid/testing/grid.nix
index bc6d1abe..c033da12 100644
--- a/morph/grid/testing/grid.nix
+++ b/morph/grid/testing/grid.nix
@@ -1,9 +1,7 @@
# See morph/grid/local/grid.nix for additional commentary.
let
- pkgs = import <nixpkgs> { };
-
gridlib = import ../../lib;
- grid-config = pkgs.lib.trivial.importJSON ./config.json;
+ grid-config = builtins.fromJSON (builtins.readFile ./config.json);
# Module with per-grid configuration
grid-module = {config, ...}: {
--
GitLab