nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 11:53:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

verible: 0.0.3471 -> 0.0.3515

Browse Source
This commit is contained in:
Henner Zeller 2024-02-01 17:29:35 -08:00
parent 501c519a7c
commit 68d9bf818e
2 changed files with 5 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/tools/language-servers/verible/default.nix
View File

@ -18,8 +18,8 @@ buildBazelPackage rec {
# These environment variables are read in bazel/build-version.py to create # These environment variables are read in bazel/build-version.py to create
# a build string shown in the tools --version output. # a build string shown in the tools --version output.
# If env variables not set, it would attempt to extract it from .git/. # If env variables not set, it would attempt to extract it from .git/.
GIT_DATE = "2023-12-23"; GIT_DATE = "2024-02-01";
GIT_VERSION = "v0.0-3471-g9cb45092"; GIT_VERSION = "v0.0-3515-g2d841599";
# Derive nix package version from GIT_VERSION: "v1.2-345-abcde" -> "1.2.345" # 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))); version = builtins.concatStringsSep "." (lib.take 3 (lib.drop 1 (builtins.splitVersion GIT_VERSION)));
@ -28,16 +28,9 @@ buildBazelPackage rec {
owner = "chipsalliance"; owner = "chipsalliance";
repo = "verible"; repo = "verible";
rev = "${GIT_VERSION}"; rev = "${GIT_VERSION}";
hash = "sha256-nFt5TeFv63Igx8Zer2s/ZLj5DsHeZj5V/+3burnEm9g="; hash = "sha256-D/blcex/St1nLKvjzuKnmAJE8HVlGy8ampmXIxKK11M=";
}; };
patches = [
# Patch WORKSPACE file to not include windows-related dependencies,
# as they are removed by bazel, breaking the fixed output derivation
# TODO: fix upstream
./remove-unused-deps.patch
];
bazel = bazel_5; bazel = bazel_5;
bazelFlags = [ bazelFlags = [
"--//bazel:use_local_flex_bison" "--//bazel:use_local_flex_bison"
@ -46,7 +39,7 @@ buildBazelPackage rec {
]; ];
fetchAttrs = { fetchAttrs = {
sha256 = "sha256-gZzrgZsHQ9zMoIDooVo9nRQbkJ41igme8wcNFj5EzWc="; sha256 = "sha256-2YruKvU7OZQ7mKNrqYITat+cmf/DEytDElYw7CvkxJk=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -98,6 +91,7 @@ buildBazelPackage rec {
homepage = "https://github.com/chipsalliance/verible"; homepage = "https://github.com/chipsalliance/verible";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ hzeller newam ]; maintainers = with maintainers; [ hzeller newam ];
# Platforms linux only currently; some LIBTOOL issue on Darwin w/ bazel
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

22
pkgs/development/tools/language-servers/verible/remove-unused-deps.patch
View File

@ -1,22 +0,0 @@
diff --git a/WORKSPACE b/WORKSPACE
index ad16b3a1..52b66703 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -81,17 +81,6 @@ load("@com_github_google_rules_install//:setup.bzl", "install_rules_setup")
install_rules_setup()
-# Need to load before rules_flex/rules_bison to make sure
-# win_flex_bison is the chosen toolchain on Windows
-load("//bazel:win_flex_bison.bzl", "win_flex_configure")
-
-win_flex_configure(
- name = "win_flex_bison",
- 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 = "b0309baacfd1b736ed82dc2bb27b0ec38455a31a3d5d20f8d05e831ebeef1a8e",