From 3806636bda674f0eaee8ce9ba67594ad5b011123 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Thu, 13 Jan 2022 14:23:24 -0500
Subject: [PATCH] use the niv source instead of this other thing
---
nix/challenge-bypass-ristretto-repo.nix | 9 ---------
nix/challenge-bypass-ristretto.nix | 9 ++++++---
2 files changed, 6 insertions(+), 12 deletions(-)
delete mode 100644 nix/challenge-bypass-ristretto-repo.nix
diff --git a/nix/challenge-bypass-ristretto-repo.nix b/nix/challenge-bypass-ristretto-repo.nix
deleted file mode 100644
index 1357efe..0000000
--- a/nix/challenge-bypass-ristretto-repo.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-let
- pkgs = import <nixpkgs> {};
-in
- pkgs.fetchFromGitHub {
- owner = "LeastAuthority";
- repo = "python-challenge-bypass-ristretto";
- rev = "v2021.07.12";
- sha256 = "16af1qmx7srhvcc936x7hl2bz50hafm39311dbzqam9ms1i5q89j";
- }
diff --git a/nix/challenge-bypass-ristretto.nix b/nix/challenge-bypass-ristretto.nix
index dc08608..69599b0 100644
--- a/nix/challenge-bypass-ristretto.nix
+++ b/nix/challenge-bypass-ristretto.nix
@@ -1,6 +1,9 @@
# Provide the ffi bindings to the Rust challenge-bypass-ristretto library.
-{ fetchFromGitHub, callPackage }:
let
- src = import ./challenge-bypass-ristretto-repo.nix;
+ sources = import ./sources.nix;
in
- import "${src}/default-challenge-bypass-ristretto-ffi.nix" { }
+{ fetchFromGitHub
+, callPackage
+, libchallenge_bypass_ristretto_ffi_repo ? sources.libchallenge_bypass_ristretto_ffi
+}:
+ import "${libchallenge_bypass_ristretto_ffi_repo}/default-challenge-bypass-ristretto-ffi.nix" { }
--
GitLab