From 44a96c5af726d829c1fb7c175a12f1624c5ccd9d Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Mon, 6 Apr 2020 14:40:54 -0400
Subject: [PATCH] Switch to newer python-challenge-bypass-ristretto repo
And various associated changes necessary to keep the build working
---
.circleci/config.yml | 14 +++++++-------
PaymentServer.cabal | 2 +-
nix/PaymentServer.nix | 16 ++++++++--------
nix/challenge-bypass-ristretto-repo.nix | 9 +++++++++
nix/challenge-bypass-ristretto.nix | 5 +++++
nix/overlay.nix | 2 +-
nix/ristretto.nix | 5 -----
7 files changed, 31 insertions(+), 22 deletions(-)
create mode 100644 nix/challenge-bypass-ristretto-repo.nix
create mode 100644 nix/challenge-bypass-ristretto.nix
delete mode 100644 nix/ristretto.nix
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7c8895c..0e713d6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -72,17 +72,17 @@ jobs:
name: "Restore Nix Store Paths"
keys:
# Construct cache keys that allow sharing as long as nixpkgs and
- # the Ristretto library are the same.
+ # the python-challenge-bypass-ristretto library are the same.
#
- # If the Ristretto library changes, we have to rebuild it so we
- # may as well throw away the part of the cache with the old build
- # and make a new one with the new build so we don't have to
- # rebuild it *again* next time.
+ # If python-challenge-bypass-ristretto changes, we have to rebuild
+ # it so we may as well throw away the part of the cache with the
+ # old build and make a new one with the new build so we don't have
+ # to rebuild it *again* next time.
#
# If nixpkgs changes then potentially a lot of cached packages for
# the base system will be invalidated so we may as well drop them
# and make a new cache with the new packages.
- - paymentserver-nix-store-v2-{{ checksum "nixpkgs.rev" }}-{{ checksum "ristretto.nix" }}
+ - paymentserver-nix-store-v2-{{ checksum "nixpkgs.rev" }}-{{ checksum "nix/challenge-bypass-ristretto-repo.nix" }}
- paymentserver-nix-store-v2-{{ checksum "nixpkgs.rev" }}-
- paymentserver-nix-store-v2-
@@ -157,7 +157,7 @@ jobs:
- save_cache:
name: "Cache Nix Store Paths"
- key: paymentserver-nix-store-v2-{{ checksum "nixpkgs.rev" }}-{{ checksum "ristretto.nix" }}
+ key: paymentserver-nix-store-v2-{{ checksum "nixpkgs.rev" }}-{{ checksum "nix/challenge-bypass-ristretto-repo.nix" }}
paths:
- "/nix"
diff --git a/PaymentServer.cabal b/PaymentServer.cabal
index dd51a39..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: 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 0816f96..5416280 100644
--- a/nix/PaymentServer.nix
+++ b/nix/PaymentServer.nix
@@ -2,19 +2,19 @@ let
buildDepError = pkg:
builtins.throw ''
The Haskell package set does not contain the package: ${pkg} (build dependency).
-
+
If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix.
'';
sysDepError = pkg:
builtins.throw ''
The Nixpkgs package set does not contain the package: ${pkg} (system dependency).
-
+
You may need to augment the system package mapping in haskell.nix so that it can be found.
'';
pkgConfDepError = pkg:
builtins.throw ''
The pkg-conf packages does not contain the package: ${pkg} (pkg-conf dependency).
-
+
You may need to augment the pkg-conf package mapping in haskell.nix so that it can be found.
'';
exeDepError = pkg:
@@ -24,16 +24,16 @@ let
legacyExeDepError = pkg:
builtins.throw ''
The Haskell package set does not contain the package: ${pkg} (executable dependency).
-
+
If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix.
'';
buildToolDepError = pkg:
builtins.throw ''
Neither the Haskell package set or the Nixpkgs package set contain the package: ${pkg} (build tool dependency).
-
+
If this is a system dependency:
You may need to augment the system package mapping in haskell.nix so that it can be found.
-
+
If this is a Haskell dependency:
If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix.
'';
@@ -78,7 +78,7 @@ in { system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }:
(hsPkgs."sqlite-simple" or (buildDepError "sqlite-simple"))
];
pkgconfig = [
- (pkgconfPkgs."ristretto" or (pkgConfDepError "ristretto"))
+ (pkgconfPkgs."libchallenge_bypass_ristretto_ffi" or (pkgConfDepError "libchallenge_bypass_ristretto_ffi"))
];
};
exes = {
@@ -97,4 +97,4 @@ in { system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }:
};
};
};
- } // rec { src = (pkgs.lib).mkDefault ../.; }
\ No newline at end of file
+ } // rec { src = (pkgs.lib).mkDefault ../.; }
diff --git a/nix/challenge-bypass-ristretto-repo.nix b/nix/challenge-bypass-ristretto-repo.nix
new file mode 100644
index 0000000..007d257
--- /dev/null
+++ b/nix/challenge-bypass-ristretto-repo.nix
@@ -0,0 +1,9 @@
+let
+ pkgs = import <nixpkgs> {};
+in
+ pkgs.fetchFromGitHub {
+ owner = "LeastAuthority";
+ repo = "python-challenge-bypass-ristretto";
+ rev = "v2020.04.03rc1";
+ sha256 = "03iqww9h7ff0pdi3mgg912a9s9yd8xbm4cx7iznv94611vxrcdzs";
+ }
diff --git a/nix/challenge-bypass-ristretto.nix b/nix/challenge-bypass-ristretto.nix
new file mode 100644
index 0000000..cded558
--- /dev/null
+++ b/nix/challenge-bypass-ristretto.nix
@@ -0,0 +1,5 @@
+{ fetchFromGitHub, callPackage }:
+let
+ src = import ./challenge-bypass-ristretto-repo.nix;
+in
+ callPackage "${src}/challenge-bypass-ristretto.nix" { }
diff --git a/nix/overlay.nix b/nix/overlay.nix
index 2673b39..dc4b0ae 100644
--- a/nix/overlay.nix
+++ b/nix/overlay.nix
@@ -1,3 +1,3 @@
self: super: {
- ristretto = super.callPackage ./ristretto.nix { };
+ libchallenge_bypass_ristretto_ffi = super.callPackage ./challenge-bypass-ristretto.nix { };
}
diff --git a/nix/ristretto.nix b/nix/ristretto.nix
deleted file mode 100644
index 4e09128..0000000
--- a/nix/ristretto.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ fetchFromGitHub, callPackage }:
-let
- src = import ./privacypass-repo.nix { inherit fetchFromGitHub; };
-in
- callPackage "${src}/ristretto.nix" { }
--
GitLab