From 6fedb4166e0872ba2c1324c3b2c864bfaa2daa7e Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Fri, 2 Jan 2026 18:16:53 +0800 Subject: [PATCH 1/2] netcat-openbsd: 1.219-1 -> 1.234-1; fix build with gcc15 --- pkgs/by-name/ne/netcat-openbsd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/netcat-openbsd/package.nix b/pkgs/by-name/ne/netcat-openbsd/package.nix index 45de1ff7cd25..74a0145d96ce 100644 --- a/pkgs/by-name/ne/netcat-openbsd/package.nix +++ b/pkgs/by-name/ne/netcat-openbsd/package.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "netcat-openbsd"; - version = "1.219-1"; + version = "1.234-1"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "netcat-openbsd"; - rev = "refs/tags/debian/${version}"; - sha256 = "sha256-rN8pl3Qf0T8bXGtVH22tBpGY/EcnbgGm1G8Z2patGbo="; + tag = "debian/${version}"; + hash = "sha256-6pCsBbS2IjXyXgNXURHK3uMRTJ0aXAsu29kc7f479Os="; }; strictDeps = true; From ee2bd9ac8394b9992bd712e7cebbd7a5fdcd058e Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Fri, 2 Jan 2026 18:25:57 +0800 Subject: [PATCH 2/2] netcat-openbsd: modernize --- pkgs/by-name/ne/netcat-openbsd/package.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ne/netcat-openbsd/package.nix b/pkgs/by-name/ne/netcat-openbsd/package.nix index 74a0145d96ce..d9fd6890251e 100644 --- a/pkgs/by-name/ne/netcat-openbsd/package.nix +++ b/pkgs/by-name/ne/netcat-openbsd/package.nix @@ -7,7 +7,7 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "netcat-openbsd"; version = "1.234-1"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { domain = "salsa.debian.org"; owner = "debian"; repo = "netcat-openbsd"; - tag = "debian/${version}"; + tag = "debian/${finalAttrs.version}"; hash = "sha256-6pCsBbS2IjXyXgNXURHK3uMRTJ0aXAsu29kc7f479Os="; }; @@ -35,8 +35,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/bin - mv nc $out/bin/nc + install -Dm755 -t $out/bin nc installManPage nc.1 runHook postInstall @@ -57,4 +56,4 @@ stdenv.mkDerivation rec { # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs broken = stdenv.hostPlatform.isDarwin; }; -} +})