From 34bbcd7c9a29109164f27ff1d10111e7d2aa5396 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 16 Jul 2021 23:37:41 +0200 Subject: [PATCH] secp256k1: replace local version with nixpkgs --- pkgs/default.nix | 1 - pkgs/pinned.nix | 1 + pkgs/secp256k1/default.nix | 26 -------------------------- 3 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 pkgs/secp256k1/default.nix diff --git a/pkgs/default.nix b/pkgs/default.nix index fb710c7f1..091497ee3 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -11,7 +11,6 @@ let self = { extra-container = pkgs.callPackage ./extra-container { }; clightning-plugins = import ./clightning-plugins pkgs self.nbPython3Packages; clboss = pkgs.callPackage ./clboss { }; - secp256k1 = pkgs.callPackage ./secp256k1 { }; nbPython3Packages = (pkgs.python3.override { packageOverrides = import ./python-packages self; diff --git a/pkgs/pinned.nix b/pkgs/pinned.nix index 67e3dc16e..a2134a727 100644 --- a/pkgs/pinned.nix +++ b/pkgs/pinned.nix @@ -17,6 +17,7 @@ in btcpayserver electrs hwi + secp256k1 lightning-loop lightning-pool; diff --git a/pkgs/secp256k1/default.nix b/pkgs/secp256k1/default.nix deleted file mode 100644 index 2f9f28fb5..000000000 --- a/pkgs/secp256k1/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: - -stdenv.mkDerivation { - pname = "secp256k1"; - - version = "2019-10-11"; - - src = fetchFromGitHub { - owner = "bitcoin-core"; - repo = "secp256k1"; - rev = "0d9540b13ffcd7cd44cc361b8744b93d88aa76ba"; - sha256 = "05zwhv8ffzrfdzqbsb4zm4kjdbjxqy5jh9r83fic0qpk2mkvc2i2"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - configureFlags = ["--enable-module-recovery" "--disable-jni" "--enable-experimental" "--enable-module-ecdh" "--enable-benchmark=no" ]; - - meta = with lib; { - description = "Optimized C library for EC operations on curve secp256k1"; - homepage = "https://github.com/bitcoin-core/secp256k1"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ nixbitcoin ]; - platforms = with platforms; unix; - }; -}