From 8eb23fd6cebba615e2314293d349413d032c1417 Mon Sep 17 00:00:00 2001
From: Tom Prince <tom.prince@private.storage>
Date: Tue, 7 Sep 2021 15:39:00 -0600
Subject: [PATCH] Expose only the `PaymentServer` executable via
ourpkgs.zkapissuer.
---
nixos/modules/issuer.nix | 4 ++--
nixos/pkgs/zkapissuer/default.nix | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/nixos/modules/issuer.nix b/nixos/modules/issuer.nix
index 00e9c0c8..605cb93b 100644
--- a/nixos/modules/issuer.nix
+++ b/nixos/modules/issuer.nix
@@ -6,7 +6,7 @@ in {
options = {
services.private-storage-issuer.enable = lib.mkEnableOption "PrivateStorage ZKAP Issuer Service";
services.private-storage-issuer.package = lib.mkOption {
- default = ourpkgs.zkapissuer.components.exes."PaymentServer-exe";
+ default = ourpkgs.zkapissuer;
type = lib.types.package;
example = lib.literalExample "pkgs.zkapissuer.components.exes.\"PaymentServer-exe\"";
description = ''
@@ -192,7 +192,7 @@ in {
"--stripe-endpoint-scheme ${cfg.stripeEndpointScheme} " +
"--stripe-endpoint-port ${toString cfg.stripeEndpointPort}";
in
- "${cfg.package}/bin/PaymentServer-exe ${originArgs} ${issuerArgs} ${databaseArgs} ${httpArgs} ${stripeArgs}";
+ "${cfg.package.exePath} ${originArgs} ${issuerArgs} ${databaseArgs} ${httpArgs} ${stripeArgs}";
};
# PaymentServer runs as this user and group by default
diff --git a/nixos/pkgs/zkapissuer/default.nix b/nixos/pkgs/zkapissuer/default.nix
index 27f5fa3d..b4f90d35 100644
--- a/nixos/pkgs/zkapissuer/default.nix
+++ b/nixos/pkgs/zkapissuer/default.nix
@@ -1,5 +1,6 @@
{ callPackage }:
let
repo = callPackage ./repo.nix { };
+ PaymentServer = (import "${repo}/nix").PaymentServer;
in
- (import "${repo}/nix").PaymentServer
+ PaymentServer.components.exes."PaymentServer-exe"
--
GitLab