about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLeona Maroni <dev@leona.is>2024-05-03 18:55:14 +0200
committerGitHub <noreply@github.com>2024-05-03 18:55:14 +0200
commit4e285ef2323fa22f552db3b8f09c14e5c2caf805 (patch)
treec1089d343af942e53f3467ed859d6cb7d776e800
parent96ff0d91f798ae13f3d19024e3d7fcbece5df124 (diff)
parent695aa5182e71334e4240d2606ee46233b9914949 (diff)
Merge pull request #308848 from NixOS/backport-307213-to-release-23.11
[Backport release-23.11] bob: fix vulnerable dependencies
-rw-r--r--pkgs/development/tools/build-managers/bob/default.nix19
1 files changed, 17 insertions, 2 deletions
diff --git a/pkgs/development/tools/build-managers/bob/default.nix b/pkgs/development/tools/build-managers/bob/default.nix
index 97e67ce97798..abd37cc357ff 100644
--- a/pkgs/development/tools/build-managers/bob/default.nix
+++ b/pkgs/development/tools/build-managers/bob/default.nix
@@ -1,4 +1,10 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
+{ lib
+, stdenv
+, buildGoModule
+, fetchFromGitHub
+, installShellFiles
+, fetchpatch
+}:
 
 buildGoModule rec {
   pname = "bob";
@@ -11,9 +17,18 @@ buildGoModule rec {
     hash = "sha256-zmWfOLBb+GWw9v6LdCC7/WaP1Wz7UipPwqkmI1+rG8Q=";
   };
 
+  patches = [
+    # Fix vulnerable dependencies
+    # Backport of https://github.com/benchkram/bob/pull/387
+    (fetchpatch {
+      url = "https://github.com/benchkram/bob/commit/5020e6fafbfbcb1b3add5d936886423ce882793d.patch";
+      hash = "sha256-if1ZErI0Un7d26eOkYSkEa87+VTRcEtF6JbsJYOHpHE=";
+    })
+  ];
+
   ldflags = [ "-s" "-w" "-X main.Version=${version}" ];
 
-  vendorHash = "sha256-S1XUgjdSVTWXehOLCxXcvj0SH12cxqvYadVlCw/saF4=";
+  vendorHash = "sha256-u0nFaTQWU9O7A/RAhGaLcBka+YNGjSlpycDF8TLQALw=";
 
   excludedPackages = [ "example/server-db" "test/e2e" "tui-example" ];