From 863e1ad56f1d5b5dcd40a576340a058cebf3545b Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Fri, 3 Apr 2020 20:15:22 -0400
Subject: [PATCH] Build fixes related to new python-challenge-bypass-ristretto
---
PaymentServer.cabal | 2 +-
nix/PaymentServer.nix | 2 +-
nix/challenge-bypass-ristretto-repo.nix | 6 +++---
nix/overlay.nix | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/PaymentServer.cabal b/PaymentServer.cabal
index c5a6aef..8e6fee7 100644
--- a/PaymentServer.cabal
+++ b/PaymentServer.cabal
@@ -44,7 +44,7 @@ library
, sqlite-simple
default-language: Haskell2010
ghc-options: -Wmissing-import-lists -Wunused-imports
- pkgconfig-depends: libchallenge_bypass_ristretto
+ pkgconfig-depends: libchallenge_bypass_ristretto_ffi
executable PaymentServer-exe
hs-source-dirs: app
diff --git a/nix/PaymentServer.nix b/nix/PaymentServer.nix
index 98421eb..5416280 100644
--- a/nix/PaymentServer.nix
+++ b/nix/PaymentServer.nix
@@ -78,7 +78,7 @@ in { system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }:
(hsPkgs."sqlite-simple" or (buildDepError "sqlite-simple"))
];
pkgconfig = [
- (pkgconfPkgs."libchallenge_bypass_ristretto" or (pkgConfDepError "libchallenge_bypass_ristretto"))
+ (pkgconfPkgs."libchallenge_bypass_ristretto_ffi" or (pkgConfDepError "libchallenge_bypass_ristretto_ffi"))
];
};
exes = {
diff --git a/nix/challenge-bypass-ristretto-repo.nix b/nix/challenge-bypass-ristretto-repo.nix
index c7e246f..007d257 100644
--- a/nix/challenge-bypass-ristretto-repo.nix
+++ b/nix/challenge-bypass-ristretto-repo.nix
@@ -4,6 +4,6 @@ in
pkgs.fetchFromGitHub {
owner = "LeastAuthority";
repo = "python-challenge-bypass-ristretto";
- rev = "f1a7cfab1a7f1bf8b3345c228c2183064889ad83";
- sha256 = "12myak2jwaisljs7bmx1vydgd0fnxvkaisk4zsf0kshwxrlnyh3x";
- }
\ No newline at end of file
+ rev = "v2020.04.03rc1";
+ sha256 = "03iqww9h7ff0pdi3mgg912a9s9yd8xbm4cx7iznv94611vxrcdzs";
+ }
diff --git a/nix/overlay.nix b/nix/overlay.nix
index 482cbb0..dc4b0ae 100644
--- a/nix/overlay.nix
+++ b/nix/overlay.nix
@@ -1,3 +1,3 @@
self: super: {
- challenge-bypass-ristretto = super.callPackage ./challenge-bypass-ristretto.nix { };
+ libchallenge_bypass_ristretto_ffi = super.callPackage ./challenge-bypass-ristretto.nix { };
}
--
GitLab