Deployment and lifecycle management for Nix
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

client: rename to cli

client: client -> sower-cli

+18 -18
+1 -1
cmd/client/builder/main.go cmd/cli/builder/main.go
··· 8 8 "log/slog" 9 9 "os/exec" 10 10 11 - "codeberg.org/adamcstephens/sower/cmd/client/commands" 11 + "codeberg.org/adamcstephens/sower/cmd/cli/commands" 12 12 "github.com/golang-queue/queue" 13 13 ) 14 14
cmd/client/channel-client.go cmd/cli/channel-client.go
cmd/client/commands/main.go cmd/cli/commands/main.go
cmd/client/log.go cmd/cli/log.go
+1 -1
cmd/client/main.go cmd/cli/main.go
··· 12 12 "time" 13 13 14 14 "codeberg.org/adamcstephens/sower/client" 15 - "codeberg.org/adamcstephens/sower/cmd/client/builder" 15 + "codeberg.org/adamcstephens/sower/cmd/cli/builder" 16 16 "github.com/adrg/xdg" 17 17 "github.com/alexflint/go-arg" 18 18 "github.com/lmittmann/tint"
+1 -1
cmd/client/seed.go cmd/cli/seed.go
··· 9 9 "strings" 10 10 11 11 "codeberg.org/adamcstephens/sower/client" 12 - "codeberg.org/adamcstephens/sower/cmd/client/commands" 12 + "codeberg.org/adamcstephens/sower/cmd/cli/commands" 13 13 ) 14 14 15 15 func activate(seedType client.SeedSeedType, storePath string, mode string) error {
+1 -1
cmd/client/services.go cmd/cli/services.go
··· 11 11 "path/filepath" 12 12 13 13 "codeberg.org/adamcstephens/sower/client" 14 - "codeberg.org/adamcstephens/sower/cmd/client/commands" 14 + "codeberg.org/adamcstephens/sower/cmd/cli/commands" 15 15 "github.com/adrg/xdg" 16 16 ) 17 17
+1 -1
flake.nix
··· 109 109 packages = rec { 110 110 seed-ci = pkgs.callPackage ./nix/packages/seed-ci.nix { }; 111 111 112 - client = pkgs.callPackage ./nix/packages/client.nix { 112 + cli = pkgs.callPackage ./nix/packages/cli.nix { 113 113 inherit version; 114 114 }; 115 115
+7 -7
justfile
··· 28 28 mix assets.build 29 29 30 30 dev-seed-from-local: 31 - go run ./cmd/client seed submit --create --name $(hostname -s) --type nixos --path $(readlink -f /run/booted-system) 32 - go run ./cmd/client seed submit --create --name $(hostname -s) --type home-manager --path $(readlink -f $HOME/.local/state/nix/profiles/home-manager) 31 + go run ./cmd/cli seed submit --create --name $(hostname -s) --type nixos --path $(readlink -f /run/booted-system) 32 + go run ./cmd/cli seed submit --create --name $(hostname -s) --type home-manager --path $(readlink -f $HOME/.local/state/nix/profiles/home-manager) 33 33 34 34 dev-services: 35 35 process-compose list || process-compose up --detached ··· 90 90 go mod edit -go=$(go version | awk '{print $3}' | sed 's/go//') 91 91 go mod tidy 92 92 just update-go-hash 93 - git add go.mod go.sum nix/packages/client.nix 94 - git commit -m 'server(chore): update go deps' -- go.mod go.sum nix/packages/client.nix 93 + git add go.mod go.sum nix/packages/cli.nix 94 + git commit -m 'server(chore): update go deps' -- go.mod go.sum nix/packages/cli.nix 95 95 96 96 update-go-hash: 97 97 #!/usr/bin/env bash ··· 99 99 set -eou pipefail 100 100 101 101 setKV() { 102 - sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./nix/packages/client.nix 102 + sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./nix/packages/cli.nix 103 103 } 104 104 105 105 setKV vendorHash "sha256-BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB=" # Necessary to force clean build. 106 106 107 107 set +e 108 - VENDOR_HASH=$(nix build --no-link .#client 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') 108 + VENDOR_HASH=$(nix build --no-link .#cli 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') 109 109 set -e 110 110 111 111 if [ -n "${VENDOR_HASH:-}" ]; then ··· 115 115 exit 1 116 116 fi 117 117 118 - git diff ./nix/packages/client.nix 118 + git diff ./nix/packages/cli.nix
+3 -3
nix/packages/client.nix nix/packages/cli.nix
··· 11 11 in 12 12 13 13 buildGoModule rec { 14 - pname = "sower-client"; 14 + pname = "sower-cli"; 15 15 inherit version; 16 16 17 17 src = ··· 20 20 root = ../..; 21 21 fileset = unions [ 22 22 ../../client 23 - ../../cmd/client 23 + ../../cmd/cli 24 24 ../../go.mod 25 25 ../../go.sum 26 26 ../../openapi.json ··· 39 39 ]; 40 40 41 41 postInstall = '' 42 - mv $out/bin/client $out/bin/sower 42 + mv $out/bin/cli $out/bin/sower 43 43 44 44 wrapProgram $out/bin/sower --prefix PATH : ${ 45 45 lib.makeBinPath [
+3 -3
nix/tests/e2e.nix
··· 52 52 53 53 services.sower.client = { 54 54 enable = true; 55 - package = flake.packages.${pkgs.system}.client; 55 + package = flake.packages.${pkgs.system}.cli; 56 56 57 57 settings = { 58 58 api-token-file = "/run/sower/test_token"; ··· 90 90 91 91 log_level = "debug"; 92 92 93 - clients."${pkgs.system}".path = builtins.toString flake.packages.${pkgs.system}.client; 93 + clients."${pkgs.system}".path = builtins.toString flake.packages.${pkgs.system}.cli; 94 94 }; 95 95 }; 96 96 # if server fails to start, fail immediately ··· 117 117 118 118 services.sower.client = { 119 119 enable = true; 120 - package = flake.packages.${pkgs.system}.client; 120 + package = flake.packages.${pkgs.system}.cli; 121 121 122 122 settings = { 123 123 api-token-file = "/run/sower/test_token";