Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use fork of winter with some bulk-memory instructions #67

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ Updating Haskell Packages

When the `.cabal` file of a Haskell package is changed you need to make sure the
corresponding nix files `nix/generated/` are kept in sync with it. These are
automatically generate, run
automatically generated, run

nix-shell nix/generate.nix

Expand Down
4 changes: 2 additions & 2 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ packages: .

source-repository-package
type: git
location: https://github.com/dfinity-side-projects/winter
tag: e62722796e11760947a94285734e7bc29d72c389
location: https://github.com/ggreif/winter
tag: 618f679c7d8f9584a902081701b96edb34183f2d

source-repository-package
type: git
Expand Down
2 changes: 1 addition & 1 deletion cabal.project.freeze

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ic-hs.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ executable ic-ref
build-depends: wai-cors
build-depends: wai-extra
build-depends: warp
build-depends: winter
build-depends: winter == 1.1.0
build-depends: uglymemo
build-depends: zlib
other-modules: IC.Canister
Expand Down
2 changes: 1 addition & 1 deletion nix/generate.nix
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ let
src_subst = "pkgs.sources.haskell-candid";
};

# To pull other versios from hackage:
# To pull other versions from hackage:

# 0.2.5.0 broke with ghc-8.10 and integer-simple,
# see https://github.com/well-typed/cborg/issues/267
Expand Down
4 changes: 2 additions & 2 deletions nix/generated/winter.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions nix/sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@
"builtin": false,
"description": "Haskell port of the WebAssembly OCaml reference interpreter",
"homepage": "https://github.com/dfinity-side-projects/winter",
"owner": "dfinity-side-projects",
"owner": "ggreif",
"repo": "winter",
"rev": "e62722796e11760947a94285734e7bc29d72c389",
"sha256": "1yfgk5bhyzrllnkhpg1plzp3mz7h1fgn3j0zfn36a3h892lknlds",
"rev": "618f679c7d8f9584a902081701b96edb34183f2d",
"sha256": "1b0lxcs5ig29js81s6sjflgwv8f7l83vf156y14wmcx44r1rj2ra",
"type": "tarball",
"url": "https://github.com/dfinity-side-projects/winter/archive/e62722796e11760947a94285734e7bc29d72c389.tar.gz",
"url": "https://github.com/ggreif/winter/archive/618f679c7d8f9584a902081701b96edb34183f2d.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}