From 762ef173a9853bda376ae915cc879f964750f5ce Mon Sep 17 00:00:00 2001 From: Tom McLaughlin Date: Mon, 29 Apr 2024 11:53:56 -0600 Subject: [PATCH] Improve labels on introduceBinaryViaNix* functions --- sandwich-contexts/lib/Test/Sandwich/Contexts/Files.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sandwich-contexts/lib/Test/Sandwich/Contexts/Files.hs b/sandwich-contexts/lib/Test/Sandwich/Contexts/Files.hs index cf03422..d3b4ffa 100644 --- a/sandwich-contexts/lib/Test/Sandwich/Contexts/Files.hs +++ b/sandwich-contexts/lib/Test/Sandwich/Contexts/Files.hs @@ -113,7 +113,7 @@ introduceBinaryViaNixPackage' :: forall a context m. ( -> NixPackageName -> SpecFree (LabelValue (AppendSymbol "file-" a) (EnvironmentFile a) :> context) m () -> SpecFree context m () -introduceBinaryViaNixPackage' proxy packageName = introduce [i|#{symbolVal proxy} (binary via Nix)|] (mkLabel @a) alloc (const $ return ()) +introduceBinaryViaNixPackage' proxy packageName = introduce [i|#{symbolVal proxy} (binary via Nix package #{packageName})|] (mkLabel @a) alloc (const $ return ()) where alloc = buildNixSymlinkJoin [packageName] >>= tryFindBinary (symbolVal proxy) @@ -149,7 +149,7 @@ introduceBinaryViaNixDerivation' :: forall a context m. ( -> Text -> SpecFree (LabelValue (AppendSymbol "file-" a) (EnvironmentFile a) :> context) m () -> SpecFree context m () -introduceBinaryViaNixDerivation' proxy derivation = introduce [i|#{symbolVal proxy} (binary via Nix)|] (mkLabel @a) alloc (const $ return ()) +introduceBinaryViaNixDerivation' proxy derivation = introduce [i|#{symbolVal proxy} (binary via Nix derivation)|] (mkLabel @a) alloc (const $ return ()) where alloc = buildNixCallPackageDerivation derivation >>= tryFindBinary (symbolVal proxy)