csecp256k1

commit 94b99b247ad2c53eea032a81b7e20b7b0b2bac0a
parent a64815c100d1c09f70118ee85cb737e6ae7c9849
Author: Jared Tobin <jared@jtobin.io>
Date:   Sun, 25 Feb 2024 09:07:03 +0400

Flatten cabal projects structure.

Diffstat:
M
ppad-csecp256k1.cabal
 | 
59
++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
D
secp256k1-sys/secp256k1-sys.cabal
 | 
62
--------------------------------------------------------------

2 files changed, 54 insertions(+), 67 deletions(-)
diff --git a/ppad-csecp256k1.cabal b/ppad-csecp256k1.cabal
@@ -6,18 +6,67 @@ description:        secp256k1 bindings.
 license:            MIT
 license-file:       LICENSE
 author:             Jared Tobin
-maintainer:         jared@jtobin.io
+maintainer:         jared@ppad.tech
 category:           Cryptography
 build-type:         Simple
 
-common warnings
-  ghc-options: -Wall
+library secp256k1-sys
+  default-language: Haskell2010
+  hs-source-dirs:   secp256k1-sys/lib
+
+  exposed-modules:
+      Crypto.Secp256k1.Internal
+
+  build-depends:
+      base
+    , bytestring
+
+  ghc-options:
+      -Wall -optc -Wno-implicit-function-declaration
+
+  include-dirs:
+      secp256k1-sys/depend/secp256k1/include/
+
+  includes:
+      secp256k1.h
+    , secp256k1_ecdh.h
+    , secp256k1_extrakeys.h
+    , secp256k1_schnorrsig.h
+
+  c-sources:
+      secp256k1-sys/depend/secp256k1/src/precomputed_ecmult_gen.c
+    , secp256k1-sys/depend/secp256k1/src/precomputed_ecmult.c
+    , secp256k1-sys/depend/secp256k1/src/secp256k1.c
+
+  cc-options:
+    -DENABLE_MODULE_ECDH
+    -DENABLE_MODULE_EXTRAKEYS
+    -DENABLE_MODULE_SCHNORRSIG
+
+test-suite secp256k1-sys-tests
+  type:                exitcode-stdio-1.0
+  default-language:    Haskell2010
+  hs-source-dirs:      secp256k1-sys/test
+  main-is:             Main.hs
+
+  ghc-options:
+    -rtsopts -Wall
+
+  build-depends:
+      base
+    , bytestring
+    , entropy
+    , secp256k1-sys
+    , tasty
+    , tasty-hunit
 
 library
-  import:           warnings
   default-language: Haskell2010
   hs-source-dirs:   lib
+  ghc-options:
+      -Wall
   exposed-modules:
   build-depends:
-      base ^>= 4.18.2.0
+      base
+    , secp256k1-sys
 
diff --git a/secp256k1-sys/secp256k1-sys.cabal b/secp256k1-sys/secp256k1-sys.cabal
@@ -1,62 +0,0 @@
-cabal-version:      3.0
-name:               secp256k1-sys
-version:            0.1.0
-synopsis:           Internal secp256k1 bindings
-description:        Internal secp256k1 bindings.
-license:            MIT
-license-file:       LICENSE
-author:             Jared Tobin
-maintainer:         jared@ppad.tech
-category:           Cryptography
-build-type:         Simple
-
-library
-  default-language: Haskell2010
-  hs-source-dirs:   lib
-
-  exposed-modules:
-      Crypto.Secp256k1.Internal
-
-  build-depends:
-      base
-    , bytestring
-
-  ghc-options:
-      -Wall -optc -Wno-implicit-function-declaration
-
-  include-dirs:
-      depend/secp256k1/include/
-
-  includes:
-      secp256k1.h
-    , secp256k1_ecdh.h
-    , secp256k1_extrakeys.h
-    , secp256k1_schnorrsig.h
-
-  c-sources:
-      depend/secp256k1/src/precomputed_ecmult_gen.c
-    , depend/secp256k1/src/precomputed_ecmult.c
-    , depend/secp256k1/src/secp256k1.c
-
-  cc-options:
-    -DENABLE_MODULE_ECDH
-    -DENABLE_MODULE_EXTRAKEYS
-    -DENABLE_MODULE_SCHNORRSIG
-
-test-suite tests
-  type:                exitcode-stdio-1.0
-  default-language:    Haskell2010
-  hs-source-dirs:      test
-  main-is:             Main.hs
-
-  ghc-options:
-    -rtsopts -Wall
-
-  build-depends:
-      base
-    , bytestring
-    , entropy
-    , secp256k1-sys
-    , tasty
-    , tasty-hunit
-