diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-05 12:01:29 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-05 12:01:29 +0000 |
commit | 39c285eb4f1f6706bb4d07bd7cb3afc798412f1e (patch) | |
tree | a55640739cd9efa92dc9cb30b6262b91b50ccc4c /pkgs/development/tools/language-servers | |
parent | 93f577aed89f0841c351ea384ece11c67c734ee5 (diff) | |
parent | 746a47bea03c707dc55ae2fe87d64f1b6ed70b7f (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/tools/language-servers')
-rw-r--r-- | pkgs/development/tools/language-servers/verible/default.nix | 22 | ||||
-rw-r--r-- | pkgs/development/tools/language-servers/verible/remove-unused-deps.patch | 10 |
2 files changed, 16 insertions, 16 deletions
diff --git a/pkgs/development/tools/language-servers/verible/default.nix b/pkgs/development/tools/language-servers/verible/default.nix index d39b91180f98a..91ac7b7bce050 100644 --- a/pkgs/development/tools/language-servers/verible/default.nix +++ b/pkgs/development/tools/language-servers/verible/default.nix @@ -13,18 +13,21 @@ let in buildBazelPackage rec { pname = "verible"; - version = "0.0-2472-ga80124e1"; # These environment variables are read in bazel/build-version.py to create - # a build string. Otherwise it would attempt to extract it from .git/. - GIT_DATE = "2022-10-21"; - GIT_VERSION = version; + # 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-02-02"; + GIT_VERSION = "v0.0-2821-gb2180bfa"; + + # 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))); src = fetchFromGitHub { owner = "chipsalliance"; repo = "verible"; - rev = "v${version}"; - sha256 = "sha256:0jpdxqhnawrl80pbc8544pyggdp5s3cbc7byc423d5v0sri2f96v"; + rev = "${GIT_VERSION}"; + sha256 = "sha256-etcimvInhebH2zRPyZnWUq6m3VnCq44w32GJrIacULo="; }; patches = [ @@ -46,8 +49,8 @@ buildBazelPackage rec { # of the output derivation ? Is there a more robust way to do this ? # (Hashes extracted from the ofborg build logs) sha256 = { - aarch64-linux = "sha256-6Udp7sZKGU8gcy6+5WPhkSWunf1sVkha8l5S1UQsC04="; - x86_64-linux = "sha256-WfhgbJFaM/ipdd1dRjPeVZ1mK2hotb0wLmKjO7e+BO4="; + aarch64-linux = "sha256-dYJoae3+u+gpULHS8nteFzzL974cVJ+cJzeG/Dz2HaQ="; + x86_64-linux = "sha256-Jd99+nhqgZ2Gwd78eyXfnSSfbl8C3hoWkiUnzJG1jqM="; }.${system} or (throw "No hash for system: ${system}"); }; @@ -62,12 +65,9 @@ buildBazelPackage rec { bazel/build-version.py \ bazel/sh_test_with_runfiles_lib.sh \ common/lsp/dummy-ls_test.sh \ - common/parser/move_yacc_stack_symbols.sh \ - common/parser/record_syntax_error.sh \ common/tools/patch_tool_test.sh \ common/tools/verible-transform-interactive.sh \ common/tools/verible-transform-interactive-test.sh \ - common/util/create_version_header.sh \ kythe-browse.sh \ verilog/tools ''; diff --git a/pkgs/development/tools/language-servers/verible/remove-unused-deps.patch b/pkgs/development/tools/language-servers/verible/remove-unused-deps.patch index 19d20309c106b..57b152d9db319 100644 --- a/pkgs/development/tools/language-servers/verible/remove-unused-deps.patch +++ b/pkgs/development/tools/language-servers/verible/remove-unused-deps.patch @@ -1,5 +1,5 @@ diff --git a/WORKSPACE b/WORKSPACE -index 696cc7ef..55a5bb8a 100644 +index ad16b3a1..52b66703 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -81,17 +81,6 @@ load("@com_github_google_rules_install//:setup.bzl", "install_rules_setup") @@ -12,11 +12,11 @@ index 696cc7ef..55a5bb8a 100644 - -win_flex_configure( - name = "win_flex_bison", -- sha256 = "095cf65cb3f12ee5888022f93109acbe6264e5f18f6ffce0bda77feb31b65bd8", -- # bison 3.3.2, flex 2.6.4 -- url = "https://github.com/lexxmark/winflexbison/releases/download/v2.5.18/win_flex_bison-2.5.18.zip", +- sha256 = "8d324b62be33604b2c45ad1dd34ab93d722534448f55a16ca7292de32b6ac135", +- # bison 3.8.2, flex 2.6.4 +- url = "https://github.com/lexxmark/winflexbison/releases/download/v2.5.25/win_flex_bison-2.5.25.zip", -) - http_archive( name = "rules_m4", - sha256 = "c67fa9891bb19e9e6c1050003ba648d35383b8cb3c9572f397ad24040fb7f0eb", + sha256 = "b0309baacfd1b736ed82dc2bb27b0ec38455a31a3d5d20f8d05e831ebeef1a8e", |