Add versions and apps

holochain · Jun 4, 2024 · 21f3142 · 21f3142
1 parent 2409319
commit 21f3142
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 86 deletions.
diff --git a/.github/workflows/build-and-cache.yaml b/.github/workflows/build-and-cache.yaml
@@ -34,6 +34,9 @@ jobs:
       - name: Build nix package
         run: nix build -L .#${{ matrix.package }}
 
+      - name: Run nix app
+        run: nix run .#${{ matrix.package }} --version
+
       - run: result/bin/${{ matrix.package }} --version
 
       # - name: Setup tmate session

diff --git a/build-and-cache.yaml b/build-and-cache.yaml
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -22,26 +22,26 @@
     };
 
     # Holochain sources
-    holochain-src = {
+    holochain = {
       url = "github:holochain/holochain/main";
       flake = false;
     };
 
     # Lair keystore sources
-    lair-keystore-src = {
+    lair-keystore = {
       url = "github:holochain/lair/lair_keystore-v0.4.4";
       flake = false;
     };
 
     # Holochain Launch CLI
-    hc-launch-src = {
+    hc-launch = {
       url = "github:holochain/launcher/holochain-weekly";
       flake = false;
     };
   };
 
   # outputs that this flake should produce
-  outputs = inputs @ { self, nixpkgs, flake-parts, rust-overlay, crane, holochain-src, lair-keystore-src, hc-launch-src, ... }:
+  outputs = inputs @ { self, nixpkgs, flake-parts, rust-overlay, crane, ... }:
     # refer to flake-parts docs https://flake.parts/
     flake-parts.lib.mkFlake { inherit inputs; } {
       # systems that his flake can be used on
@@ -56,8 +56,10 @@
             inherit system overlays;
           };
 
+          rustVersion = "1.78.0";
+
           # define Rust toolchain version and targets to be used in this flake
-          rust = (pkgs.rust-bin.stable."1.78.0".minimal.override
+          rust = (pkgs.rust-bin.stable.${rustVersion}.minimal.override
             {
               targets = [ "wasm32-unknown-unknown" ];
             });
@@ -72,14 +74,17 @@
               nonCargoBuildFiles = path: _type: builtins.match ".*(json|sql|wasm.gz)$" path != null;
               includeFilesFilter = path: type:
                 (craneLib.filterCargoSources path type) || (nonCargoBuildFiles path type);
+
+              # Crane doesn't know which version to select from a workspace, so we tell it where to look
+              crateInfo = craneLib.crateNameFromCargoToml { cargoToml = inputs.holochain + "/crates/holochain/Cargo.toml"; };
             in
             craneLib.buildPackage {
               pname = "holochain";
-              version = "workspace";
+              version = crateInfo.version;
               # Use Holochain sources as defined in input dependencies and include only those files defined in the
               # filter previously.
               src = pkgs.lib.cleanSourceWith {
-                src = holochain-src;
+                src = inputs.holochain;
                 filter = includeFilesFilter;
               };
               # additional packages needed for build
@@ -98,16 +103,19 @@
               nonCargoBuildFiles = path: _type: builtins.match ".*(sql|md)$" path != null;
               includeFilesFilter = path: type:
                 (craneLib.filterCargoSources path type) || (nonCargoBuildFiles path type);
+
+              # Crane doesn't know which version to select from a workspace, so we tell it where to look
+              crateInfo = craneLib.crateNameFromCargoToml { cargoToml = inputs.lair-keystore + "/crates/lair_keystore/Cargo.toml"; };
             in
             craneLib.buildPackage {
               pname = "lair-keystore";
-              version = "workspace";
+              version = crateInfo.version;
               # only build lair-keystore binary
               cargoExtraArgs = "--bin lair-keystore";
               # Use Lair keystore sources as defined in input dependencies and include only those files defined in the
               # filter previously.
               src = pkgs.lib.cleanSourceWith {
-                src = lair-keystore-src;
+                src = inputs.lair-keystore;
                 filter = includeFilesFilter;
               };
               # additional packages needed for build
@@ -131,6 +139,10 @@
               nonCargoBuildFiles = path: _type: builtins.match ".*(js|json|png)$" path != null;
               includeFilesFilter = path: type:
                 (craneLib.filterCargoSources path type) || (nonCargoBuildFiles path type);
+
+              # Crane doesn't know which version to select from a workspace, so we tell it where to look
+              crateInfo = craneLib.crateNameFromCargoToml { cargoToml = inputs.hc-launch + "/crates/hc_launch/src-tauri/Cargo.toml"; };
+
               # Use consistent version of Apple SDK throughout. Without this, building on x86_64-darwin fails.
               # See below.
               apple_sdk =
@@ -140,11 +152,11 @@
 
               commonArgs = {
                 pname = "hc-launch";
-                version = "workspace";
+                version = crateInfo.version;
                 # Use hc-launch sources as defined in input dependencies and include only those files defined in the
                 # filter previously.
                 src = pkgs.lib.cleanSourceWith {
-                  src = hc-launch-src;
+                  src = inputs.hc-launch;
                   filter = includeFilesFilter;
                 };
                 # Only build hc-launch command
@@ -194,7 +206,6 @@
 
               # derivation building all dependencies
               deps = craneLib.buildDepsOnly commonArgs;
-
             in
             # derivation with the main crates
             craneLib.buildPackage
@@ -212,6 +223,7 @@
               });
         in
         {
+          formatter = pkgs.nixpkgs-fmt;
 
           packages = {
             inherit holochain;
@@ -220,6 +232,12 @@
             inherit hc-launch;
           };
 
+          apps = {
+            holochain = "${holochain}/bin/holochain";
+            lair-keystore = "${lair-keystore}/bin/lair-keystore";
+            hc-launch.program = "${hc-launch}/bin/hc-launch";
+          };
+
           devShells = {
             default = pkgs.mkShell {
               packages = [