Skip to content
Snippets Groups Projects
Commit 1bd16c00 authored by Jean-Paul Calderone's avatar Jean-Paul Calderone
Browse files

Merge branch 'explicit-nixpkgs' into 'develop'

Set nixpkgs explicitly in morph.

Closes #85

See merge request privatestorage/PrivateStorageio!174
parents 614203fc 9b6dd624
No related tags found
No related merge requests found
...@@ -129,6 +129,7 @@ let ...@@ -129,6 +129,7 @@ let
in { in {
network = { network = {
description = "PrivateStorage.io LocalDev Grid"; description = "PrivateStorage.io LocalDev Grid";
inherit (gridlib) pkgs;
}; };
inherit payments monitoring storage1 storage2; inherit payments monitoring storage1 storage2;
} }
...@@ -130,6 +130,7 @@ let ...@@ -130,6 +130,7 @@ let
in { in {
network = { network = {
description = "PrivateStorage.io Production Grid"; description = "PrivateStorage.io Production Grid";
inherit (gridlib) pkgs;
}; };
inherit payments; inherit payments;
inherit monitoring; inherit monitoring;
......
...@@ -81,6 +81,7 @@ let ...@@ -81,6 +81,7 @@ let
in { in {
network = { network = {
description = "PrivateStorage.io Testing Grid"; description = "PrivateStorage.io Testing Grid";
inherit (gridlib) pkgs;
}; };
inherit payments monitoring storage001; inherit payments monitoring storage001;
} }
...@@ -32,5 +32,18 @@ ...@@ -32,5 +32,18 @@
# Instead, just tell morph how to reach the node here - by using its fully # Instead, just tell morph how to reach the node here - by using its fully
# qualified domain name. # qualified domain name.
deployment.targetHost = "${config.networking.hostName}.${config.networking.domain}"; deployment.targetHost = "${config.networking.hostName}.${config.networking.domain}";
assertions = [
# This is a check to save somebody in the future trying to debug why
# setting `nixpkgs.config` is not having an effect.
{
# `{}` is the default value for `nixpkgs.config`
assertion = config.nixpkgs.config == {};
message = ''
Since we set `nixpkgs.pkgs` via morph's `network.pkgs`, the value for `nixpkgs.config` is ignored.
See https://whetstone.privatestorage.io/privatestorage/PrivateStorageio/-/issues/85#note_15876 for details.
'';
}
];
}; };
} }
...@@ -17,4 +17,16 @@ ...@@ -17,4 +17,16 @@
customize-monitoring = import ./customize-monitoring.nix; customize-monitoring = import ./customize-monitoring.nix;
modules = builtins.toString ../../nixos/modules; modules = builtins.toString ../../nixos/modules;
# The nixpkgs version used in our deployments. This affects both the packages
# installed, as well as the NixOS module set that is used.
# This is intended to be used in a grid definition like:
# network = { ... ; inherit (gridlib) pkgs; ... }
pkgs = import ../../nixpkgs-2105.nix {
# Ensure that configuration of the system where this runs
# doesn't leak into what we build.
# See https://github.com/NixOS/nixpkgs/issues/62513
config = {};
overlays = [];
};
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment