diff --git a/.mise.toml b/.mise.toml index 70087e12..7dea5d05 100644 --- a/.mise.toml +++ b/.mise.toml @@ -2,6 +2,6 @@ KERL_BUILD_DOCS = "yes" [tools] -erlang = "26.2.2" -elixir = "ref:e3b6a91b173f7e836401a6a75c3906c26bd7fd39" +erlang = "27.0" +elixir = "1.17.0" zig = "0.11.0" diff --git a/.tool-versions b/.tool-versions index eb701dde..7e96f888 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,3 +1,3 @@ -erlang 26.2.2 -elixir ref:e3b6a91b173f7e836401a6a75c3906c26bd7fd39 +erlang 27.0 +elixir 1.17.0 zig 0.11.0 diff --git a/flake.lock b/flake.lock index 692becdd..1691685d 100644 --- a/flake.lock +++ b/flake.lock @@ -2,10 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "narHash": "sha256-5tPUpZlCpgqDQVUDlmhDhKn1h0A68jba8/DYie+yNC4=", + "lastModified": 1718160348, + "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "592a779f3c5e7bce1a02027abe11b7996816223f", + "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", "type": "github" }, "original": { @@ -17,7 +18,24 @@ }, "root": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "zigpkgs": "zigpkgs" + } + }, + "zigpkgs": { + "locked": { + "lastModified": 1704057613, + "narHash": "sha256-5tPUpZlCpgqDQVUDlmhDhKn1h0A68jba8/DYie+yNC4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "592a779f3c5e7bce1a02027abe11b7996816223f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "592a779f3c5e7bce1a02027abe11b7996816223f", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index 1b4e139f..f3a80d8e 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,9 @@ { inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + zigpkgs = { + url = "github:NixOS/nixpkgs/592a779f3c5e7bce1a02027abe11b7996816223f"; + }; }; nixConfig = { @@ -11,6 +14,7 @@ outputs = { self, nixpkgs, + zigpkgs, }: let inherit (nixpkgs) lib; @@ -20,13 +24,14 @@ forAllSystems = f: lib.genAttrs systems (system: let pkgs = nixpkgs.legacyPackages.${system}; - beamPackages = pkgs.beam_minimal.packages.erlang_26; + zpkgs = zigpkgs.legacyPackages.${system}; + beamPackages = pkgs.beam_minimal.packages.erlang_27; otp = (pkgs.beam.packagesWith beamPackages.erlang).extend (final: prev: { elixir_1_17 = prev.elixir_1_16.override { - rev = "e3b6a91b173f7e836401a6a75c3906c26bd7fd39"; + rev = "v1.17.0"; # You can discover this using Trust On First Use by filling in `lib.fakeHash` - sha256 = "sha256-RK0aMW7pz7kQtK9XXN1wVCBxKOJKdQD7I/53V8rWD04="; - version = "1.17.0-dev"; + sha256 = "sha256-RBylCfD+aCsvCqWUIvqXi3izNqqQoNfQNnQiZxz0Igg="; + version = "1.17.0"; }; elixir = final.elixir_1_17; @@ -36,7 +41,7 @@ }); elixir = otp.elixir; in - f {inherit system pkgs beamPackages elixir;}); + f {inherit system pkgs zpkgs beamPackages elixir;}); systems = [ "aarch64-darwin" @@ -50,6 +55,7 @@ system, beamPackages, elixir, + ... }: { default = lib.makeOverridable ({ localBuild, @@ -92,6 +98,7 @@ devShells = forAllSystems ({ pkgs, + zpkgs, beamPackages, elixir, ... @@ -117,7 +124,7 @@ pkgs.openssl pkgs.starship pkgs.xz - pkgs.zig_0_11 + zpkgs.zig_0_11 pkgs.zsh ]; }; diff --git a/test/next_ls/hover_test.exs b/test/next_ls/hover_test.exs index aede5bce..b4fb092a 100644 --- a/test/next_ls/hover_test.exs +++ b/test/next_ls/hover_test.exs @@ -313,7 +313,7 @@ defmodule NextLS.HoverTest do "contents" => %{ "kind" => "markdown", "value" => - "## :timer.sleep/1\n\n`sleep/1`\n\nSuspends the process" <> + "## :timer.sleep/1\n\n`sleep(Time)`\n\nSuspends the process" <> _ }, "range" => %{