Merge branch 'main' into arm-test

Makefile

@@ -10,7 +10,7 @@ endif
 # By default make `?=` operator will treat empty assignment as a set value and will not use the default value.
 # Both cases should fallback to default of getting the version from git tag.
 ifeq ($(strip $(REPOSITORY_VERSION)),)
-	override REPOSITORY_VERSION = "$(shell git describe --tags --always --abbrev=0 --match='v[0-9]*.[0-9]*.[0-9]*' 2> /dev/null | sed 's/^.//')"
+	override REPOSITORY_VERSION = "$(shell ( git describe --tags --always --abbrev=0 --match='v[0-9]*.[0-9]*.[0-9]*' 2> /dev/null | sed 's/^.//' ) )"
 endif  
 REPOSITORY_BRANCH := "$(shell git rev-parse --abbrev-ref HEAD)"
 BUILD_TIMESTAMP ?= $(shell date '+%Y-%m-%dT%H:%M:%S')

README.md

@@ -37,6 +37,13 @@ Install the latest version from source:
 cargo install --locked stellar-cli --features opt
 ```
 
+Install or run the unreleased main branch with nix:
+```
+% nix run 'github:stellar/stellar-cli' -- --help
+or install
+% nix profile install github:stellar/stellar-cli
+```
+
 ## Autocomplete
 The Stellar CLI supports some autocompletion. To set up, run the following commands:
 

flake.nix

@@ -1,5 +1,5 @@
 {
-  description = "stellar-cli development shell";
+  description = "stellar-cli";
 
   inputs = {
     nixpkgs.url      = "github:NixOS/nixpkgs/nixos-unstable";
@@ -14,14 +14,13 @@
         pkgs = import nixpkgs {
           inherit system overlays;
         };
-      in
-      with pkgs;
-      {
-        devShells.default = mkShell {
-          nativeBuildInputs = lib.optionals (stdenv.isDarwin) [
+        stellardev = {
+          name = "stellar";
+          src = ./.;
+          nativeBuildInputs = pkgs.lib.optionals (pkgs.stdenv.isDarwin) [
             pkgs.darwin.apple_sdk.frameworks.SystemConfiguration
           ];
-          buildInputs = [
+          buildInputs = with pkgs; [
             openssl
             pkg-config
             jq
@@ -31,6 +30,29 @@
             })
           ] ++ lib.optionals (stdenv.isLinux) [libudev-zero];
         };
+        stellarcli = stellardev // {
+          cargoLock = {
+            lockFile = ./Cargo.lock;
+          };
+
+          cargoLock.outputHashes = {
+              # The only git+https dependency in Cargo.lock
+              "stellar-rpc-client-21.4.0" = "sha256-ue7Ynux9YaDP3f/XkHz2OPd2g0iCX5R0yS5SaVHEYxQ";
+          };
+
+          doCheck = false;
+
+          GIT_REVISION = "${self.rev or self.dirtyRev or "unknown"}";
+        };
+        rustPlatformMod = pkgs.makeRustPlatform {
+          cargo = pkgs.rust-bin.stable.latest.default;
+          rustc = pkgs.rust-bin.stable.latest.default;
+        };
+      in
+      with pkgs;
+      {
+        devShells.default = mkShell stellardev;
+        packages.default = rustPlatformMod.buildRustPackage stellarcli;
       }
     );
 }