From 9d7a88be436bb16939dbdceed5610e821753dca6 Mon Sep 17 00:00:00 2001 From: Rene Vergara Date: Wed, 21 Feb 2024 15:44:03 -0600 Subject: [PATCH 1/3] Add `shared` flag for `cabal` --- cabal.project | 1 + 1 file changed, 1 insertion(+) diff --git a/cabal.project b/cabal.project index 4fce043..3075981 100644 --- a/cabal.project +++ b/cabal.project @@ -1,6 +1,7 @@ packages: ./*.cabal with-compiler: ghc-9.4.8 +shared: true static: true source-repository-package From f818586b33c338cff0d453f19897a81df3ab44c5 Mon Sep 17 00:00:00 2001 From: Rene Vergara Date: Wed, 21 Feb 2024 19:33:28 -0600 Subject: [PATCH 2/3] Set the Rust tool-chain --- Setup.hs | 2 +- librustzcash-wrapper/rust-toolchain.toml | 4 ++++ zcash-haskell.cabal | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 librustzcash-wrapper/rust-toolchain.toml diff --git a/Setup.hs b/Setup.hs index 3f8a220..ad6bb6a 100644 --- a/Setup.hs +++ b/Setup.hs @@ -58,7 +58,7 @@ execCargo verbosity command args = do IODataModeBinary rsMake :: Verbosity -> IO () -rsMake verbosity = execCargo verbosity "+nightly-2024-02-04" ["cbuild"] +rsMake verbosity = execCargo verbosity "cbuild" [] rsAddDirs :: LocalBuildInfo -> IO LocalBuildInfo rsAddDirs lbi' = do diff --git a/librustzcash-wrapper/rust-toolchain.toml b/librustzcash-wrapper/rust-toolchain.toml new file mode 100644 index 0000000..af255e0 --- /dev/null +++ b/librustzcash-wrapper/rust-toolchain.toml @@ -0,0 +1,4 @@ +[toolchain] +channel = "nightly-2024-02-04" +components = [ "rustfmt", "rustc-dev"] +profile = "minimal" diff --git a/zcash-haskell.cabal b/zcash-haskell.cabal index 8f422e9..1a54fba 100644 --- a/zcash-haskell.cabal +++ b/zcash-haskell.cabal @@ -5,7 +5,7 @@ cabal-version: 3.0 -- see: https://github.com/sol/hpack name: zcash-haskell -version: 0.4.2.1 +version: 0.4.2.2 synopsis: Utilities to interact with the Zcash blockchain description: Please see the README on the repo at category: Blockchain From ee7e32feb64a778a5bb5f3a12ce0429b43a0c4b5 Mon Sep 17 00:00:00 2001 From: Rene Vergara Date: Wed, 21 Feb 2024 20:32:36 -0600 Subject: [PATCH 3/3] Remove flags --- cabal.project | 3 --- 1 file changed, 3 deletions(-) diff --git a/cabal.project b/cabal.project index 3075981..60a9728 100644 --- a/cabal.project +++ b/cabal.project @@ -1,9 +1,6 @@ packages: ./*.cabal with-compiler: ghc-9.4.8 -shared: true -static: true - source-repository-package type: git location: https://git.vergara.tech/Vergara_Tech/haskell-foreign-rust.git