From 106695500c7f595311b588720f6edc1be29f155a Mon Sep 17 00:00:00 2001 From: SandaruKasa Date: Mon, 15 Jun 2026 02:34:05 +0300 Subject: [PATCH 1/2] gawk: `finalAttrs` does not change the eval --- pkgs/tools/text/gawk/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 87d2946e6160..210c78f909c7 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchpatch, removeReferencesTo, runtimeShellPackage, texinfo, @@ -24,12 +23,12 @@ assert (doCheck && stdenv.hostPlatform.isLinux) -> glibcLocales != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gawk" + lib.optionalString interactive "-interactive"; version = "5.4.1"; src = fetchurl { - url = "mirror://gnu/gawk/gawk-${version}.tar.xz"; + url = "mirror://gnu/gawk/gawk-${finalAttrs.version}.tar.xz"; hash = "sha256-B/b3NCt/6+QxP8LCVCrZPWT+IK2HFyABCfEFqCb1/Tc="; }; @@ -129,4 +128,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "gawk"; }; -} +}) From d588d92eefc8e6ca3f8dfe4a1eecafe8eaa03d77 Mon Sep 17 00:00:00 2001 From: SandaruKasa Date: Mon, 15 Jun 2026 02:34:05 +0300 Subject: [PATCH 2/2] gawk: `__structuredAttrs` & `enableParallelBuilding` `nix store make-content-addressed` gives the same output before and after this change. --- pkgs/tools/text/gawk/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 210c78f909c7..955c6b8d892f 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -49,7 +49,9 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional (!interactive) "man"; + __structuredAttrs = true; strictDeps = true; + enableParallelBuilding = true; # no-pma fix nativeBuildInputs = [