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

Update zkapauthorizer package to use mach-nix packaging.

parent c563f10f
No related branches found
No related tags found
2 merge requests!228merge develop into production,!166Update zkapauthorize to use mach-nix and nixos-21.05.
......@@ -4,23 +4,11 @@
#
# pkgs.callPackage ./nixos/pkgs
{buildPlatform, hostPlatform, callPackage}:
let
# Our own nixpkgs fork:
ourpkgs = import ../../nixpkgs-ps.nix {
# Ensure that the fork is configured for the same system
# as we were called with.
localSystem = buildPlatform;
crossSystem = hostPlatform;
# Ensure that configuration of the system where this runs
# doesn't leak into what we build.
# See https://github.com/NixOS/nixpkgs/issues/62513
config = {};
overlays = [];
};
in
{
inherit (ourpkgs) privatestorage;
leasereport = callPackage ./leasereport {};
# `privatestorage` is a derivation with a good Tahoe+ZKAP environment
# that is exposed by ZKAPAuthorizer.
privatestorage = callPackage ./privatestorage {};
zkap-spending-service = callPackage ./zkap-spending-service {};
zkapissuer = callPackage ./zkapissuer {};
}
{ fetchFromGitHub, callPackage, lib }:
let
repo-data = lib.importJSON ./repo.json;
repo = fetchFromGitHub (builtins.removeAttrs repo-data [ "branch" ]);
privatestorage = callPackage repo {};
in
privatestorage.privatestorage
{
"owner": "PrivateStorageio",
"branch": "main",
"repo": "ZKAPAuthorizer",
"rev": "c38c42362ac81dad25b4c5bcfe7a5cf0d49e1401",
"outputHashAlgo": "sha512",
"outputHash": "1pm44ihqn0m2zckmnzdxn7sj6v67m2kaqhpkpv9b48palyd8109ajh818aaj8rw6mlh2k9nrrza39khbqzh1910k8d6dk72ldqkqibl"
}
{ "name": "nixpkgs"
, "url": "https://github.com/PrivateStorageio/nixpkgs/archive/5ebd5af2d5c6caf23735c8c0e6bc27357fa8d2a8.tar.gz"
, "sha256": "1g2bvs8prqjskzv8s1qmh36k7rmj98jib0syqbrq02xxzw5dpqb4"
}
import (builtins.fetchTarball (builtins.fromJSON (builtins.readFile ./nixpkgs-ps.json)))
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