From e56ca3de6b5f87712fe5efe87167eb32f9c58630 Mon Sep 17 00:00:00 2001
From: Jonas Nick <jonasd.nick@gmail.com>
Date: Fri, 15 Dec 2023 09:36:53 +0000
Subject: [PATCH] joinmarket: remove custom secp256k1 package

python-bitcointx 1.1.4 is compatible with libsecp256k1 0.4.0 in nixpkgs.
Joinmarket uses libsecp256k1 only through python-bitcointx.
---
 pkgs/default.nix                 |  2 --
 pkgs/python-packages/default.nix |  2 +-
 pkgs/secp256k1/default.nix       | 46 --------------------------------
 3 files changed, 1 insertion(+), 49 deletions(-)
 delete mode 100644 pkgs/secp256k1/default.nix

diff --git a/pkgs/default.nix b/pkgs/default.nix
index c0e9fdf..327ed1a 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -21,8 +21,6 @@ let self = {
     mempool-backend
     mempool-frontend
     mempool-nginx-conf;
-  # The secp256k1 version used by joinmarket
-  secp256k1 = pkgs.callPackage ./secp256k1 { };
   trustedcoin = pkgs.callPackage ./trustedcoin { };
 
   pyPkgs = import ./python-packages self pkgs.python3;
diff --git a/pkgs/python-packages/default.nix b/pkgs/python-packages/default.nix
index 94a40aa..5b097ba 100644
--- a/pkgs/python-packages/default.nix
+++ b/pkgs/python-packages/default.nix
@@ -19,7 +19,7 @@ rec {
       # Packages only used by joinmarket
       bencoderpyx = callPackage ./bencoderpyx {};
       chromalog = callPackage ./chromalog {};
-      python-bitcointx = callPackage ./python-bitcointx { inherit (nbPkgs) secp256k1; };
+      python-bitcointx = callPackage ./python-bitcointx { inherit (self.pkgs) secp256k1; };
       runes = callPackage ./runes {};
       sha256 = callPackage ./sha256 {};
 
diff --git a/pkgs/secp256k1/default.nix b/pkgs/secp256k1/default.nix
deleted file mode 100644
index 1e5723d..0000000
--- a/pkgs/secp256k1/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, autoreconfHook
-}:
-
-stdenv.mkDerivation {
-  pname = "secp256k1";
-
-  version = "2021-12-03";
-
-  src = fetchFromGitHub {
-    owner = "bitcoin-core";
-    repo = "secp256k1";
-    rev = "490022745164b56439688b0fc04f9bd43578e5c3";
-    hash = "sha256-6CmGWiecthaGWSKX7VHWj5zvDAwVE9U5YOo9JRJWYwI=";
-  };
-
-  nativeBuildInputs = [ autoreconfHook ];
-
-  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; {
-    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";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ nixbitcoin ];
-    platforms = with platforms; unix;
-  };
-}