Skip to content
Snippets Groups Projects
Commit 40896010 authored by Tom Prince's avatar Tom Prince
Browse files

Merge branch 'move-leasereport' into 'develop'

Don't use our nixpkgs fork for LeaseReport.

Closes privatestorageops#373

See merge request !192
parents b350a35b 3f6c53de
Branches
No related tags found
2 merge requests!228merge develop into production,!192Don't use our nixpkgs fork for LeaseReport.
Pipeline #1386 passed
......@@ -19,7 +19,8 @@ let
};
in
{
zkapissuer = callPackage ./zkapissuer {};
inherit (ourpkgs) privatestorage;
leasereport = callPackage ./leasereport {};
zkap-spending-service = callPackage ./zkap-spending-service {};
inherit (ourpkgs) privatestorage leasereport;
zkapissuer = callPackage ./zkapissuer {};
}
{ callPackage, fetchFromGitLab, lib }:
let
repo-data = lib.importJSON ./repo.json;
repo = fetchFromGitLab (builtins.removeAttrs repo-data [ "branch" ]);
LeaseReport = (import "${repo}/nix").LeaseReport;
in
LeaseReport.components.exes.LeaseReport
{
"owner": "privatestorage",
"repo": "LeaseReport",
"branch": "main",
"domain": "whetstone.privatestorage.io",
"rev": "3739ffde14e698f56118a444e6946edb736b6983",
"outputHashAlgo": "sha512",
"outputHash": "37b4hrhjghvza0bqvmngcdapqfjjjiv0gx90y0i4wvj72nf1xsh7g2kwpvjm4prpb5s7fxb50x971xfw4sqpwwsk2zdll4nbl5764ij"
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment