From ebfc4e4ed7fb47c00bcccd8a69a217f497fb9993 Mon Sep 17 00:00:00 2001
From: Tom Prince <tom.prince@private.storage>
Date: Mon, 6 Sep 2021 16:08:40 -0600
Subject: [PATCH] stuff
---
morph/lib/base.nix | 7 ++++++-
nixos/modules/issuer.nix | 5 ++---
nixos/modules/private-storage.nix | 5 +----
nixos/modules/tests/private-storage.nix | 13 +++++++++----
nixos/modules/tests/tahoe.nix | 7 ++++++-
nixos/pkgs/default.nix | 14 ++++++++++++++
6 files changed, 38 insertions(+), 13 deletions(-)
create mode 100644 nixos/pkgs/default.nix
diff --git a/morph/lib/base.nix b/morph/lib/base.nix
index 809e3556..5f53317e 100644
--- a/morph/lib/base.nix
+++ b/morph/lib/base.nix
@@ -1,5 +1,5 @@
# This module contains settings and configuration that apply to all nodes in a grid.
-{ lib, config, ...}:
+{ lib, config, pkgs, ...}:
{
options.grid = {
publicKeyPath = lib.mkOption {
@@ -19,4 +19,9 @@
'';
};
};
+
+ config = {
+ # Expose locally defined packages as module argument.
+ _module.args.ourpkgs = pkgs.callPackage ../../nixos/pkgs {};
+ };
}
diff --git a/nixos/modules/issuer.nix b/nixos/modules/issuer.nix
index e712ac0d..87009033 100644
--- a/nixos/modules/issuer.nix
+++ b/nixos/modules/issuer.nix
@@ -1,13 +1,12 @@
# A NixOS module which can run a Ristretto-based issuer for PrivateStorage
# ZKAPs.
-{ lib, pkgs, config, ... }: let
+{ lib, pkgs, ourpkgs, config, ... }: let
cfg = config.services.private-storage-issuer;
- zkapissuer = pkgs.callPackage ../pkgs/zkapissuer { };
in {
options = {
services.private-storage-issuer.enable = lib.mkEnableOption "PrivateStorage ZKAP Issuer Service";
services.private-storage-issuer.package = lib.mkOption {
- default = zkapissuer.components.exes."PaymentServer-exe";
+ default = ourpkgs.zkapissuer.components.exes."PaymentServer-exe";
type = lib.types.package;
example = lib.literalExample "pkgs.zkapissuer.components.exes.\"PaymentServer-exe\"";
description = ''
diff --git a/nixos/modules/private-storage.nix b/nixos/modules/private-storage.nix
index d3bc9e61..31b2cf2c 100644
--- a/nixos/modules/private-storage.nix
+++ b/nixos/modules/private-storage.nix
@@ -1,6 +1,6 @@
# A NixOS module which can instantiate a Tahoe-LAFS storage server in the
# preferred configuration for the Private Storage grid.
-{ pkgs, lib, config, ... }:
+{ pkgs, lib, ourpkgs, config, ... }:
let
# Grab the configuration for this module for convenient access below.
cfg = config.services.private-storage;
@@ -8,9 +8,6 @@ let
# TODO: This path copied from tahoe.nix.
tahoe-base = "/var/db/tahoe-lafs";
- # Our own nixpkgs fork:
- ourpkgs = import ../../nixpkgs-ps.nix {};
-
# The full path to the directory where the storage server will write
# incident reports.
incidents-dir = "${tahoe-base}/${storage-node-name}/logs/incidents";
diff --git a/nixos/modules/tests/private-storage.nix b/nixos/modules/tests/private-storage.nix
index 2687718b..680fd981 100644
--- a/nixos/modules/tests/private-storage.nix
+++ b/nixos/modules/tests/private-storage.nix
@@ -84,7 +84,11 @@ let
in
"${node}.succeed('set -eo pipefail; ${command} | systemd-cat')";
- pspkgs = import ../../../nixpkgs-ps.nix { };
+ ourpkgs-module = {
+ config = {
+ _module.args.ourpkgs = pkgs.callPackage ../../pkgs {};
+ }
+ };
in {
# https://nixos.org/nixos/manual/index.html#sec-nixos-tests
@@ -92,12 +96,13 @@ in {
nodes = rec {
# Get a machine where we can run a Tahoe-LAFS client node.
client =
- { config, pkgs, ... }:
- { environment.systemPackages = [
+ { config, pkgs, ourpkgs, ... }:
+ { imports = [ ourpkgs-module ];
+ environment.systemPackages = [
pkgs.daemonize
# A Tahoe-LAFS configuration capable of using the right storage
# plugin.
- pspkgs.privatestorage
+ ourpkgs.privatestorage
# Support for the tests we'll run.
(pkgs.python3.withPackages (ps: [ ps.requests ps.hyperlink ]))
];
diff --git a/nixos/modules/tests/tahoe.nix b/nixos/modules/tests/tahoe.nix
index a582accf..1d62c1ec 100644
--- a/nixos/modules/tests/tahoe.nix
+++ b/nixos/modules/tests/tahoe.nix
@@ -1,10 +1,15 @@
{ ... }:
let
- pspkgs = import ../../../nixpkgs-ps.nix { };
+ ourpkgs-module = {
+ config = {
+ _module.args.ourpkgs = pkgs.callPackage ../../pkgs {};
+ }
+ };
in {
nodes = {
storage = { config, pkgs, ... }: {
imports = [
+ ourpkgs-module
../tahoe.nix
];
diff --git a/nixos/pkgs/default.nix b/nixos/pkgs/default.nix
new file mode 100644
index 00000000..e2414c7a
--- /dev/null
+++ b/nixos/pkgs/default.nix
@@ -0,0 +1,14 @@
+{buildPlatform, hostPlatform, callPackage}:
+let
+ # Our own nixpkgs fork:
+ ourpkgs = import ../../nixpkgs-ps.nix {
+ localSystem = buildPlatform;
+ crossSystem = hostPlatform;
+ config = {};
+ overlays = [];
+ };
+in
+{
+ zkapissuer = callPackage ./zkapissuer {};
+ inherit (ourpkgs) privatestorage leasereport;
+}
--
GitLab