From ba349cf98db138f798fee1b56b24f49e660623d1 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Mon, 6 Apr 2020 15:40:13 -0400
Subject: [PATCH] Update the stack config to point at the updated package too
---
ristretto.nix | 10 ----------
stack-shell.nix | 4 ++--
2 files changed, 2 insertions(+), 12 deletions(-)
delete mode 100644 ristretto.nix
diff --git a/ristretto.nix b/ristretto.nix
deleted file mode 100644
index 8af584c..0000000
--- a/ristretto.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ fetchFromGitHub, callPackage }:
-let
- src = fetchFromGitHub {
- owner = "LeastAuthority";
- repo = "privacypass";
- rev = "45855401e163f8e622bd93a5c5bce13de8c8510a";
- sha256 = "15wv8vas6x8cdicylp0m632c916p7qxq1k4lnchr8c92lldp0rv7";
- };
-in
- callPackage "${src}/ristretto.nix" { }
diff --git a/stack-shell.nix b/stack-shell.nix
index 8800cbb..3fb4bf7 100644
--- a/stack-shell.nix
+++ b/stack-shell.nix
@@ -4,7 +4,7 @@
let
pkgs = import <nixpkgs> { };
# Get our Ristretto bindings.
- ristretto = pkgs.callPackage ./ristretto.nix { };
+ libchallenge_bypass_ristretto = pkgs.callPackage ./nix/challenge-bypass-ristretto.nix { };
in
# This is what you're supposed to call in a stack shell-file. I don't
# *really* know what it does but I know it works...
@@ -13,5 +13,5 @@ in
name = "PrivacyPass";
# zlib is a common dependency of many of our dependencies. and we put our
# ristretto library in as well.
- buildInputs = [ pkgs.zlib ristretto ];
+ buildInputs = [ pkgs.zlib libchallenge_bypass_ristretto ];
}
--
GitLab