diff --git a/pkgs/development/beam-modules/elixir-ls/default.nix b/pkgs/development/beam-modules/elixir-ls/default.nix index dd7ea4cacf74..885b6eec49af 100644 --- a/pkgs/development/beam-modules/elixir-ls/default.nix +++ b/pkgs/development/beam-modules/elixir-ls/default.nix @@ -1,16 +1,15 @@ -{ lib, elixir, fetchFromGitHub, fetchMixDeps, mixRelease }: +{ lib, elixir, fetchFromGitHub, fetchMixDeps, mixRelease, nix-update-script }: # Based on the work of Hauleth # None of this would have happened without him let pname = "elixir-ls"; - pinData = lib.importJSON ./pin.json; - version = pinData.version; + version = "0.14.6"; src = fetchFromGitHub { owner = "elixir-lsp"; repo = "elixir-ls"; rev = "v${version}"; - sha256 = pinData.sha256; + hash = "sha256-O977DZLWPyLafIaOTPZKI4MOtK9E9TDProf2xyk05aI"; fetchSubmodules = true; }; in @@ -20,7 +19,7 @@ mixRelease { mixFodDeps = fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version elixir; - sha256 = pinData.depsSha256; + sha256 = "sha256-jF1Plkz1D85aWkiNgeBlJmHndhr7us+8+m/gMkXHvDw="; }; # elixir-ls is an umbrella app @@ -71,5 +70,5 @@ mixRelease { platforms = platforms.unix; maintainers = teams.beam.members; }; - passthru.updateScript = ./update.sh; + passthru.updateScript = nix-update-script { }; } diff --git a/pkgs/development/beam-modules/elixir-ls/pin.json b/pkgs/development/beam-modules/elixir-ls/pin.json deleted file mode 100644 index e2eb21a57096..000000000000 --- a/pkgs/development/beam-modules/elixir-ls/pin.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "version": "0.14.5", - "sha256": "sha256-F0c1vyeie8sf11SHfDKb8v1DZ5No3Rr3PPj3jMg0veg=", - "depsSha256": "sha256-/lKZ9Ns32A/elJTez72mH2tZ7ujwEX9p4FIKHpfGq78=" -} diff --git a/pkgs/development/beam-modules/elixir-ls/update.sh b/pkgs/development/beam-modules/elixir-ls/update.sh deleted file mode 100755 index be85b4c6d642..000000000000 --- a/pkgs/development/beam-modules/elixir-ls/update.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i oil -p jq sd nix-prefetch-github ripgrep - -# TODO set to `verbose` or `extdebug` once implemented in oil -set -x - -const directory = $(dirname $0 | xargs realpath) -const owner = "elixir-lsp" -const repo = "elixir-ls" -const latest_rev = $(curl -q https://api.github.com/repos/${owner}/${repo}/releases/latest | \ - jq -r '.tag_name') -const latest_version = $(echo $latest_rev | sd 'v' '') -const current_version = $(jq -r '.version' $directory/pin.json) -if ("$latest_version" === "$current_version") { - echo "elixir-ls is already up-to-date" - return 0 -} else { - const tarball_meta = $(nix-prefetch-github $owner $repo --rev "$latest_rev") - const tarball_hash = "sha256-$(echo $tarball_meta | jq -r '.sha256')" - const sha256s = $(rg '"sha256-.+"' $directory/default.nix | sd '.+"(.+)";' '$1' ) - - jq ".version = \"$latest_version\" | \ - .\"sha256\" = \"$tarball_hash\" | \ - .\"depsSha256\" = \"\"" $directory/pin.json | sponge $directory/pin.json - - const new_mix_hash = $(nix-build -A elixir-ls.mixFodDeps 2>&1 | \ - tail -n 1 | \ - sd '\s+got:\s+' '') - - jq ".depsSha256 = \"$new_mix_hash\"" $directory/pin.json | sponge $directory/pin.json -}