From 7f9c7443ae1d41611c2c1366296d6731989c3106 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 3 May 2022 11:57:34 +0200 Subject: [PATCH] yarn2nix: extend NixOS/nix#5128 workaround to 2.4+ The issue was not fixed in later versions, so we need the workaround for all versions greater than `2.4pre`. --- .../tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js index 5004e6f3903..e2bae7d3d6e 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js @@ -49,7 +49,8 @@ function fetchgit(fileName, url, rev, branch, builtinFetchGit) { url = "${url}"; ref = "${branch}"; rev = "${rev}"; - } // (if builtins.substring 0 3 builtins.nixVersion == "2.4" then { + } // (if builtins.compareVersions "2.4pre" builtins.nixVersion < 0 then { + # workaround for https://github.com/NixOS/nix/issues/5128 allRefs = true; } else {})); ` : `