From 3bbb37de7bfd388c1ad957d39c34fb81b8788644 Mon Sep 17 00:00:00 2001
From: Henner Zeller <h.zeller@acm.org>
Date: Tue, 6 Aug 2024 04:24:20 -0700
Subject: [PATCH 1/2] verible: move to pkgs/by-name

No other change.
---
 .../verible/default.nix => by-name/ve/verible/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/tools/language-servers/verible/default.nix => by-name/ve/verible/package.nix} (100%)

diff --git a/pkgs/development/tools/language-servers/verible/default.nix b/pkgs/by-name/ve/verible/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/verible/default.nix
rename to pkgs/by-name/ve/verible/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d029fbbc1f6b..d646de07e0eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17438,8 +17438,6 @@ with pkgs;
 
   vala-language-server = callPackage ../development/tools/language-servers/vala-language-server { };
 
-  verible = callPackage ../development/tools/language-servers/verible { };
-
   vscode-langservers-extracted = callPackage ../development/tools/language-servers/vscode-langservers-extracted { };
 
   zls = callPackage ../development/tools/language-servers/zls { };

From 20939ceaa2b4734e96ea7020d3266019d6ea2f20 Mon Sep 17 00:00:00 2001
From: Henner Zeller <h.zeller@acm.org>
Date: Tue, 6 Aug 2024 04:42:02 -0700
Subject: [PATCH 2/2] verible: 0.0.3722 -> 0.0.3747

---
 pkgs/by-name/ve/verible/package.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ve/verible/package.nix b/pkgs/by-name/ve/verible/package.nix
index ac3d34264dc7..11ace1650d77 100644
--- a/pkgs/by-name/ve/verible/package.nix
+++ b/pkgs/by-name/ve/verible/package.nix
@@ -18,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 = "2024-07-07";
-  GIT_VERSION = "v0.0-3722-g3b927214";
+  GIT_DATE = "2024-08-05";
+  GIT_VERSION = "v0.0-3747-g79f6290d";
 
   # 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)));
@@ -28,7 +28,7 @@ buildBazelPackage rec {
     owner = "chipsalliance";
     repo  = "verible";
     rev   = "${GIT_VERSION}";
-    hash  = "sha256-/YQRC8Y8ucufqfgvCzvYYEQMksUMIw3ly37P090nm4s=";
+    hash  = "sha256-cixhB7QZStfG4DKjqEVipIeM9uUt6vibtbtZypzIcMo=";
   };
 
   bazel = bazel_6;
@@ -61,10 +61,12 @@ buildBazelPackage rec {
 
   removeRulesCC = false;
   bazelTargets = [ ":install-binaries" ];
+  bazelBuildFlags = [ "-c opt" ];
+
+  doCheck = true;
   bazelTestTargets = [ "//..." ];
-  bazelBuildFlags = [
-    "-c opt"
-  ];
+  bazelTestFlags = [ "-c opt" ];
+
   buildAttrs = {
     installPhase = ''
       mkdir -p "$out/bin"