diff options
author | Fabián Heredia Montiel <303897+fabianhjr@users.noreply.github.com> | 2023-12-27 09:47:07 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-27 09:47:07 -0600 |
commit | 97fb22906fb269242b4c3f3ede2b02600c946f36 (patch) | |
tree | 1337b21f2112d2a6a81c46cd05e4b3658376c622 /pkgs/development/tools/language-servers | |
parent | 82b29df2f493e0eca0a54a0ef0888aa881535251 (diff) | |
parent | 46b24add29fbfdc6167015f042ac0dc951628fe8 (diff) |
Merge pull request #276932 from hzeller/20231226-update-verible
verible: 0.0.3428 -> 0.0.3471
Diffstat (limited to 'pkgs/development/tools/language-servers')
-rw-r--r-- | pkgs/development/tools/language-servers/verible/default.nix | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/pkgs/development/tools/language-servers/verible/default.nix b/pkgs/development/tools/language-servers/verible/default.nix index 2e31b44398bb1..e607713f49f8e 100644 --- a/pkgs/development/tools/language-servers/verible/default.nix +++ b/pkgs/development/tools/language-servers/verible/default.nix @@ -2,7 +2,8 @@ , stdenv , buildBazelPackage , fetchFromGitHub -, bazel_4 +, bazel_5 +, jdk , bison , flex , python3 @@ -17,8 +18,8 @@ buildBazelPackage rec { # These environment variables are read in bazel/build-version.py to create # a build string shown in the tools --version output. # If env variables not set, it would attempt to extract it from .git/. - GIT_DATE = "2023-10-26"; - GIT_VERSION = "v0.0-3428-gcfcbb82b"; + GIT_DATE = "2023-12-23"; + GIT_VERSION = "v0.0-3471-g9cb45092"; # Derive nix package version from GIT_VERSION: "v1.2-345-abcde" -> "1.2.345" version = builtins.concatStringsSep "." (lib.take 3 (lib.drop 1 (builtins.splitVersion GIT_VERSION))); @@ -27,7 +28,7 @@ buildBazelPackage rec { owner = "chipsalliance"; repo = "verible"; rev = "${GIT_VERSION}"; - hash = "sha256-snWhOuGyAdtdJDMttcbEjlkwPUO1mdR9vuro0tZt+Z8="; + hash = "sha256-nFt5TeFv63Igx8Zer2s/ZLj5DsHeZj5V/+3burnEm9g="; }; patches = [ @@ -37,25 +38,19 @@ buildBazelPackage rec { ./remove-unused-deps.patch ]; - bazel = bazel_4; + bazel = bazel_5; bazelFlags = [ "--//bazel:use_local_flex_bison" - "--javabase=@bazel_tools//tools/jdk:remote_jdk11" - "--host_javabase=@bazel_tools//tools/jdk:remote_jdk11" + "--java_runtime_version=local_jdk" + "--tool_java_runtime_version=local_jdk" ]; fetchAttrs = { - # Fixed output derivation hash after bazel fetch. - # This varies per platform, probably from the JDK pulled in being part - # of the output derivation ? Is there a more robust way to do this ? - # (Hashes extracted from the ofborg build logs) - sha256 = { - aarch64-linux = "sha256-Hf/jF5Y7QS2ZNFmSx2LIb0b6gdjditE97HwWGqQJac8="; - x86_64-linux = "sha256-WBp5Fi5vvKLVgRWvQ3VB7sY6ySpbwCdhU5KqZH9sLy4="; - }.${system} or (throw "No hash for system: ${system}"); + sha256 = "sha256-gZzrgZsHQ9zMoIDooVo9nRQbkJ41igme8wcNFj5EzWc="; }; nativeBuildInputs = [ + jdk # bazel uses that. bison # We use local flex and bison as WORKSPACE sources fail flex # .. to compile with newer glibc python3 |