From 7c17cf3a494b9bbc7613d22a8fef1b59dd549efa Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Fri, 27 Sep 2019 12:20:09 -0400
Subject: [PATCH] Change zkapauthorizer-repo to a form easier to work with
This format for the file can be generated automatically using something like:
nix-prefetch-github \
--nix \
--rev $(git rev-parse HEAD) \
PrivateStorageio ZKAPAuthorizer > /path/to/zkapauthorizer-repo.nix
run in in a checkout of ZKAPAuthorizer
---
nixos/modules/pspkgs.nix | 3 +--
nixos/modules/zkap-overlay.nix | 3 +--
nixos/pkgs/zkapauthorizer-repo.nix | 16 +++++++++-------
nixos/pkgs/zkapauthorizer.nix | 4 ++--
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/nixos/modules/pspkgs.nix b/nixos/modules/pspkgs.nix
index 189778e0..e1d9b3e8 100644
--- a/nixos/modules/pspkgs.nix
+++ b/nixos/modules/pspkgs.nix
@@ -4,8 +4,7 @@
{ pkgs }:
import pkgs.path {
overlays = [
- # needs fetchFromGitHub to check out zkapauthorizer
- (pkgs.callPackage ./zkap-overlay.nix { })
+ (import ./zkap-overlay.nix)
(import ./overlays.nix)
];
}
diff --git a/nixos/modules/zkap-overlay.nix b/nixos/modules/zkap-overlay.nix
index 75433f0f..c606b47b 100644
--- a/nixos/modules/zkap-overlay.nix
+++ b/nixos/modules/zkap-overlay.nix
@@ -1,5 +1,4 @@
-{ fetchFromGitHub }:
let
- zkapauthorizer = import ../pkgs/zkapauthorizer-repo.nix { inherit fetchFromGitHub; };
+ zkapauthorizer = import ../pkgs/zkapauthorizer-repo.nix;
in
import "${zkapauthorizer}/overlays.nix"
diff --git a/nixos/pkgs/zkapauthorizer-repo.nix b/nixos/pkgs/zkapauthorizer-repo.nix
index dc50d589..44947fc2 100644
--- a/nixos/pkgs/zkapauthorizer-repo.nix
+++ b/nixos/pkgs/zkapauthorizer-repo.nix
@@ -1,7 +1,9 @@
-{ fetchFromGitHub }:
-fetchFromGitHub {
- owner = "PrivateStorageio";
- repo = "ZKAPAuthorizer";
- rev = "36dd4c2cffa2e9df651dda4c9ac8977bafe2ed64";
- sha256 = "sha256:1i5nli73gk56r5brmimcd97dkf7wd4mf6viw4vbcssa7xj6s84af";
-}
+let
+ pkgs = import <nixpkgs> {};
+in
+ pkgs.fetchFromGitHub {
+ owner = "PrivateStorageio";
+ repo = "ZKAPAuthorizer";
+ rev = "00387ea1d02a5800ff4480a3a177ecc87b34532f";
+ sha256 = "053bzpq68fz1y0qzyryxjmbpvpzshhxhkp404pviqdi18xyqgzyc";
+ }
\ No newline at end of file
diff --git a/nixos/pkgs/zkapauthorizer.nix b/nixos/pkgs/zkapauthorizer.nix
index fe12cb60..95fc1774 100644
--- a/nixos/pkgs/zkapauthorizer.nix
+++ b/nixos/pkgs/zkapauthorizer.nix
@@ -1,5 +1,5 @@
-{ fetchFromGitHub, python27Packages }:
+{ python27Packages }:
let
- zkapauthorizer = import ./zkapauthorizer-repo.nix { inherit fetchFromGitHub; };
+ zkapauthorizer = import ./zkapauthorizer-repo.nix;
in
python27Packages.callPackage "${zkapauthorizer}/zkapauthorizer.nix" { }
--
GitLab