From c6502d7ecd11f4971ef11b369abde3db5215baf8 Mon Sep 17 00:00:00 2001 From: Anton-4 <17049058+Anton-4@users.noreply.github.com> Date: Sat, 13 Apr 2024 20:13:48 +0200 Subject: [PATCH 1/2] new decoding signature See https://github.com/roc-lang/roc/pull/6587 for context. --- flake.lock | 19 ++++++++++--------- flake.nix | 4 ++-- platform/EnvDecoding.roc | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 67f897f..34a53e3 100644 --- a/flake.lock +++ b/flake.lock @@ -79,17 +79,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1712163089, - "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", + "lastModified": 1702900294, + "narHash": "sha256-pt7sSoJYNw3n8YtXw0Z/Nnr6/PfY2YrjDvqboErXnRM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", + "rev": "886c9aee6ca9324e127f9c2c4e6f68c2641c8256", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", + "rev": "886c9aee6ca9324e127f9c2c4e6f68c2641c8256", "type": "github" } }, @@ -102,16 +102,17 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1712930574, - "narHash": "sha256-9BIrDgumBUW3AHxoz3qTsPtBOGlVM+8uJOhL0MiGurE=", - "owner": "roc-lang", + "lastModified": 1712598913, + "narHash": "sha256-COI1qtCi0OmZwpNFDOs+/A7LzyYoy19QOTlkQZUs9CM=", + "owner": "faldor20", "repo": "roc", - "rev": "237bd942ed1ed23b39f07ed1ee88dfe23c223fc5", + "rev": "3fef8b9f82acb70c7fb8b142e886ac5dd4495fe6", "type": "github" }, "original": { - "owner": "roc-lang", + "owner": "faldor20", "repo": "roc", + "rev": "3fef8b9f82acb70c7fb8b142e886ac5dd4495fe6", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 1622c73..93d2dac 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "basic-webserver devShell flake"; inputs = { - roc.url = "github:roc-lang/roc"; + roc.url = "github:faldor20/roc/3fef8b9f82acb70c7fb8b142e886ac5dd4495fe6"; nixpkgs.follows = "roc/nixpkgs"; # rust from nixpkgs has some libc problems, this is patched in the rust-overlay @@ -60,4 +60,4 @@ formatter = pkgs.nixpkgs-fmt; }); -} \ No newline at end of file +} diff --git a/platform/EnvDecoding.roc b/platform/EnvDecoding.roc index b817143..7425e19 100644 --- a/platform/EnvDecoding.roc +++ b/platform/EnvDecoding.roc @@ -91,7 +91,7 @@ envList = \decodeElem -> Decode.custom \bytes, @EnvFormat {} -> # TODO: we must currently annotate the arrows here so that the lambda sets are # exercised, and the solver can find an ambient lambda set for the # specialization. -envRecord : _, (_, _ -> [Keep (Decoder _ _), Skip]), (_ -> _) -> Decoder _ _ +envRecord : _, (_, _ -> [Keep (Decoder _ _), Skip]), (_, _ -> _) -> Decoder _ _ envRecord = \_initialState, _stepField, _finalizer -> Decode.custom \bytes, @EnvFormat {} -> { result: Err TooShort, rest: bytes } From 9e49e055d826e7488bb5a82e8b7c4b9d455b4e1f Mon Sep 17 00:00:00 2001 From: Anton-4 <17049058+Anton-4@users.noreply.github.com> Date: Sat, 13 Apr 2024 20:15:54 +0200 Subject: [PATCH 2/2] new testing releases naming scheme --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index decb7ed..25980ea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: - id: try_fetching_testing_release continue-on-error: true run: | - curl -fOL https://github.com/roc-lang/roc/releases/download/nightly/roc_nightly-linuxTESTING_x86_64-latest.tar.gz + curl -fOL https://github.com/roc-lang/roc/releases/download/nightly/roc_nightly-linux_x86_64-TESTING.tar.gz - name: There are no TESTING releases, checking regular releases instead if: steps.try_fetching_testing_release.outcome == 'failure'