From 58a934b997bb06f475bf707d0994f1fa37584cc1 Mon Sep 17 00:00:00 2001 From: notgne2 Date: Mon, 5 Oct 2020 19:53:59 -0700 Subject: Clean up `simple` example --- examples/simple/flake.lock | 4 ++-- examples/simple/flake.nix | 37 +++++++++---------------------------- 2 files changed, 11 insertions(+), 30 deletions(-) diff --git a/examples/simple/flake.lock b/examples/simple/flake.lock index 7791c84..1e2fab0 100644 --- a/examples/simple/flake.lock +++ b/examples/simple/flake.lock @@ -7,8 +7,8 @@ "utils": "utils" }, "locked": { - "lastModified": 1601668691, - "narHash": "sha256-1mWf71DPRNgTIUKJ4Dy+CjoyZo4JkPdrwjYJy2UzqZE=", + "lastModified": 1601952388, + "narHash": "sha256-g5t4JNUl4xmKfKmzo5yzligVNTBHOTgw+vkuebP4B/Q=", "type": "git", "url": "file:///home/notgne2/Dev/Serokell/deploy-rs" }, diff --git a/examples/simple/flake.nix b/examples/simple/flake.nix index d44b888..a8ad0f7 100644 --- a/examples/simple/flake.nix +++ b/examples/simple/flake.nix @@ -7,34 +7,15 @@ inputs.deploy-rs.url = "github:serokell/deploy-rs"; - outputs = { self, nixpkgs, deploy-rs }: - let - setActivate = base: activate: nixpkgs.legacyPackages.x86_64-linux.symlinkJoin { - name = ("activatable-" + base.name); - paths = [ - base - (nixpkgs.legacyPackages.x86_64-linux.writeTextFile { - name = base.name + "-activate-path"; - text = '' - #!${nixpkgs.legacyPackages.x86_64-linux.runtimeShell} - ${activate} - ''; - executable = true; - destination = "/activate"; - }) - ]; + outputs = { self, nixpkgs, deploy-rs }: { + deploy.nodes.example = { + hostname = "localhost"; + profiles.hello = { + user = "balsoft"; + path = deploy-rs.lib.x86_64-linux.setActivate nixpkgs.legacyPackages.x86_64-linux.hello "./bin/hello"; }; - in - { - - deploy.nodes.example = { - hostname = "localhost"; - profiles.hello = { - user = "balsoft"; - path = deploy-rs.lib.x86_64-linux.setActivate nixpkgs.legacyPackages.x86_64-linux.hello "./bin/hello"; - }; - }; - - checks = { "x86_64-linux" = { jsonSchema = deploy-rs.lib.x86_64-linux.checkSchema self.deploy; }; }; }; + + checks = { "x86_64-linux" = { jsonSchema = deploy-rs.lib.x86_64-linux.checkSchema self.deploy; }; }; + }; } -- cgit v1.2.3