From a45a73ae19e86ed201bdbafebfed9df4996fdaa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 18 Jun 2025 10:36:38 +0200 Subject: [PATCH] nixVersions.nix_2_29: fixup tests In the current build approach I couldn't quickly figure out how to patch the source, so I just pushed it into a git branch. We'll surely do it better soon, e.g. by upstream fixing this in 2.29 branch or even releasing 2.29.1. --- pkgs/tools/package-management/nix/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 35866d4331fc..7d3c6fbfcc59 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -191,10 +191,12 @@ lib.makeExtensible ( inherit (self.nix_2_24.meta) maintainers teams; otherSplices = generateSplicesForNixComponents "nixComponents_2_29"; src = fetchFromGitHub { - owner = "NixOS"; + # FIXME: back to NixOS org once they fix it + owner = "vcunat"; repo = "nix"; - rev = version; - hash = "sha256-fkbE3RCIUPFjS9A6SoEJbgMW3Rs98cs0ZZV/eTtJjaU="; + rev = "p/jq-1.8.0"; # just a tiny test-only patch atop 2.29.0 + # see https://github.com/NixOS/nix/pull/13371 + hash = "sha256-F2ZODsET4cBsgsyOi8Sg/quESU0DnrYri0hYniqu37k="; }; };