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

Adopt the Nix packaging from our nixpkgs fork and use it

parent 4c7ce808
No related branches found
No related tags found
3 merge requests!180merge develop into production,!177merge develop into staging,!158Adopt the Nix packaging from our nixpkgs fork and use it
Pipeline #988 failed
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,7 @@
# ZKAPs. # ZKAPs.
{ lib, pkgs, config, ... }: let { lib, pkgs, config, ... }: let
cfg = config.services.private-storage-issuer; cfg = config.services.private-storage-issuer;
# Our own nixpkgs fork: zkapissuer = import ../pkgs/zkapissuer {};
ourpkgs = import ../../nixpkgs-ps.nix {};
in { in {
imports = [ imports = [
# Give it a good SSH configuration. # Give it a good SSH configuration.
...@@ -13,7 +12,7 @@ in { ...@@ -13,7 +12,7 @@ in {
options = { options = {
services.private-storage-issuer.enable = lib.mkEnableOption "PrivateStorage ZKAP Issuer Service"; services.private-storage-issuer.enable = lib.mkEnableOption "PrivateStorage ZKAP Issuer Service";
services.private-storage-issuer.package = lib.mkOption { services.private-storage-issuer.package = lib.mkOption {
default = ourpkgs.zkapissuer.components.exes."PaymentServer-exe"; default = zkapissuer.components.exes."PaymentServer-exe";
type = lib.types.package; type = lib.types.package;
example = lib.literalExample "pkgs.zkapissuer.components.exes.\"PaymentServer-exe\""; example = lib.literalExample "pkgs.zkapissuer.components.exes.\"PaymentServer-exe\"";
description = '' description = ''
......
{ fetchFromGitHub }:
fetchFromGitHub {
owner = "PrivateStorageio";
repo = "PaymentServer";
rev = "2ca189c51a5314eb476d1866d28ee483701af6f5";
sha256 = "1sb53lvi6alwdjhx4cv1gg7ywkqf18n1zjgdj3nigq3vjwxhdcpb";
}
{ callPackage }:
let
repo = callPackage ./repo.nix { };
in
(import "${repo}/nix").PaymentServer
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