Deployment and lifecycle management for Nix
0
fork

Configure Feed

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

clients: reorganize and make go the default

+25 -7
+1 -1
Cargo.toml
··· 1 1 [workspace] 2 - members = [ "client" ] 2 + members = [ "client-rust" ] 3 3 resolver = "2"
client-go/log.go client/log.go
+18
client-go/main.go client/main.go
··· 72 72 } 73 73 rootCmd.AddCommand(daemonCmd) 74 74 75 + var seedCmd = &cobra.Command{ 76 + Use: "seed", 77 + Short: "Run seed related actions", 78 + // Run: func(cmd *cobra.Command, args []string) { 79 + // }, 80 + } 81 + rootCmd.AddCommand(seedCmd) 82 + var seedDownloadCommand = &cobra.Command{ 83 + Use: "download", 84 + Short: "Download a seed", 85 + Run: func(cmd *cobra.Command, args []string) { 86 + fmt.Println(args) 87 + }, 88 + } 89 + seedCmd.AddCommand(seedDownloadCommand) 90 + // seedDownloadCommand.Flags().String("name", seed.defaultName(), "seed name") 91 + // seedDownloadCommand.Flags().String("type", seed.defaultType(), "seed type") 92 + 75 93 if err := rootCmd.Execute(); err != nil { 76 94 fmt.Println(err) 77 95 os.Exit(1)
client-go/seed.go client/seed.go
client/Cargo.toml client-rust/Cargo.toml
client/justfile client-rust/justfile
client/src/main.rs client-rust/src/main.rs
client/src/sower.rs client-rust/src/sower.rs
client/src/sower/daemon.rs client-rust/src/sower/daemon.rs
+1 -1
flake.nix
··· 117 117 118 118 packages = { 119 119 seed-ci = pkgs.callPackage ./nix/seed-ci.nix { inherit (inputs'.attic.packages) attic; }; 120 - client = pkgs.callPackage ./nix/client-package.nix { inherit craneLib rustTarget; }; 120 + client = pkgs.callPackage ./nix/client-rust-package.nix { inherit craneLib rustTarget; }; 121 121 client-go = pkgs.callPackage ./nix/client-go-package.nix { buildGoModule = pkgs.buildGo122Module; }; 122 122 server = pkgs.callPackage ./nix/server-package.nix { inherit beamPackages elixir; }; 123 123 };
+1 -1
justfile
··· 39 39 iex --dbg pry -S mix phx.server 40 40 41 41 start-client: 42 - watchexec --watch client-go --restart -- go run ./client-go --debug 42 + watchexec --watch ./client --restart -- go run ./client --debug 43 43 44 44 test: 45 45 nix build .#checks.x86_64-linux.default --print-build-logs
+2 -2
nix/client-go-package.nix
··· 8 8 toSource { 9 9 root = ./..; 10 10 fileset = unions [ 11 - ../client-go 11 + ../client 12 12 ../go.mod 13 13 ../go.sum 14 14 ]; ··· 19 19 ldflags = [ "-X main.version=${version}" ]; 20 20 21 21 postInstall = '' 22 - mv $out/bin/client-go $out/bin/sower 22 + mv $out/bin/client $out/bin/sower 23 23 ''; 24 24 25 25 vendorHash = "sha256-7658me4SpEoO66Y16Qy3/ue6/AJTuwb2T1mS2OQGB64=";
+2 -2
nix/client-package.nix nix/client-rust-package.nix
··· 9 9 }: 10 10 11 11 craneLib.buildPackage ( 12 - craneLib.crateNameFromCargoToml { cargoToml = ../client/Cargo.toml; } 12 + craneLib.crateNameFromCargoToml { cargoToml = ../client-rust/Cargo.toml; } 13 13 // { 14 14 src = 15 15 with lib.fileset; 16 16 toSource { 17 17 root = ./..; 18 18 fileset = unions [ 19 - ../client 19 + ../client-rust 20 20 ../Cargo.lock 21 21 ../Cargo.toml 22 22 ];