Skip to content

Commit

Permalink
feat: upgrade to 1.17 and OTP 27
Browse files Browse the repository at this point in the history
Adds a zigpkgs input to use zig from a past rev of nixpkgs, as the 0.11
version in latest does not seem to work.

related: NixOS/nixpkgs#299091
  • Loading branch information
mhanberg committed Jun 12, 2024
1 parent 2e9c45f commit 4853bdf
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .mise.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
erlang 26.2.2
elixir ref:e3b6a91b173f7e836401a6a75c3906c26bd7fd39
erlang 27.0
elixir 1.17.0
zig 0.11.0
24 changes: 21 additions & 3 deletions flake.lock

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

19 changes: 13 additions & 6 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
zigpkgs = {
url = "github:NixOS/nixpkgs/592a779f3c5e7bce1a02027abe11b7996816223f";
};
};

nixConfig = {
Expand All @@ -11,6 +14,7 @@
outputs = {
self,
nixpkgs,
zigpkgs,
}: let
inherit (nixpkgs) lib;

Expand All @@ -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;
Expand All @@ -36,7 +41,7 @@
});
elixir = otp.elixir;
in
f {inherit system pkgs beamPackages elixir;});
f {inherit system pkgs zpkgs beamPackages elixir;});

systems = [
"aarch64-darwin"
Expand All @@ -50,6 +55,7 @@
system,
beamPackages,
elixir,
...
}: {
default = lib.makeOverridable ({
localBuild,
Expand Down Expand Up @@ -92,6 +98,7 @@

devShells = forAllSystems ({
pkgs,
zpkgs,
beamPackages,
elixir,
...
Expand All @@ -117,7 +124,7 @@
pkgs.openssl
pkgs.starship
pkgs.xz
pkgs.zig_0_11
zpkgs.zig_0_11
pkgs.zsh
];
};
Expand Down
2 changes: 1 addition & 1 deletion test/next_ls/hover_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -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" => %{
Expand Down

0 comments on commit 4853bdf

Please sign in to comment.