From d7f5186a496af210d0e890b9649a862c0b2939a3 Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Mon, 20 Dec 2021 19:29:23 +0100 Subject: [PATCH 1/6] pull in my fork of `winter` with some bulk-memory instructions --- nix/sources.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nix/sources.json b/nix/sources.json index b1ef3a7f..34b2b867 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -56,10 +56,10 @@ "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": "220b7ee600fb739c033ceef6ad24d0642019fe49", + "sha256": "1yfgk4bhyzrllnkhpg1plzp3mz7h1fgn3j0zfn36a3h892lknlds", "type": "tarball", "url": "https://github.com/dfinity-side-projects/winter/archive/e62722796e11760947a94285734e7bc29d72c389.tar.gz", "url_template": "https://github.com///archive/.tar.gz" From b6daa1360ef14be2f452b23062cf2839ea9cf8e5 Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Mon, 20 Dec 2021 19:34:08 +0100 Subject: [PATCH 2/6] fix hash --- nix/sources.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/sources.json b/nix/sources.json index 34b2b867..853e1ae0 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -59,7 +59,7 @@ "owner": "ggreif", "repo": "winter", "rev": "220b7ee600fb739c033ceef6ad24d0642019fe49", - "sha256": "1yfgk4bhyzrllnkhpg1plzp3mz7h1fgn3j0zfn36a3h892lknlds", + "sha256": "sha256-ulE7qUgIDmWGdR/IYZ8L8Pw67qc3vAunpTR/D1eZz/k", "type": "tarball", "url": "https://github.com/dfinity-side-projects/winter/archive/e62722796e11760947a94285734e7bc29d72c389.tar.gz", "url_template": "https://github.com///archive/.tar.gz" From f8af21b9de1970abf5987e7e3de305073945fcd7 Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Tue, 21 Dec 2021 00:43:09 +0100 Subject: [PATCH 3/6] typo --- nix/generate.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/generate.nix b/nix/generate.nix index c7465c78..d319c9cb 100644 --- a/nix/generate.nix +++ b/nix/generate.nix @@ -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 From e9306f83649afb663d08256bc2ef311680c83351 Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Tue, 21 Dec 2021 01:05:18 +0100 Subject: [PATCH 4/6] typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index abf83df7..4a90ea31 100644 --- a/README.md +++ b/README.md @@ -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 From c3b168519ab4cbfd3d488fd2655a9af5c2d70785 Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Tue, 21 Dec 2021 01:15:20 +0100 Subject: [PATCH 5/6] niv update --- nix/sources.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nix/sources.json b/nix/sources.json index 853e1ae0..48131c1f 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -58,10 +58,10 @@ "homepage": "https://github.com/dfinity-side-projects/winter", "owner": "ggreif", "repo": "winter", - "rev": "220b7ee600fb739c033ceef6ad24d0642019fe49", - "sha256": "sha256-ulE7qUgIDmWGdR/IYZ8L8Pw67qc3vAunpTR/D1eZz/k", + "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///archive/.tar.gz" } } From 66e6db1907c09fc1bcc3e16633c6840606b417e5 Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Tue, 21 Dec 2021 01:20:49 +0100 Subject: [PATCH 6/6] regenerate `winter` dependencies --- cabal.project | 4 ++-- cabal.project.freeze | 2 +- ic-hs.cabal | 2 +- nix/generated/winter.nix | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cabal.project b/cabal.project index 769e0c27..4517d6e5 100644 --- a/cabal.project +++ b/cabal.project @@ -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 diff --git a/cabal.project.freeze b/cabal.project.freeze index 1bd9f5e7..ab301f3c 100644 --- a/cabal.project.freeze +++ b/cabal.project.freeze @@ -169,7 +169,7 @@ constraints: any.FloatingHex ==0.5, any.wai-logger ==2.3.6, any.warp ==3.3.17, any.wcwidth ==0.0.2, - any.winter ==1.0.0, + any.winter ==1.1.0, any.word8 ==0.1.3, any.x509 ==1.7.5, any.x509-store ==1.6.7, diff --git a/ic-hs.cabal b/ic-hs.cabal index 64663b3a..069a56ed 100644 --- a/ic-hs.cabal +++ b/ic-hs.cabal @@ -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 diff --git a/nix/generated/winter.nix b/nix/generated/winter.nix index 210df148..66c7ca77 100644 --- a/nix/generated/winter.nix +++ b/nix/generated/winter.nix @@ -36,7 +36,7 @@ }: mkDerivation { pname = "winter"; - version = "1.0.0"; + version = "1.1.0"; src = pkgs.sources.winter; isLibrary = true; isExecutable = true; @@ -103,7 +103,7 @@ mkDerivation { vector ]; doCheck = false; - homepage = "https://github.com/dfinity/winter"; + homepage = "https://github.com/dfinity-side-projects/winter"; description = "Haskell port of the WebAssembly OCaml reference interpreter"; license = lib.licenses.mit; }