From 06f9ebe51b0e22cff230867828a4591ec67f8574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Madeleine=20Sydney=20=C5=9Alaga?= Date: Sat, 4 Jul 2026 14:46:27 -0600 Subject: [PATCH] bump deps --- .envrc | 1 + .gitignore | 3 ++- flake.lock | 27 +++++++++++++++++++++++++++ flake.nix | 29 +++++++++++++++++++++++++++++ stack.yaml | 2 +- stack.yaml.lock | 10 +++++----- wasm.cabal | 8 ++++---- 7 files changed, 69 insertions(+), 11 deletions(-) create mode 100644 .envrc create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..3550a30 --- /dev/null +++ b/.envrc @@ -0,0 +1 @@ +use flake diff --git a/.gitignore b/.gitignore index 745913c..641b3f9 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ doc/ setup-config wasm-*-docs.tar.gz cache -packagedb \ No newline at end of file +packagedb +.direnv/ \ No newline at end of file diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..8072661 --- /dev/null +++ b/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1783604885, + "narHash": "sha256-tzMgSkV7kljEkqIjlgV6F+n+xD+/a35Db8bs7a4BFAo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "767b0d3ec98a143ad9ed7dfc0d5553510ac27133", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..c90e41f --- /dev/null +++ b/flake.nix @@ -0,0 +1,29 @@ +{ + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + }; + + outputs = { self, nixpkgs, ... }@inputs: + let + supportedSystems = [ + "aarch64-darwin" "aarch64-linux" + "x86_64-darwin" "x86_64-linux" + ]; + + each-system = f: nixpkgs.lib.genAttrs supportedSystems (system: f rec { + pkgs = import nixpkgs { + inherit system; + }; + inherit (pkgs) lib; + inherit system; + }); + in { + devShells = each-system ({ pkgs, system, ... }: { + default = pkgs.mkShell { + packages = with pkgs; [ + cabal-install ghc stack + ]; + }; + }); + }; +} diff --git a/stack.yaml b/stack.yaml index ef0185b..0bb17e2 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.23 +resolver: lts-24.48 packages: - '.' extra-deps: [] diff --git a/stack.yaml.lock b/stack.yaml.lock index a4a15c4..fe936f2 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -1,12 +1,12 @@ # This file was autogenerated by Stack. # You should not edit this file by hand. # For more information, please see the documentation at: -# https://docs.haskellstack.org/en/stable/lock_files +# https://docs.haskellstack.org/en/stable/topics/lock_files packages: [] snapshots: - completed: - sha256: 4c972e067bae16b95961dbfdd12e07f1ee6c8fffabbfa05c3d65100b03f548b7 - size: 650253 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/23.yaml - original: lts-20.23 + sha256: 3286bb954fe0e7e0291ca61fac01a689b7165da9d7e8ba3c3a045be989c860fd + size: 732677 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/24/48.yaml + original: lts-24.48 diff --git a/wasm.cabal b/wasm.cabal index 333f19a..1864128 100644 --- a/wasm.cabal +++ b/wasm.cabal @@ -1,6 +1,6 @@ cabal-version: 2.2 name: wasm -version: 1.1.2 +version: 1.2.0 synopsis: WebAssembly Language Toolkit and Interpreter description: Library for parsing and interpreting WebAssembly, including: @@ -18,7 +18,7 @@ build-type: Simple category: Language homepage: https://github.com/SPY/haskell-wasm bug-reports: https://github.com/SPY/haskell-wasm/issues -tested-with: GHC==8.6.5, GHC==8.8.4, GHC==8.10.4, GHC==9.2.7 +tested-with: GHC==8.6.5, GHC==8.8.4, GHC==8.10.4, GHC==9.2.7, GHC==9.10.3 extra-source-files: README.md src/Language/Wasm/Parser.y @@ -52,8 +52,8 @@ library -fwarn-incomplete-patterns -fwarn-unused-imports build-tool-depends: - alex:alex >=3.1.3 && < 3.3 - , happy:happy >=1.9.4 && < 1.21 + alex:alex >=3.1.3 && < 3.6 + , happy:happy ^>=2.1 build-depends: array >=0.5 && < 0.6 , base >=4.6 && < 5