colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ligo: 0.64.2 -> 0.65.0 (#231142)

Browse Source 
* ligo: 0.64.2 -> 0.65.0

* ligo: make compatible with hacl-star 0.7.0 again

* ligo: Remove broken changelog generation

---------

Co-authored-by: Laurent CaniBot <laurent@marigold.dev>
Co-authored-by: Ulrik Strid <ulrik.strid@outlook.com>
This commit is contained in:
Marigold-infrabot 2023-05-12 07:37:12 -04:00 committed by GitHub
parent 4ff08263f0
commit 9c2e30bd1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/development/compilers/ligo/default.nix
View File

@ -15,18 +15,35 @@
ocamlPackages.buildDunePackage rec {
pname = "ligo";
version = "0.64.2";
version = "0.65.0";
src = fetchFromGitLab {
owner = "ligolang";
repo = "ligo";
rev = version;
sha256 = "sha256-/XUJFDH1pv65VeZt57P+AiCegTwCn7OWdaa0D8sw7CI=";
sha256 = "sha256-vBvgagXK9lOXRI+iBwkPKmUvncZjrqHpKI3UAqOzHvc=";
fetchSubmodules = true;
};
postPatch = ''
substituteInPlace "vendors/tezos-ligo/src/lib_hacl/hacl.ml" \
--replace \
"Hacl.NaCl.Noalloc.Easy.secretbox ~pt:msg ~n:nonce ~key ~ct:cmsg" \
"Hacl.NaCl.Noalloc.Easy.secretbox ~pt:msg ~n:nonce ~key ~ct:cmsg ()" \
--replace \
"Hacl.NaCl.Noalloc.Easy.box_afternm ~pt:msg ~n:nonce ~ck:k ~ct:cmsg" \
"Hacl.NaCl.Noalloc.Easy.box_afternm ~pt:msg ~n:nonce ~ck:k ~ct:cmsg ()"
substituteInPlace "vendors/tezos-ligo/src/lib_crypto/crypto_box.ml" \
--replace \
"secretbox_open ~key ~nonce ~cmsg ~msg" \
"secretbox_open ~key ~nonce ~cmsg ~msg ()" \
--replace \
"Box.box_open ~k ~nonce ~cmsg ~msg" \
"Box.box_open ~k ~nonce ~cmsg ~msg ()"
'';
# The build picks this up for ligo --version
LIGO_VERSION = version;
CHANGELOG_PATH = "./changelog.txt";
# This is a hack to work around the hack used in the dune files
OPAM_SWITCH_PREFIX = "${tezos-rust-libs}";
@ -115,13 +132,6 @@ ocamlPackages.buildDunePackage rec {
darwin.apple_sdk.frameworks.Security
];
preBuild = ''
# The scripts use `nix-shell` in the shebang which seems to fail
sed -i -e '1,5d' ./scripts/changelog-generation.sh
sed -i -e '1,5d' ./scripts/changelog-json.sh
./scripts/changelog-generation.sh
'';
nativeCheckInputs = [
cacert
ocamlPackages.ca-certs