From 901fdac930cf790323c97cfcb380f45dfc6cbf1f Mon Sep 17 00:00:00 2001 From: Andrew Torgesen Date: Fri, 24 Oct 2025 22:49:14 -0700 Subject: [PATCH 1/7] [C++] Adopt spdlog and Catch2 --- flake.lock | 7 ++++--- flake.nix | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 21839f47..730d9708 100644 --- a/flake.lock +++ b/flake.lock @@ -377,15 +377,16 @@ "mscpp": { "flake": false, "locked": { - "lastModified": 1760768607, - "narHash": "sha256-f+h30sxSudytbX+Z9XBipR9gMFxMHjpWRNhfOGFJonY=", + "lastModified": 1761371228, + "narHash": "sha256-j+C1vKHrk58cjNlPiB7QRLKA6j+/SdO24Y8EmIITNSQ=", "owner": "goromal", "repo": "mscpp", - "rev": "98b27d5b0dc868eb8010be7f70d81af708403efb", + "rev": "6e39931cda764417b989855ad4ab66b183872a1c", "type": "github" }, "original": { "owner": "goromal", + "ref": "dev/spdlog-catch2", "repo": "mscpp", "type": "github" } diff --git a/flake.nix b/flake.nix index 3c709c9f..730d7a15 100644 --- a/flake.nix +++ b/flake.nix @@ -78,7 +78,7 @@ mfn.url = "github:goromal/mfn"; mfn.flake = false; - mscpp.url = "github:goromal/mscpp"; + mscpp.url = "github:goromal/mscpp?ref=dev/spdlog-catch2"; mscpp.flake = false; orchestrator.url = "github:goromal/orchestrator"; From 9d3a9c268712edb3c502f95eaee14ba8110a0750 Mon Sep 17 00:00:00 2001 From: Andrew Torgesen Date: Sat, 25 Oct 2025 09:39:24 -0700 Subject: [PATCH 2/7] build --- pkgs/cxx-packages/mscpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/cxx-packages/mscpp/default.nix b/pkgs/cxx-packages/mscpp/default.nix index f930d348..75c866c4 100644 --- a/pkgs/cxx-packages/mscpp/default.nix +++ b/pkgs/cxx-packages/mscpp/default.nix @@ -1,10 +1,10 @@ -{ clangStdenv, cmake, boost, pkg-src }: +{ clangStdenv, cmake, catch2, spdlog, pkg-src }: clangStdenv.mkDerivation { name = "mscpp"; version = "1.0.0"; src = pkg-src; nativeBuildInputs = [ cmake ]; - buildInputs = [ boost ]; + buildInputs = [ catch2 spdlog ]; preConfigure = '' cmakeFlags="$cmakeFlags --no-warn-unused-cli" ''; From fe49bb80cf2a5b923488ceb51a675f1a06e0b353 Mon Sep 17 00:00:00 2001 From: Andrew Torgesen Date: Sat, 27 Dec 2025 21:09:14 -0800 Subject: [PATCH 3/7] Update flake.nix --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 730d7a15..3c709c9f 100644 --- a/flake.nix +++ b/flake.nix @@ -78,7 +78,7 @@ mfn.url = "github:goromal/mfn"; mfn.flake = false; - mscpp.url = "github:goromal/mscpp?ref=dev/spdlog-catch2"; + mscpp.url = "github:goromal/mscpp"; mscpp.flake = false; orchestrator.url = "github:goromal/orchestrator"; From 6e1f32381b884c240b0b2d8e788bd7eda7912ef6 Mon Sep 17 00:00:00 2001 From: "goromal (bot)" Date: Sun, 28 Dec 2025 05:11:08 +0000 Subject: [PATCH 4/7] Update flake lock --- flake.lock | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index 730d9708..66106453 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "aapis": { "flake": false, "locked": { - "lastModified": 1749440519, - "narHash": "sha256-qRaF+RsEDqUibt7t+PFcJnpfai7HHd0/1TJ70UM1Lrg=", + "lastModified": 1763963299, + "narHash": "sha256-EXw4HW7/dI+WGcH9eqei/oucEbrKygd+zbrS+19QH8U=", "owner": "goromal", "repo": "aapis", - "rev": "8a2e728a1b91d923af9a3c4db768b8d772d073e7", + "rev": "e1445785286124f5152c762621a396181e41ec74", "type": "github" }, "original": { @@ -19,11 +19,11 @@ "anixdata": { "flake": false, "locked": { - "lastModified": 1760239630, - "narHash": "sha256-kmutpa0C9xL+w78sRExWazRbiabFXGALAFtfU6zYgQM=", + "lastModified": 1765609263, + "narHash": "sha256-YWj/YG1QxkTc3wM1ljUNAx39me1ppgwqJbSkA18KguE=", "owner": "goromal", "repo": "anixdata", - "rev": "ca6bdd1afa33de039b6b1363e158836167a3d4a3", + "rev": "a375857fa89d2ff9c0718395c689720a02714f75", "type": "github" }, "original": { @@ -102,11 +102,11 @@ "daily_tactical_server": { "flake": false, "locked": { - "lastModified": 1757796284, - "narHash": "sha256-O6+OuMksMcYwZ9/MMqTdOIaw0rfY76qLb5k+1ggyyys=", + "lastModified": 1766035688, + "narHash": "sha256-/lq485V/warVmf38ICCN2tK44xKzlxHMyQuriq+RGto=", "owner": "goromal", "repo": "daily_tactical_server", - "rev": "fc94ecc2a79accc21daf30582af739d85a539452", + "rev": "9ff6f97ce5c193f95996e8a886c5995ab5ff86dd", "type": "github" }, "original": { @@ -377,16 +377,15 @@ "mscpp": { "flake": false, "locked": { - "lastModified": 1761371228, - "narHash": "sha256-j+C1vKHrk58cjNlPiB7QRLKA6j+/SdO24Y8EmIITNSQ=", + "lastModified": 1766897832, + "narHash": "sha256-oMdbVcbk3pBegoKD6BQOYhTzQUXHvaxeGSbIPi4uqqE=", "owner": "goromal", "repo": "mscpp", - "rev": "6e39931cda764417b989855ad4ab66b183872a1c", + "rev": "62878869d06545ee6a28fc5a757159b4f8664abd", "type": "github" }, "original": { "owner": "goromal", - "ref": "dev/spdlog-catch2", "repo": "mscpp", "type": "github" } @@ -527,11 +526,11 @@ "pysignals": { "flake": false, "locked": { - "lastModified": 1735182553, - "narHash": "sha256-qOV2F0Jw5KuUICKv65uMW3aRGTWqj6Eudg3NFjEb6ts=", + "lastModified": 1766781420, + "narHash": "sha256-lkXATLuWtUU3q2cTcSL8sbgf78CX/BgiwT+EOB/pL6Y=", "owner": "goromal", "repo": "pysignals", - "rev": "11d6532e27122b12238af99554535f9cfb138df6", + "rev": "55c464a90ad44dad8ca963158430fa2da5dc7b67", "type": "github" }, "original": { @@ -708,11 +707,11 @@ "signals-cpp": { "flake": false, "locked": { - "lastModified": 1735182528, - "narHash": "sha256-Gj6E/vaW/xQC3pIYm1A+Zj5Rza7m2iuhA2faM1Fm1Tc=", + "lastModified": 1766780194, + "narHash": "sha256-S/f3zyZZ26Q2s2jOl+/RLSMzMa4RT1YT9BYyV/eqbJ8=", "owner": "goromal", "repo": "signals-cpp", - "rev": "3b1cdfe2ce66f96095b762673d7ffc2ef1f666ea", + "rev": "3e3fa06a6ab91cb4817285dcaed066307c80f3c0", "type": "github" }, "original": { From 45307b7a695d94d3f69bbe38bb1bfac456ccf768 Mon Sep 17 00:00:00 2001 From: Andrew Torgesen Date: Sat, 27 Dec 2025 21:11:44 -0800 Subject: [PATCH 5/7] Update default.nix --- pkgs/cxx-packages/orchestrator-cpp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/cxx-packages/orchestrator-cpp/default.nix b/pkgs/cxx-packages/orchestrator-cpp/default.nix index 43ae8e61..e064a57d 100644 --- a/pkgs/cxx-packages/orchestrator-cpp/default.nix +++ b/pkgs/cxx-packages/orchestrator-cpp/default.nix @@ -9,6 +9,7 @@ clangStdenv.mkDerivation { cmakeFlags="$cmakeFlags --no-warn-unused-cli" ''; meta = { + broken = true; description = "C++ implementation of a multi-threaded job manager for my OS."; longDescription = '' From a76e2b7ce74dcdf210715426217cae0b31b66acd Mon Sep 17 00:00:00 2001 From: Andrew Torgesen Date: Sat, 27 Dec 2025 21:12:28 -0800 Subject: [PATCH 6/7] Update index.json --- index.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/index.json b/index.json index 3e730c38..350ccac8 100644 --- a/index.json +++ b/index.json @@ -58,8 +58,8 @@ }, { "attr": "orchestrator-cpp", - "ci": true, - "docs": true + "ci": false, + "docs": false }, { "attr": "ardurouter", @@ -572,4 +572,4 @@ "title": "Continuous OS Deployment" } ] -} \ No newline at end of file +} From 99ba24648396840de3d4247455ca1da42d4cc66e Mon Sep 17 00:00:00 2001 From: "goromal (bot)" Date: Sun, 28 Dec 2025 05:14:31 +0000 Subject: [PATCH 7/7] Update changelog --- changes/pr-418.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changes/pr-418.md diff --git a/changes/pr-418.md b/changes/pr-418.md new file mode 100644 index 00000000..a61a061e --- /dev/null +++ b/changes/pr-418.md @@ -0,0 +1 @@ +[mscpp] Adopt spdlog and catch2