From 870557be478c74566ad61079a572eda142eb2b50 Mon Sep 17 00:00:00 2001 From: Andrew Torgesen Date: Sat, 10 Jan 2026 20:45:26 -0800 Subject: [PATCH 1/6] [orchestrator] add PNG support --- flake.lock | 14 ++++++++------ flake.nix | 4 ++-- pkgs/nixos/pc-base.nix | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 9d7bd665..10ac92b1 100644 --- a/flake.lock +++ b/flake.lock @@ -3,15 +3,16 @@ "aapis": { "flake": false, "locked": { - "lastModified": 1763963299, - "narHash": "sha256-EXw4HW7/dI+WGcH9eqei/oucEbrKygd+zbrS+19QH8U=", + "lastModified": 1768104892, + "narHash": "sha256-9sAKat4v3cDRuYjPIQ9HL/wvDPfJM/moUWCpCF4jOnY=", "owner": "goromal", "repo": "aapis", - "rev": "e1445785286124f5152c762621a396181e41ec74", + "rev": "e57d9275583bffb1a345b39a172bde9ad569104f", "type": "github" }, "original": { "owner": "goromal", + "ref": "dev/pngorch", "repo": "aapis", "type": "github" } @@ -441,15 +442,16 @@ "orchestrator": { "flake": false, "locked": { - "lastModified": 1757261342, - "narHash": "sha256-GNwa2e1TtTldycO7nhvLaK8n0he1he0uHcdMmv4U4Uc=", + "lastModified": 1768106393, + "narHash": "sha256-KdNhfUxg1MkMTnEtnlHDSv0TdhNIbnN1OKcv/Dm1MXM=", "owner": "goromal", "repo": "orchestrator", - "rev": "6cfb7407eb5def81f610bceed6963f51d804fda9", + "rev": "facc35244d2dd9e458e41046ab854955ed266d1f", "type": "github" }, "original": { "owner": "goromal", + "ref": "dev/pngorch", "repo": "orchestrator", "type": "github" } diff --git a/flake.nix b/flake.nix index 6b4b8d0c..68bed93f 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,7 @@ anixdata.url = "github:goromal/anixdata"; anixdata.flake = false; - aapis.url = "github:goromal/aapis"; + aapis.url = "github:goromal/aapis?ref=dev/pngorch"; aapis.flake = false; ardupilot.url = @@ -84,7 +84,7 @@ mscpp.url = "github:goromal/mscpp"; mscpp.flake = false; - orchestrator.url = "github:goromal/orchestrator"; + orchestrator.url = "github:goromal/orchestrator?ref=dev/pngorch"; orchestrator.flake = false; orchestrator-cpp.url = "github:goromal/orchestrator-cpp"; diff --git a/pkgs/nixos/pc-base.nix b/pkgs/nixos/pc-base.nix index 332ae1b4..ac167574 100644 --- a/pkgs/nixos/pc-base.nix +++ b/pkgs/nixos/pc-base.nix @@ -330,7 +330,7 @@ in { services.orchestratord = lib.mkIf cfg.enableOrchestrator { enable = true; orchestratorPkg = anixpkgs.orchestrator; - threads = if cfg.isATS then 1 else 2; + threads = 2; pathPkgs = with pkgs; [ bash coreutils util-linux rclone machine-rcrsync machine-authm ] ++ cfg.extraOrchestratorPackages; From 71e5919d0a517d2ee634d6fb73930e22593aa626 Mon Sep 17 00:00:00 2001 From: "goromal (bot)" Date: Sun, 11 Jan 2026 04:50:50 +0000 Subject: [PATCH 2/6] Update changelog --- changes/pr-445.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changes/pr-445.md diff --git a/changes/pr-445.md b/changes/pr-445.md new file mode 100644 index 00000000..78ec4707 --- /dev/null +++ b/changes/pr-445.md @@ -0,0 +1 @@ +[orchestrator] add PNG support From 57f431199df532fcf7bb3ffcd4eba150340db111 Mon Sep 17 00:00:00 2001 From: Andrew Torgesen Date: Sat, 10 Jan 2026 22:07:45 -0800 Subject: [PATCH 3/6] oops --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 10ac92b1..e4311711 100644 --- a/flake.lock +++ b/flake.lock @@ -442,11 +442,11 @@ "orchestrator": { "flake": false, "locked": { - "lastModified": 1768106393, - "narHash": "sha256-KdNhfUxg1MkMTnEtnlHDSv0TdhNIbnN1OKcv/Dm1MXM=", + "lastModified": 1768111607, + "narHash": "sha256-d6X9s3ipuf0komQJiMtHy4TpEptoRRkG4rsQaMpwxeg=", "owner": "goromal", "repo": "orchestrator", - "rev": "facc35244d2dd9e458e41046ab854955ed266d1f", + "rev": "771515c81de143f328a7da954bac519d9b30e6f4", "type": "github" }, "original": { From cec9eb5d0bd5340affd1d0b15979470865fc5a4b Mon Sep 17 00:00:00 2001 From: Andrew Torgesen Date: Sat, 10 Jan 2026 22:18:09 -0800 Subject: [PATCH 4/6] wip --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index e4311711..69b6762f 100644 --- a/flake.lock +++ b/flake.lock @@ -442,11 +442,11 @@ "orchestrator": { "flake": false, "locked": { - "lastModified": 1768111607, - "narHash": "sha256-d6X9s3ipuf0komQJiMtHy4TpEptoRRkG4rsQaMpwxeg=", + "lastModified": 1768112245, + "narHash": "sha256-dxRZnL5XFKxsquzpvY4MOmRdMzDdpAzsnLRenTy6L5w=", "owner": "goromal", "repo": "orchestrator", - "rev": "771515c81de143f328a7da954bac519d9b30e6f4", + "rev": "3d94bb15f04926328abda6fdfa8444fa48f5db32", "type": "github" }, "original": { From 02ce643573a14c351885828647bbcbc6ce5fbed6 Mon Sep 17 00:00:00 2001 From: Andrew Torgesen Date: Sun, 11 Jan 2026 07:22:41 -0800 Subject: [PATCH 5/6] Update flake.nix --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 68bed93f..6b4b8d0c 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,7 @@ anixdata.url = "github:goromal/anixdata"; anixdata.flake = false; - aapis.url = "github:goromal/aapis?ref=dev/pngorch"; + aapis.url = "github:goromal/aapis"; aapis.flake = false; ardupilot.url = @@ -84,7 +84,7 @@ mscpp.url = "github:goromal/mscpp"; mscpp.flake = false; - orchestrator.url = "github:goromal/orchestrator?ref=dev/pngorch"; + orchestrator.url = "github:goromal/orchestrator"; orchestrator.flake = false; orchestrator-cpp.url = "github:goromal/orchestrator-cpp"; From c702048efbadecd32aeee99987f25091fd0e1ad0 Mon Sep 17 00:00:00 2001 From: "goromal (bot)" Date: Sun, 11 Jan 2026 15:24:35 +0000 Subject: [PATCH 6/6] Update flake lock --- flake.lock | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 69b6762f..54741cb3 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,15 @@ "aapis": { "flake": false, "locked": { - "lastModified": 1768104892, - "narHash": "sha256-9sAKat4v3cDRuYjPIQ9HL/wvDPfJM/moUWCpCF4jOnY=", + "lastModified": 1768144916, + "narHash": "sha256-SlA5mbKsWjSnoGFw8HE44efy2BB6QeUmX6IHDMMrbxo=", "owner": "goromal", "repo": "aapis", - "rev": "e57d9275583bffb1a345b39a172bde9ad569104f", + "rev": "e7cad057b29a7acbcf2409fb9e899f7864a4c08a", "type": "github" }, "original": { "owner": "goromal", - "ref": "dev/pngorch", "repo": "aapis", "type": "github" } @@ -442,16 +441,15 @@ "orchestrator": { "flake": false, "locked": { - "lastModified": 1768112245, - "narHash": "sha256-dxRZnL5XFKxsquzpvY4MOmRdMzDdpAzsnLRenTy6L5w=", + "lastModified": 1768144730, + "narHash": "sha256-XXVUr4wjiEptVKD8pGVXnE3zlR1feqrDmNcxSeK3io4=", "owner": "goromal", "repo": "orchestrator", - "rev": "3d94bb15f04926328abda6fdfa8444fa48f5db32", + "rev": "1289cdf8a530468419c7a3339b61f1cb49ce13cc", "type": "github" }, "original": { "owner": "goromal", - "ref": "dev/pngorch", "repo": "orchestrator", "type": "github" }