nix-deploy 1.0.4 → 1.0.5
raw patch · 3 files changed
+21/−9 lines, 3 files
Files
- CHANGELOG.md +4/−0
- nix-deploy.cabal +1/−1
- src/Main.hs +16/−8
CHANGELOG.md view
@@ -1,3 +1,7 @@+# 1.0.5++- Support Nix 2+ # 1.0.4 ## Changed
nix-deploy.cabal view
@@ -1,5 +1,5 @@ name: nix-deploy-version: 1.0.4+version: 1.0.5 synopsis: Deploy Nix-built software to a NixOS machine homepage: https://github.com/awakesecurity/nix-deploy#readme license: Apache-2.0
src/Main.hs view
@@ -146,9 +146,14 @@ Path{..} -> do pathText <- case path of- Just p -> pure (Turtle.format fp p)- Nothing -> liftIO pathFromStdin+ Just p -> do+ p' <- Turtle.realpath p + pure (Turtle.format fp p')++ Nothing -> do+ liftIO pathFromStdin+ let (txDir, target) = renderDirection direction let targetText = lineToText target @@ -158,12 +163,11 @@ stderrLines [text|[+] Copying $pathText|] let transfer = Turtle.procs "nix-copy-closure"- ((if sign then ["--sign"] else []) <> [ (Turtle.format ("--"%s) txDir) , "--gzip" , targetText , pathText- ])+ ] empty -- Transfer path to target@@ -189,9 +193,14 @@ pathText <- case path of- Just p -> pure (Turtle.format fp p)- Nothing -> liftIO pathFromStdin+ Just p -> do+ p' <- Turtle.realpath p + pure (Turtle.format fp p')++ Nothing -> do+ liftIO pathFromStdin+ let profileText = case systemName of Nothing -> "/nix/var/nix/profiles/system"@@ -210,12 +219,11 @@ let transfer = Turtle.procs "nix-copy-closure"- ((if sign then ["--sign"] else []) <> [ (Turtle.format ("--"%s) txDir) , "--gzip" , targetText , pathText- ])+ ] empty let method = fromMaybe Test switchMethod