Revert "localPackages.hpcstat: add version"

This reverts commit ffad809c4a.

local/pkgs/default.nix

@@ -85,8 +85,7 @@ inputs: rec
     { src = inputs.topInputs.kylin-virtual-keyboard; };
   biu = inputs.pkgs.callPackage ./biu { inherit nameof; };
   zxorm = inputs.pkgs.callPackage ./zxorm { src = inputs.topInputs.zxorm; };
-  hpcstat = inputs.pkgs.callPackage ./hpcstat
-    { inherit nameof sqlite-orm zpp-bits; version = inputs.topInputs.self.rev or "dirty"; };
+  hpcstat = inputs.pkgs.callPackage ./hpcstat { inherit nameof sqlite-orm zpp-bits; };
   openxlsx = inputs.pkgs.callPackage ./openxlsx { src = inputs.topInputs.openxlsx; };
   sqlite-orm = inputs.pkgs.callPackage ./sqlite-orm { src = inputs.topInputs.sqlite-orm; };
 

local/pkgs/hpcstat/default.nix

@@ -1,5 +1,5 @@
 {
-  stdenv, cmake, pkg-config, standalone ? false, makeWrapper, version ? null, lib,
+  stdenv, cmake, pkg-config, standalone ? false, makeWrapper,
   boost, fmt, sqlite-orm, nlohmann_json, zpp-bits, range-v3, nameof, openssh, sqlite
 }: stdenv.mkDerivation
 {
@@ -7,7 +7,6 @@
   src = ./.;
   buildInputs = [ boost fmt sqlite-orm nlohmann_json zpp-bits range-v3 nameof sqlite ];
   nativeBuildInputs = [ cmake pkg-config makeWrapper ];
-  cmakeFlags = lib.optionals (version != null) [ ''-DHPCSTAT_VERSION="${version}"'' ];
   postInstall =
     if standalone then "cp ${openssh}/bin/{ssh-add,ssh-keygen} $out/bin"
     else

local/pkgs/hpcstat/src/main.cpp

@@ -6,10 +6,6 @@
 # include <range/v3/view.hpp>
 # include <boost/exception/diagnostic_information.hpp>
 
-# ifndef HPCSTAT_VERSION
-#   define HPCSTAT_VERSION "dirty"
-# endif
-
 int main(int argc, const char** argv)
 {
   try
@@ -18,7 +14,7 @@ int main(int argc, const char** argv)
     using namespace std::literals;
     std::vector<std::string> args(argv, argv + argc);
 
-    if (args.size() == 1) { std::cout << "Usage: hpcstat login|logout|submitjob|finishjob|verify|version\n"; return 1; }
+    if (args.size() == 1) { std::cout << "Usage: hpcstat login|logout|submitjob|finishjob|verify\n"; return 1; }
     else if (args[1] == "login")
     {
       if (env::interactive())
@@ -119,7 +115,6 @@ int main(int argc, const char** argv)
         if (!std::apply(ssh::verify, data))
           { std::cerr << fmt::format("Failed to verify data: {}\n", std::get<0>(data)); return 1; }
     }
-    else if (args[1] == "version") std::cout << HPCSTAT_VERSION << std::endl;
     else { std::cerr << "Unknown command.\n"; return 1; }
   }
   catch (...) { std::cerr << boost::current_exception_diagnostic_information() << std::endl; return 1; }

local/pkgs/hpcstat/src/sql.cpp

@@ -31,7 +31,7 @@ namespace hpcstat::sql
         sqlite_orm::make_column("key", &LoginData::Key),
         sqlite_orm::make_column("session_id", &LoginData::SessionId),
         sqlite_orm::make_column("signature", &LoginData::Signature),
-        sqlite_orm::make_column("subaccount", &LoginData::Subaccount),
+        sqlite_orm::make_column("sub_account", &LoginData::Subaccount),
         sqlite_orm::make_column("ip", &LoginData::Ip),
         sqlite_orm::make_column("interactive", &LoginData::Interactive)
       ),
@@ -53,7 +53,7 @@ namespace hpcstat::sql
         sqlite_orm::make_column("submit_dir", &SubmitJobData::SubmitDir),
         sqlite_orm::make_column("job_command", &SubmitJobData::JobCommand),
         sqlite_orm::make_column("signature", &SubmitJobData::Signature),
-        sqlite_orm::make_column("subaccount", &SubmitJobData::Subaccount),
+        sqlite_orm::make_column("sub_account", &SubmitJobData::Subaccount),
         sqlite_orm::make_column("ip", &SubmitJobData::Ip)
       ),
       sqlite_orm::make_table