From a46c0f95b331ad4ca359ae20a8a922481e630e46 Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <rodney.lorrimar@iohk.io>
Date: Thu, 9 Jan 2020 15:14:46 +1000
Subject: [PATCH] release.nix: Ensure filenames in testing bundle have correct
 names

---
 release.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/release.nix b/release.nix
index 8723c2789fe..e413008e09c 100644
--- a/release.nix
+++ b/release.nix
@@ -40,7 +40,14 @@ with pkgs.lib;
 
 let
   testsSupportedSystems = [ "x86_64-linux" "x86_64-darwin" ];
-  collectTests = ds: filter (d: elem d.system testsSupportedSystems) (collect isDerivation ds);
+  # Recurse through an attrset, returning all test derivations in a list.
+  collectTests' = ds: filter (d: elem d.system testsSupportedSystems) (collect isDerivation ds);
+  # Adds the package name to the test derivations for windows-testing-bundle.nix
+  # (passthru.identifier.name does not survive mapTestOn)
+  collectTests = ds: concatLists (
+    mapAttrsToList (packageName: package:
+      map (drv: drv // { inherit packageName; }) (collectTests' package)
+    ) ds);
 
   inherit (systems.examples) mingwW64 musl64;