From 588e4a06d116ad750eff41f2edba80fb5747a366 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Thu, 31 Oct 2019 08:47:37 -0400
Subject: [PATCH] Make ristretto available to the build
---
nix/default.nix | 2 +-
nix/overlay.nix | 3 +++
nix/privacypass-repo.nix | 7 +++++++
nix/ristretto.nix | 5 +++++
4 files changed, 16 insertions(+), 1 deletion(-)
create mode 100644 nix/overlay.nix
create mode 100644 nix/privacypass-repo.nix
create mode 100644 nix/ristretto.nix
diff --git a/nix/default.nix b/nix/default.nix
index 9605b5b..349c836 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -1,4 +1,4 @@
-{ pkgs ? import <nixpkgs> {} }:
+{ pkgs ? import <nixpkgs> { overlays = [ (import ./overlay.nix) ]; } }:
let
# Pin a particular version of haskell.nix. The particular version isn't
diff --git a/nix/overlay.nix b/nix/overlay.nix
new file mode 100644
index 0000000..2673b39
--- /dev/null
+++ b/nix/overlay.nix
@@ -0,0 +1,3 @@
+self: super: {
+ ristretto = super.callPackage ./ristretto.nix { };
+}
diff --git a/nix/privacypass-repo.nix b/nix/privacypass-repo.nix
new file mode 100644
index 0000000..6b0c64c
--- /dev/null
+++ b/nix/privacypass-repo.nix
@@ -0,0 +1,7 @@
+{ fetchFromGitHub }:
+fetchFromGitHub {
+ owner = "LeastAuthority";
+ repo = "privacypass";
+ rev = "45855401e163f8e622bd93a5c5bce13de8c8510a";
+ sha256 = "sha256:15wv8vas6x8cdicylp0m632c916p7qxq1k4lnchr8c92lldp0rv7";
+}
diff --git a/nix/ristretto.nix b/nix/ristretto.nix
new file mode 100644
index 0000000..4e09128
--- /dev/null
+++ b/nix/ristretto.nix
@@ -0,0 +1,5 @@
+{ fetchFromGitHub, callPackage }:
+let
+ src = import ./privacypass-repo.nix { inherit fetchFromGitHub; };
+in
+ callPackage "${src}/ristretto.nix" { }
--
GitLab