From f22d377d939f3da8f646602ae257b9a1821f1cb2 Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Tue, 24 Feb 2026 00:32:49 -0800 Subject: [PATCH 1/2] Revert "ncps: workaround older Go version in the master branch" This reverts commit 0ba37620224593dbdfae96fdeb88dd01a363a257. --- pkgs/by-name/nc/ncps/package.nix | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/pkgs/by-name/nc/ncps/package.nix b/pkgs/by-name/nc/ncps/package.nix index 197ffc0c52e0..ea2a5e702d8c 100644 --- a/pkgs/by-name/nc/ncps/package.nix +++ b/pkgs/by-name/nc/ncps/package.nix @@ -3,7 +3,6 @@ curl, dbmate, fetchFromGitHub, - go, jq, lib, makeWrapper, @@ -30,15 +29,6 @@ buildGoModule (finalAttrs: { hash = "sha256-cu7fgzQTpo8aLpK0/kJ3xcCVFCmFMQ6RKwUWW5Zwu6s="; }; - # XXX: ncps is built with Go 1.25.6 that is available in release-25.11 but - # master is currently still using 1.25.5 (update waiting in the - # staging/staging-next branches.) This is a workaround for this issue and - # will automatically becomes no-op once Go is updated. - preBuild = lib.optionalString (go.version == "1.25.5") '' - sed -e 's:go 1.25.6:go 1.25.5:g' -i go.mod - sed -e 's:go 1.25.6:go 1.25.5:g' -i nix/dbmate-wrapper/src/go.mod - ''; - vendorHash = "sha256-QZikr0kE/kvnI4RG02lxVpG4teTg3Uo68st9xLlbfm0="; ldflags = [ @@ -112,14 +102,6 @@ buildGoModule (finalAttrs: { src = "${finalAttrs.src}/nix/dbmate-wrapper/src"; - # XXX: ncps is built with Go 1.25.6 that is available in release-25.11 but - # master is currently still using 1.25.5 (update waiting in the - # staging/staging-next branches.) This is a workaround for this issue and - # will automatically becomes no-op once Go is updated. - preBuild = lib.optionalString (go.version == "1.25.5") '' - sed -e 's:go 1.25.6:go 1.25.5:g' -i go.mod - ''; - vendorHash = null; buildInputs = lib.singleton dbmate; From e4c07eea65506b390aea510a0ff035e8bc852b83 Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Tue, 24 Feb 2026 09:44:59 -0800 Subject: [PATCH 2/2] ncps: 0.9.1 -> 0.9.2 --- pkgs/by-name/nc/ncps/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nc/ncps/package.nix b/pkgs/by-name/nc/ncps/package.nix index ea2a5e702d8c..72787241b11e 100644 --- a/pkgs/by-name/nc/ncps/package.nix +++ b/pkgs/by-name/nc/ncps/package.nix @@ -20,16 +20,16 @@ buildGoModule (finalAttrs: { pname = "ncps"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "kalbasit"; repo = "ncps"; tag = "v${finalAttrs.version}"; - hash = "sha256-cu7fgzQTpo8aLpK0/kJ3xcCVFCmFMQ6RKwUWW5Zwu6s="; + hash = "sha256-LRabKv+4xYQn2XH4AIacFkn3ewUd2S3UlVWCA6MUweU="; }; - vendorHash = "sha256-QZikr0kE/kvnI4RG02lxVpG4teTg3Uo68st9xLlbfm0="; + vendorHash = "sha256-PpHSkD7+csPfUXoYRuKhBm1iBtTSwJhOxuW/4ayv9hY="; ldflags = [ "-X github.com/kalbasit/ncps/pkg/ncps.Version=v${finalAttrs.version}"