greg/nix-bitcoin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge fort-nix/nix-bitcoin#459: joinmarket: bump secp256k1 to version used upstream

Browse Source 
6629e9a66f joinmarket: bump secp256k1 to version used upstream (nixbitcoin)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 6629e9a66f
  jonasnick:
    ACK 6629e9a66f

Tree-SHA512: f45d46ce42d18e5e0d8cdfa956c975e5421909306d45e62f8d43a40f65ece33dbae5fb5ab2ec5a96fc5e7142314b67f846f5cfcc500bbba531c502a570ef6b68
This commit is contained in:
Jonas Nick 2022-03-06 14:45:11 +00:00
commit 96de7867cf
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/default.nix
View File

@ -12,6 +12,7 @@ let self = {
joinmarket = pkgs.callPackage ./joinmarket { inherit (self) nbPython3Packages; }; joinmarket = pkgs.callPackage ./joinmarket { inherit (self) nbPython3Packages; };
liquid-swap = pkgs.python3Packages.callPackage ./liquid-swap { }; liquid-swap = pkgs.python3Packages.callPackage ./liquid-swap { };
rtl = pkgs.callPackage ./rtl { }; rtl = pkgs.callPackage ./rtl { };
# The secp256k1 version used by joinmarket
secp256k1 = pkgs.callPackage ./secp256k1 { }; secp256k1 = pkgs.callPackage ./secp256k1 { };
spark-wallet = pkgs.callPackage ./spark-wallet { }; spark-wallet = pkgs.callPackage ./spark-wallet { };

34
pkgs/secp256k1/default.nix
View File

@ -1,26 +1,46 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook }: { lib
, stdenv
, fetchFromGitHub
, autoreconfHook
}:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "secp256k1"; pname = "secp256k1";
version = "2019-10-11"; version = "2021-12-03";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bitcoin-core"; owner = "bitcoin-core";
repo = "secp256k1"; repo = "secp256k1";
rev = "0d9540b13ffcd7cd44cc361b8744b93d88aa76ba"; rev = "490022745164b56439688b0fc04f9bd43578e5c3";
sha256 = "05zwhv8ffzrfdzqbsb4zm4kjdbjxqy5jh9r83fic0qpk2mkvc2i2"; hash = "sha256-6CmGWiecthaGWSKX7VHWj5zvDAwVE9U5YOo9JRJWYwI=";
}; };
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
configureFlags = ["--enable-module-recovery" "--disable-jni" "--enable-experimental" "--enable-module-ecdh" "--enable-benchmark=no" ]; configureFlags = [
"--enable-benchmark=no"
"--enable-exhaustive-tests=no"
"--enable-experimental"
"--enable-module-ecdh"
"--enable-module-recovery"
"--enable-module-schnorrsig"
];
doCheck = true;
checkPhase = "./tests";
meta = with lib; { meta = with lib; {
description = "Optimized C library for EC operations on curve secp256k1"; description = "Optimized C library for EC operations on curve secp256k1";
longDescription = ''
Optimized C library for EC operations on curve secp256k1. Part of
Bitcoin Core. This library is a work in progress and is being used
to research best practices. Use at your own risk.
'';
homepage = "https://github.com/bitcoin-core/secp256k1"; homepage = "https://github.com/bitcoin-core/secp256k1";
license = licenses.mit; license = with licenses; [ mit ];
maintainers = with maintainers; [ nixbitcoin ]; maintainers = with maintainers; [ nixbitcoin ];
platforms = platforms.unix; platforms = with platforms; unix;
}; };
} }