From 3f6c53dec900728db6b7896723fc67c6b8e621f1 Mon Sep 17 00:00:00 2001
From: Tom Prince <tom.prince@private.storage>
Date: Fri, 1 Oct 2021 17:12:06 -0600
Subject: [PATCH] Don't use our nixpkgs fork for LeaseReport.
---
nixos/pkgs/default.nix | 5 +++--
nixos/pkgs/leasereport/default.nix | 8 ++++++++
nixos/pkgs/leasereport/repo.json | 9 +++++++++
3 files changed, 20 insertions(+), 2 deletions(-)
create mode 100644 nixos/pkgs/leasereport/default.nix
create mode 100644 nixos/pkgs/leasereport/repo.json
diff --git a/nixos/pkgs/default.nix b/nixos/pkgs/default.nix
index efcff083..619f69e9 100644
--- a/nixos/pkgs/default.nix
+++ b/nixos/pkgs/default.nix
@@ -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 {};
}
diff --git a/nixos/pkgs/leasereport/default.nix b/nixos/pkgs/leasereport/default.nix
new file mode 100644
index 00000000..7b028ab3
--- /dev/null
+++ b/nixos/pkgs/leasereport/default.nix
@@ -0,0 +1,8 @@
+{ 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
+
diff --git a/nixos/pkgs/leasereport/repo.json b/nixos/pkgs/leasereport/repo.json
new file mode 100644
index 00000000..759814a1
--- /dev/null
+++ b/nixos/pkgs/leasereport/repo.json
@@ -0,0 +1,9 @@
+{
+ "owner": "privatestorage",
+ "repo": "LeaseReport",
+ "branch": "main",
+ "domain": "whetstone.privatestorage.io",
+ "rev": "3739ffde14e698f56118a444e6946edb736b6983",
+ "outputHashAlgo": "sha512",
+ "outputHash": "37b4hrhjghvza0bqvmngcdapqfjjjiv0gx90y0i4wvj72nf1xsh7g2kwpvjm4prpb5s7fxb50x971xfw4sqpwwsk2zdll4nbl5764ij"
+}
--
GitLab