From 465833524f2ae3b012e16a67ca4cf089479a0f69 Mon Sep 17 00:00:00 2001 From: celeste Date: Wed, 10 Jun 2026 19:19:33 -0700 Subject: [PATCH 1/2] sif: 0-unstable-2026-06-09 -> 0-unstable-2026-06-11 --- pkgs/by-name/si/sif/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/si/sif/package.nix b/pkgs/by-name/si/sif/package.nix index be7c7678278a..5894dd26141f 100644 --- a/pkgs/by-name/si/sif/package.nix +++ b/pkgs/by-name/si/sif/package.nix @@ -7,16 +7,16 @@ buildGoModule { pname = "sif"; - version = "0-unstable-2026-06-09"; + version = "0-unstable-2026-06-11"; src = fetchFromGitHub { owner = "vmfunc"; repo = "sif"; - rev = "83ac92a4b82a0ab92257c580c9b6a3b82ab66af9"; - hash = "sha256-VeURSRwvuh+VJd94mG2F8wQWD6NIitxqwRQr3IJ0QzU="; + rev = "d62919523abfecd06e07ba6528b15e9861bd747c"; + hash = "sha256-T/HIvcXG3OpSK7xhZpYnCWv4KsRn0bnLhyouPjgwUoE="; }; - vendorHash = "sha256-fR63/dStMsZon22vancuLWIAvZiEYMLjMwY1kmRDNgM="; + vendorHash = "sha256-rOAubGbeDPl0LJovksKRfYJmUvU6hmx3Ht12M7eLiOA="; subPackages = [ "cmd/sif" ]; From 6f8e3f422e207bc94569e6a2bb097e9153ca7f20 Mon Sep 17 00:00:00 2001 From: vmfunc Date: Thu, 11 Jun 2026 15:53:21 -0700 Subject: [PATCH 2/2] sif: stamp version and install man page Requested in review of #530117: set the version via ldflags (upstream uses lowercase main.version) and install the sif.1 man page. --- pkgs/by-name/si/sif/package.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/sif/package.nix b/pkgs/by-name/si/sif/package.nix index 5894dd26141f..0b33852a7892 100644 --- a/pkgs/by-name/si/sif/package.nix +++ b/pkgs/by-name/si/sif/package.nix @@ -2,10 +2,11 @@ lib, buildGoModule, fetchFromGitHub, + installShellFiles, nix-update-script, }: -buildGoModule { +buildGoModule (finalAttrs: { pname = "sif"; version = "0-unstable-2026-06-11"; @@ -20,16 +21,24 @@ buildGoModule { subPackages = [ "cmd/sif" ]; + nativeBuildInputs = [ installShellFiles ]; + env.CGO_ENABLED = 0; ldflags = [ "-s" "-w" + # upstream stamps the lowercase main.version, see cmd/sif/main.go + "-X main.version=${finalAttrs.version}" ]; # network-dependent tests doCheck = false; + postInstall = '' + installManPage man/sif.1 + ''; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" @@ -44,4 +53,4 @@ buildGoModule { maintainers = with lib.maintainers; [ vmfunc ]; mainProgram = "sif"; }; -} +})