Skip to content
Snippets Groups Projects
Commit 0b9ceb6b authored by Florian Sesser's avatar Florian Sesser
Browse files

Get PS packages from PS packages.

parent a2ad3801
No related branches found
No related tags found
3 merge requests!180merge develop into production,!177merge develop into staging,!151Upgrade system test software and port system tests from Perl to Python
...@@ -87,6 +87,9 @@ let ...@@ -87,6 +87,9 @@ let
# succeed() is not success but 1 is. # succeed() is not success but 1 is.
1; 1;
"; ";
pspkgs = import ../../../nixpkgs-ps.nix { };
in { in {
# https://nixos.org/nixos/manual/index.html#sec-nixos-tests # https://nixos.org/nixos/manual/index.html#sec-nixos-tests
# https://nixos.mayflower.consulting/blog/2019/07/11/leveraging-nixos-tests-in-your-project/ # https://nixos.mayflower.consulting/blog/2019/07/11/leveraging-nixos-tests-in-your-project/
...@@ -98,7 +101,7 @@ in { ...@@ -98,7 +101,7 @@ in {
pkgs.daemonize pkgs.daemonize
# A Tahoe-LAFS configuration capable of using the right storage # A Tahoe-LAFS configuration capable of using the right storage
# plugin. # plugin.
pkgs.privatestorage pspkgs.privatestorage
# Support for the tests we'll run. # Support for the tests we'll run.
(pkgs.python3.withPackages (ps: [ ps.requests ps.hyperlink ])) (pkgs.python3.withPackages (ps: [ ps.requests ps.hyperlink ]))
]; ];
......
{ ... }: { { ... }:
let
pspkgs = import ../../../nixpkgs-ps.nix { };
in {
nodes = { nodes = {
storage = { config, pkgs, ... }: { storage = { config, pkgs, ... }: {
imports = [ imports = [
...@@ -6,7 +9,7 @@ ...@@ -6,7 +9,7 @@
]; ];
services.tahoe.nodes.storage = { services.tahoe.nodes.storage = {
package = pkgs.privatestorage; package = pspkgs.privatestorage;
sections = { sections = {
node = { node = {
nickname = "storage"; nickname = "storage";
......
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