Improve labels on introduceBinaryViaNix* functions

This commit is contained in:
Tom McLaughlin 2024-04-29 11:53:56 -06:00
parent 3c2b8bb659
commit 762ef173a9

View File

@ -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)