From aecfd03ecdcad6d07b2d661d5cc82696cf51d313 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Mon, 15 Nov 2021 18:43:21 +0200 Subject: [PATCH 1/2] dep: Core,Remote: relude >= 1.0 --- hnix-store-core/hnix-store-core.cabal | 2 +- hnix-store-remote/hnix-store-remote.cabal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hnix-store-core/hnix-store-core.cabal b/hnix-store-core/hnix-store-core.cabal index ab5e07a..ef5eb9a 100644 --- a/hnix-store-core/hnix-store-core.cabal +++ b/hnix-store-core/hnix-store-core.cabal @@ -49,7 +49,7 @@ library , System.Nix.StorePathMetadata build-depends: base >=4.12 && <5 - , relude + , relude >= 1.0 , attoparsec , algebraic-graphs >= 0.5 && < 0.6 , base16-bytestring diff --git a/hnix-store-remote/hnix-store-remote.cabal b/hnix-store-remote/hnix-store-remote.cabal index adf7beb..c904b6e 100644 --- a/hnix-store-remote/hnix-store-remote.cabal +++ b/hnix-store-remote/hnix-store-remote.cabal @@ -40,7 +40,7 @@ library build-depends: base >=4.12 && <5 - , relude + , relude >= 1.0 , attoparsec , binary , bytestring From a432ee295dc37d6bd50bf008cf1364c5aeb6b669 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Mon, 15 Nov 2021 18:18:43 +0200 Subject: [PATCH 2/2] remote: test: NixDaemon: fx Text use --- hnix-store-remote/tests/NixDaemon.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hnix-store-remote/tests/NixDaemon.hs b/hnix-store-remote/tests/NixDaemon.hs index 36a797c..4fe7359 100644 --- a/hnix-store-remote/tests/NixDaemon.hs +++ b/hnix-store-remote/tests/NixDaemon.hs @@ -63,7 +63,7 @@ waitSocket fp x = do writeConf :: FilePath -> IO () writeConf fp = - writeFile fp $ toString $ unlines + writeFileText fp $ unlines [ "build-users-group = " , "trusted-users = root" , "allowed-users = *"