From d7fb6ffeca5a5c29ed676c2eb925241d570bd543 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Jan 2026 08:08:42 +0000 Subject: [PATCH 1/2] osv-scanner: 2.3.1 -> 2.3.2 --- pkgs/by-name/os/osv-scanner/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/os/osv-scanner/package.nix b/pkgs/by-name/os/osv-scanner/package.nix index 659a6acf5e71..e75ee07ad595 100644 --- a/pkgs/by-name/os/osv-scanner/package.nix +++ b/pkgs/by-name/os/osv-scanner/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "osv-scanner"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "google"; repo = "osv-scanner"; tag = "v${version}"; - hash = "sha256-qpfpFjMMRWzzP1Q/28Bzp+hQ5TDi3ffwJ20PwXKgJjs="; + hash = "sha256-IulgR8bXD/NBya5hK49uUbjKoVR9Xg4ZyvhI4eswoRE="; }; - vendorHash = "sha256-0htgQgpZwtHHnGWi7pnvmA9eKsu15Kd6u7VH2s/PhSs="; + vendorHash = "sha256-jMLZ0EARnUX0c40exl9d/lrbr3ClM9JmlUDiirFlBzU="; subPackages = [ "cmd/osv-scanner" From 2551dfc12472b6756a11dc96aa1e6f56ba76425e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Jan 2026 14:52:42 +0100 Subject: [PATCH 2/2] osv-scanner: migrate to finalAttrs --- pkgs/by-name/os/osv-scanner/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/os/osv-scanner/package.nix b/pkgs/by-name/os/osv-scanner/package.nix index e75ee07ad595..8a3cb4930c78 100644 --- a/pkgs/by-name/os/osv-scanner/package.nix +++ b/pkgs/by-name/os/osv-scanner/package.nix @@ -6,14 +6,14 @@ osv-scanner, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "osv-scanner"; version = "2.3.2"; src = fetchFromGitHub { owner = "google"; repo = "osv-scanner"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-IulgR8bXD/NBya5hK49uUbjKoVR9Xg4ZyvhI4eswoRE="; }; @@ -26,7 +26,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X=github.com/google/osv-scanner/internal/version.OSVVersion=${version}" + "-X=github.com/google/osv-scanner/internal/version.OSVVersion=${finalAttrs.version}" "-X=main.commit=n/a" "-X=main.date=1970-01-01T00:00:00Z" ]; @@ -42,11 +42,11 @@ buildGoModule rec { description = "Vulnerability scanner written in Go which uses the data provided by https://osv.dev"; mainProgram = "osv-scanner"; homepage = "https://github.com/google/osv-scanner"; - changelog = "https://github.com/google/osv-scanner/releases/tag/v${version}"; + changelog = "https://github.com/google/osv-scanner/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ stehessel urandom ]; }; -} +})