versioning (WIP)

flake.nix

@@ -13,6 +13,13 @@
       ];
       forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
       nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; });
+
+      baseVersion = "0.1.4";
+
+semver = 
+  if self ? rev 
+  then "${baseVersion}+${toString self.revCount}.git.${builtins.substring 0 7 self.rev}"
+  else "${baseVersion}+dev";  # Accept that local builds show "+dev"
     in
     {
       packages = forAllSystems (
@@ -21,7 +28,7 @@
           pkgs = nixpkgsFor.${system};
         in
         rec {
-          clrsync = pkgs.callPackage ./package.nix { };
+          clrsync = pkgs.callPackage ./package.nix { inherit semver; };
           default = clrsync;
         }
       );

package.nix

@@ -16,18 +16,13 @@
   zlib,
   bzip2,
   wayland-scanner,
+  semver
 }:
 
 stdenv.mkDerivation rec {
   pname = "clrsync";
 
-  baseVersion = "0.1.4";
-
-  version =
-    if src ? rev then
-      "${baseVersion}+${toString src.revCount}.git.${lib.substring 0 7 src.rev}"
-    else
-      baseVersion;
+  version = semver;
 
   src = lib.cleanSourceWith {
     src = ./.;

src/core/version.hpp

@@ -7,7 +7,7 @@
 namespace clrsync::core
 {
 
-const std::string GIT_SEMVER = "0.1.4+3.git.g8a2b224";
+const std::string GIT_SEMVER = "0.1.4+4.git.ga5d6503";
 
 const std::string version_string();
 } // namespace clrsync::core