search

k0001 / hs-libsodium

Haskell bindings to the libsodium C library
https://hackage.haskell.org/package/libsodium
ISC License
1 stars 3 forks source link

bump version to 1.0.19.1 #5

Open aleeusgr opened 2 months ago

aleeusgr commented 2 months ago

Hello @k0001 I hope this finds you well.

I would like to bring your attention to an issue with this package in nixpkgs: its marked as broken because some of CI fails and requires updating the version.

Talking to nixOS maintainers we came to a conclusion that the best way to fix it is to open this issue: I would like to fix it myself but it would take me a week, while we noticed that you were submitting changes that are very similar to what needs to be done. I hope you can look into this issue, if not - please tell me and I will go on with learning how and doing it.

Below is a diff with changes that were enough for the package to build, but some UX things aren't there, ex. library version isn't displayed correctly.

diff

```diff diff --git a/hs/Libsodium/Constants.hs b/hs/Libsodium/Constants.hs index 0b7b228..6d3472f 100644 --- a/hs/Libsodium/Constants.hs +++ b/hs/Libsodium/Constants.hs @@ -297,8 +297,8 @@ TN(CRYPTO_VERIFY_32_BYTES, 32, CSize, crypto_verify_32_bytes) TN(CRYPTO_VERIFY_64_BYTES, 64, CSize, crypto_verify_64_bytes) TN(RANDOMBYTES_SEEDBYTES, 32, CSize, randombytes_seedbytes) TN(SODIUM_LIBRARY_MINIMAL, 0, CInt, sodium_library_minimal) -TN(SODIUM_LIBRARY_VERSION_MAJOR, 10, CInt, sodium_library_version_major) -TN(SODIUM_LIBRARY_VERSION_MINOR, 3, CInt, sodium_library_version_minor) +TN(SODIUM_LIBRARY_VERSION_MAJOR, 26, CInt, sodium_library_version_major) +TN(SODIUM_LIBRARY_VERSION_MINOR, 1, CInt, sodium_library_version_minor) -- These have no corresponding C functions TN(SODIUM_BASE64_VARIANT_ORIGINAL, 1, CInt, sodium_base64_variant_original) @@ -341,4 +341,4 @@ TS(CRYPTO_SECRETBOX_PRIMITIVE, "xsalsa20poly1305", crypto_secretbox_primitive) TS(CRYPTO_SHORTHASH_PRIMITIVE, "siphash24", crypto_shorthash_primitive) TS(CRYPTO_SIGN_PRIMITIVE, "ed25519", crypto_sign_primitive) TS(CRYPTO_STREAM_PRIMITIVE, "xsalsa20", crypto_stream_primitive) -TS(SODIUM_VERSION_STRING, "1.0.18", sodium_version_string) +TS(SODIUM_VERSION_STRING, "1.0.19", sodium_version_string) diff --git a/libsodium.cabal b/libsodium.cabal index 9c4b4cd..d980ba3 100644 --- a/libsodium.cabal +++ b/libsodium.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: libsodium -version: 1.0.18.3 +version: 1.0.19.1 license: ISC license-file: LICENSE extra-source-files: README.md CHANGELOG.md @@ -31,7 +31,7 @@ common basic default-language: GHC2021 ghc-options: -Wall -Werror=incomplete-patterns build-depends: base == 4.* - pkgconfig-depends: libsodium == 1.0.18 + pkgconfig-depends: libsodium == 1.0.19 if flag(use-build-tool-depends) build-tool-depends: c2hs:c2hs ```

many thanks!

k0001 commented 2 months ago

Thanks for letting me know. I'll take a look at the changes in the new libsodium C library and update this one accordingly.