diff --git a/nixos/pkgs/default.nix b/nixos/pkgs/default.nix index 264488ad1558ad8f5b6f87d9c3bd5bfc20e39c44..404b067cb6e0879e9d683507521632b91cbebf58 100644 --- a/nixos/pkgs/default.nix +++ b/nixos/pkgs/default.nix @@ -19,8 +19,8 @@ let }; in { - zkapissuer = callPackage ./zkapissuer {}; - inherit (ourpkgs) leasereport; + leasereport = callPackage ./leasereport {}; zkap-spending-service = callPackage ./zkap-spending-service {}; privatestorage = callPackage ./privatestorage.nix {}; + zkapissuer = callPackage ./zkapissuer {}; } diff --git a/nixos/pkgs/leasereport/default.nix b/nixos/pkgs/leasereport/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7b028ab35c6cf9f78b9a11b0c6dafe1a82d5cb84 --- /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 0000000000000000000000000000000000000000..da85f654d6d52e9680cf1dec90f0aaccd59e8e93 --- /dev/null +++ b/nixos/pkgs/leasereport/repo.json @@ -0,0 +1,9 @@ +{ + "owner": "tomprince", + "repo": "LeaseReport", + "branch": "update", + "domain": "whetstone.privatestorage.io", + "rev": "8cea8a64d3e551917dae564371556d35845b861e", + "outputHashAlgo": "sha512", + "outputHash": "37b4hrhjghvza0bqvmngcdapqfjjjiv0gx90y0i4wvj72nf1xsh7g2kwpvjm4prpb5s7fxb50x971xfw4sqpwwsk2zdll4nbl5764ij" +}