diff --git a/nixos/modules/pspkgs.nix b/nixos/modules/pspkgs.nix index 189778e02e47dede02139fdcd8f3f3be4fa273cd..e1d9b3e8ba0a8da61b221377071573b8c958d299 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 75433f0fc10663aecbd16593fea9ba40073281fa..c606b47bcfa267fba29c23fb4577ea79fd2de03b 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 dc50d589f36da17d6bf24fbb6b441fc326b6d13f..44947fc2ba9c3e49c0f97d15a5a0b7b7b92ed45b 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 fe12cb60a0ad4edaf6e499be0b581a6d70fb5996..95fc177419e26a88cb0156e1ad32fe2127746ef9 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" { }