From 4784bc20c8a1a88bdeae6e0a866575a468da1c87 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 4 Jan 2025 06:22:41 +0000 Subject: [PATCH] diffoscope: fix the eval MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without the change the eval fails as: $ nix build --no-link -f. diffoscope error: … while evaluating the attribute 'drvPath' at lib/customisation.nix:416:7: 415| // { 416| drvPath = | ^ 417| assert condition; … while calling the 'derivationStrict' builtin at :34:12: 33| 34| strict = derivationStrict drvAttrs; | ^ 35| (stack trace truncated; use '--show-trace' to show the full, detailed trace) error: fetchFromGitHub requires one of either `rev` or `tag` to be provided (not both). --- pkgs/tools/misc/diffoscope/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index bf315e178845..55666e349a0d 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -94,7 +94,7 @@ let { inherit version; src = src.override { - rev = version; + tag = version; hash = "sha256-ZYEjT/yShfA4+zpbGOtaFOx1nSSOWPtMvskPhHv3c9U="; }; }