From c9607b998d68fd5ece97f65a177c28baa2b5d04a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Videla?= Date: Wed, 11 Dec 2024 14:01:11 -0500 Subject: [PATCH] update ghc version --- flake.nix | 1 + stack.yaml | 29 +++-------------------------- stack.yaml.lock | 16 ++++++++-------- 3 files changed, 12 insertions(+), 34 deletions(-) diff --git a/flake.nix b/flake.nix index 2e29515..aa50554 100644 --- a/flake.nix +++ b/flake.nix @@ -23,6 +23,7 @@ hPkgs.ghc # GHC compiler in the desired version (will be available on PATH) pkgs.zlib # External C library needed by some Haskell packages pkgs.libff + pkgs.git pkgs.secp256k1 stack-wrapped (solc.mkDefault pkgs pkgs.solc_0_8_26) diff --git a/stack.yaml b/stack.yaml index a761cd2..2fb14f8 100644 --- a/stack.yaml +++ b/stack.yaml @@ -17,7 +17,7 @@ # # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml -resolver: lts-21.0 +resolver: lts-22.0 # User packages to be built. # Various formats can be used as shown in the example below. @@ -35,29 +35,10 @@ packages: # forks / in-progress versions pinned to a git hash. For example: # extra-deps: - - monad-bayes-1.2.0@sha256:bf83cf8e6d163c461b9964dbff48d4476b2a82421962af317b3a3d0d738ea2a2,6456 + - monad-bayes-1.3.0.4@sha256:101a60697c2bf0fae60157284bb8127e6a84e37c82c562cd7a262b50a34f3b5d,6650 - vector-sized-1.5.0@sha256:1c85b70dbfe6fbdcc58d2706c626e6e38d1900276bbb6f1ba6cfee83941f45e6,1836 - poly-0.5.1.0@sha256:8c574f017913982fd70567545bec423823ff5bdf236c19d1443f3af47e0218ba,3418 - - # - HSH-2.1.3@sha256:71ded11b224f5066373ce985ec63b10c87129850b33916736dd64fa2bea9ea0a,1705 - # - restless-git-0.7@sha256:346a5775a586f07ecb291036a8d3016c3484ccdc188b574bcdec0a82c12db293,968 - # - s-cargot-0.1.4.0@sha256:61ea1833fbb4c80d93577144870e449d2007d311c34d74252850bb48aa8c31fb,3525 - # - semver-range-0.2.8@sha256:44918080c220cf67b6e7c8ad16f01f3cfe1ac69d4f72e528e84d566348bb23c3,1941 - # - probability-0.2.7@sha256:3e9fe130af3bd75e791e1add902eb2caab170cc95373281c0a9626b01fc3b104,2869 - # - splitmix-0.1 - # - mwc-random-0.15.0.2 - # - monad-bayes-1.1.0 - # - smt2-parser-0.1.0.1 - # - spawn-0.3 - # - spool-0.1 - # - git: https://github.com/ethereum/hevm - # commit: c5e40507c35e6f2119aeb5f0740dc3564100ebdc - # - git: https://github.com/ethereum/act.git - # subdirs: - # - src - # commit: 52e99daf3121a4e6a6cb28255e862cf8e83cf4cd - allow-newer: true # - acme-missiles-0.3 @@ -79,7 +60,7 @@ allow-newer: true # # Override the architecture used by stack, especially useful on Windows # Change to x86_64 for Intel and aarch64 for ARM/apple silicon -arch: x86_64 +arch: aarch64 # # Extra directories used by stack for building # extra-include-dirs: [/path/to/dir] @@ -90,7 +71,3 @@ arch: x86_64 # ghc-options: "$locals": -fwarn-incomplete-patterns -nix: - enable: true - packages: [libff, secp256k1, zlib, solc] - diff --git a/stack.yaml.lock b/stack.yaml.lock index c83d4f4..b122f21 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -5,12 +5,12 @@ packages: - completed: - hackage: monad-bayes-1.2.0@sha256:bf83cf8e6d163c461b9964dbff48d4476b2a82421962af317b3a3d0d738ea2a2,6456 + hackage: monad-bayes-1.3.0.4@sha256:101a60697c2bf0fae60157284bb8127e6a84e37c82c562cd7a262b50a34f3b5d,6650 pantry-tree: - sha256: ce4a9db9888b589ae56493862ae62f2efb5af8d17d3d55bac0b3f59177881b2b - size: 3823 + sha256: 2d9102c645cd43c5144f3a02873e841d0be2f70748dca7091a578ae909ed22af + size: 4852 original: - hackage: monad-bayes-1.2.0@sha256:bf83cf8e6d163c461b9964dbff48d4476b2a82421962af317b3a3d0d738ea2a2,6456 + hackage: monad-bayes-1.3.0.4@sha256:101a60697c2bf0fae60157284bb8127e6a84e37c82c562cd7a262b50a34f3b5d,6650 - completed: hackage: vector-sized-1.5.0@sha256:1c85b70dbfe6fbdcc58d2706c626e6e38d1900276bbb6f1ba6cfee83941f45e6,1836 pantry-tree: @@ -27,7 +27,7 @@ packages: hackage: poly-0.5.1.0@sha256:8c574f017913982fd70567545bec423823ff5bdf236c19d1443f3af47e0218ba,3418 snapshots: - completed: - sha256: 1867d84255dff8c87373f5dd03e5a5cb1c10a99587e26c8793e750c54e83ffdc - size: 639139 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/0.yaml - original: lts-21.0 + sha256: e176944bc843f740e05242fa7a66ca1f440c127e425254f7f1257f9b19add23f + size: 712153 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/0.yaml + original: lts-22.0