From 0b9ceb6b78ce7f90e6d1f4e2e885eb759adfc6d6 Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@private.storage>
Date: Thu, 12 Aug 2021 13:33:33 +0000
Subject: [PATCH] Get PS packages from PS packages.
---
nixos/modules/tests/private-storage.nix | 5 ++++-
nixos/modules/tests/tahoe.nix | 7 +++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/nixos/modules/tests/private-storage.nix b/nixos/modules/tests/private-storage.nix
index 353abc89..044a132b 100644
--- a/nixos/modules/tests/private-storage.nix
+++ b/nixos/modules/tests/private-storage.nix
@@ -87,6 +87,9 @@ let
# succeed() is not success but 1 is.
1;
";
+
+ pspkgs = import ../../../nixpkgs-ps.nix { };
+
in {
# https://nixos.org/nixos/manual/index.html#sec-nixos-tests
# https://nixos.mayflower.consulting/blog/2019/07/11/leveraging-nixos-tests-in-your-project/
@@ -98,7 +101,7 @@ in {
pkgs.daemonize
# A Tahoe-LAFS configuration capable of using the right storage
# plugin.
- pkgs.privatestorage
+ pspkgs.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 df7acdf3..f226c7c6 100644
--- a/nixos/modules/tests/tahoe.nix
+++ b/nixos/modules/tests/tahoe.nix
@@ -1,4 +1,7 @@
-{ ... }: {
+{ ... }:
+ let
+ pspkgs = import ../../../nixpkgs-ps.nix { };
+ in {
nodes = {
storage = { config, pkgs, ... }: {
imports = [
@@ -6,7 +9,7 @@
];
services.tahoe.nodes.storage = {
- package = pkgs.privatestorage;
+ package = pspkgs.privatestorage;
sections = {
node = {
nickname = "storage";
--
GitLab