From 27d798d68a25817f9f9b82c17db26e8329c9c33a Mon Sep 17 00:00:00 2001 From: Robin Krom Date: Thu, 15 Aug 2019 16:12:42 +0200 Subject: [PATCH] language: use versioned name for conf files. (#2558) Otherwise importing two different versions of the same package overrides one conf file. --- compiler/damlc/daml-compiler/src/DA/Daml/Compiler/Dar.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/damlc/daml-compiler/src/DA/Daml/Compiler/Dar.hs b/compiler/damlc/daml-compiler/src/DA/Daml/Compiler/Dar.hs index 5dd910944cb..7a231af16f6 100644 --- a/compiler/damlc/daml-compiler/src/DA/Daml/Compiler/Dar.hs +++ b/compiler/damlc/daml-compiler/src/DA/Daml/Compiler/Dar.hs @@ -141,7 +141,7 @@ mkConfFile :: PackageConfigFields -> [String] -> String -> (String, BS.ByteString) mkConfFile PackageConfigFields {..} pkgModuleNames pkgId = (confName, bs) where - confName = pName ++ ".conf" + confName = pkgNameVersion pName pVersion ++ ".conf" key = fullPkgName pName pVersion pkgId sanitizeBaseDeps "daml-stdlib" = damlStdlib sanitizeBaseDeps dep = dep