From acf824c9ed70f623b424c2ca41d0f6821014c67c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= <kubukoz@gmail.com>
Date: Mon, 22 Nov 2021 18:15:40 +0100
Subject: [PATCH] sbt: trim output of password command

---
 modules/programs/sbt.nix                   | 2 +-
 tests/modules/programs/sbt/credentials.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/programs/sbt.nix b/modules/programs/sbt.nix
index 4e10d61ea..bf355a80b 100644
--- a/modules/programs/sbt.nix
+++ b/modules/programs/sbt.nix
@@ -9,7 +9,7 @@ let
   '';
 
   renderCredential = cred: ''
-    credentials += Credentials("${cred.realm}", "${cred.host}", "${cred.user}", "${cred.passwordCommand}".lazyLines.mkString("\n"))
+    credentials += Credentials("${cred.realm}", "${cred.host}", "${cred.user}", "${cred.passwordCommand}".!!.trim)
   '';
 
   renderCredentials = creds: ''
diff --git a/tests/modules/programs/sbt/credentials.nix b/tests/modules/programs/sbt/credentials.nix
index 83ec904c9..55c3936a1 100644
--- a/tests/modules/programs/sbt/credentials.nix
+++ b/tests/modules/programs/sbt/credentials.nix
@@ -19,8 +19,8 @@ let
   ];
   expectedCredentialsSbt = pkgs.writeText "credentials.sbt" ''
     import scala.sys.process._
-    credentials += Credentials("Sonatype Nexus Repository Manager", "example.com", "user", "echo password".lazyLines.mkString("\n"))
-    credentials += Credentials("Sonatype Nexus Repository Manager X", "v2.example.com", "user1", "echo password1".lazyLines.mkString("\n"))
+    credentials += Credentials("Sonatype Nexus Repository Manager", "example.com", "user", "echo password".!!.trim)
+    credentials += Credentials("Sonatype Nexus Repository Manager X", "v2.example.com", "user1", "echo password1".!!.trim)
   '';
   credentialsSbtPath = ".sbt/1.0/credentials.sbt";
 in {