util.hh split

configure.ac

@@ -48,12 +48,12 @@ else
     AC_MSG_ERROR([`$NIX_STORE_PROGRAM' doesn't support `--timeout'; please use a newer version.])
 fi
 
-PKG_CHECK_MODULES([NIX], [nix-main nix-expr nix-store])
+PKG_CHECK_MODULES([NIX], [lix-main lix-expr lix-store])
 
 testPath="$(dirname $(type -p expr))"
 AC_SUBST(testPath)
 
-CXXFLAGS+=" -include nix/config.h"
+CXXFLAGS+=" -include lix/config.h -std=gnu++20"
 
 AC_CONFIG_FILES([
   Makefile

flake.lock

@@ -3,11 +3,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1673956053,
+        "lastModified": 1696426674,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
         "type": "github"
       },
       "original": {
@@ -19,6 +19,7 @@
     "nix": {
       "inputs": {
         "flake-compat": "flake-compat",
+        "nix2container": "nix2container",
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -26,20 +27,35 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1714955862,
+        "lastModified": 1718081112,
-        "narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=",
+        "narHash": "sha256-3cpIVHuyo6yz9n7U/7U/p2Lmwjj1xHdTJR2RkT5JntY=",
-        "ref": "refs/tags/2.90-beta.1",
+        "ref": "refs/heads/main",
-        "rev": "b6799ab0374a8e1907a48915d3187e07da41d88c",
+        "rev": "8a3d063a494c4b8c767190a5ce3e4075a75f9d07",
-        "revCount": 15501,
+        "revCount": 15756,
         "type": "git",
         "url": "https://git@git.lix.systems/lix-project/lix"
       },
       "original": {
-        "ref": "refs/tags/2.90-beta.1",
         "type": "git",
         "url": "https://git@git.lix.systems/lix-project/lix"
       }
     },
+    "nix2container": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1712990762,
+        "narHash": "sha256-hO9W3w7NcnYeX8u8cleHiSpK2YJo7ecarFTUlbybl7k=",
+        "owner": "nlewo",
+        "repo": "nix2container",
+        "rev": "20aad300c925639d5d6cbe30013c8357ce9f2a2e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nlewo",
+        "repo": "nix2container",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1715218190,
@@ -75,11 +91,11 @@
     "pre-commit-hooks": {
       "flake": false,
       "locked": {
-        "lastModified": 1714478972,
+        "lastModified": 1712055707,
-        "narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=",
+        "narHash": "sha256-4XLvuSIDZJGS17xEwSrNuJLL7UjDYKGJSbK1WWX2AK8=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "2849da033884f54822af194400f8dff435ada242",
+        "rev": "e35aed5fda3cc79f88ed7f1795021e559582093a",
         "type": "github"
       },
       "original": {

flake.nix

@@ -2,7 +2,7 @@
   description = "A Nix-based continuous build system";
 
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
-  inputs.nix.url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1";
+  inputs.nix.url = "git+https://git@git.lix.systems/lix-project/lix";
   inputs.nix.inputs.nixpkgs.follows = "nixpkgs";
 
   outputs = { self, nixpkgs, nix }:

src/hydra-eval-jobs/Makefile.am

@@ -1,5 +1,5 @@
 bin_PROGRAMS = hydra-eval-jobs
 
 hydra_eval_jobs_SOURCES = hydra-eval-jobs.cc
-hydra_eval_jobs_LDADD = $(NIX_LIBS) -lnixcmd
+hydra_eval_jobs_LDADD = $(NIX_LIBS) -llixcmd
 hydra_eval_jobs_CXXFLAGS = $(NIX_CFLAGS) -I ../libhydra

src/hydra-eval-jobs/hydra-eval-jobs.cc

@@ -9,10 +9,10 @@
 #include "eval-inline.hh"
 #include "eval-settings.hh"
 #include "signals.hh"
-#include "util.hh"
+#include "terminal.hh"
 #include "get-drvs.hh"
 #include "globals.hh"
-#include "common-eval-args.hh"
+#include "lix/libcmd/common-eval-args.hh"
 #include "flake/flakeref.hh"
 #include "flake/flake.hh"
 #include "attr-path.hh"

src/hydra-evaluator/hydra-evaluator.cc

@@ -1,5 +1,6 @@
 #include "db.hh"
 #include "hydra-config.hh"
+#include "logging.hh"
 #include "pool.hh"
 #include "shared.hh"
 #include "signals.hh"

src/hydra-queue-runner/build-remote.cc

@@ -6,10 +6,10 @@
 #include <fcntl.h>
 
 #include "build-result.hh"
+#include "current-process.hh"
 #include "path.hh"
 #include "serve-protocol.hh"
 #include "state.hh"
-#include "util.hh"
 #include "serve-protocol.hh"
 #include "serve-protocol-impl.hh"
 #include "ssh.hh"

src/hydra-queue-runner/build-result.cc

@@ -1,6 +1,5 @@
 #include "hydra-build-result.hh"
 #include "store-api.hh"
-#include "util.hh"
 #include "fs-accessor.hh"
 
 #include <regex>

src/hydra-queue-runner/queue-monitor.cc

@@ -4,6 +4,7 @@
 #include "thread-pool.hh"
 
 #include <cstring>
+#include <signal.h>
 
 using namespace nix;
 

src/libhydra/db.hh

@@ -2,7 +2,8 @@
 
 #include <pqxx/pqxx>
 
-#include "util.hh"
+#include "strings.hh"
+#include "environment-variables.hh"
 
 
 struct Connection : pqxx::connection

src/libhydra/hydra-config.hh

@@ -2,7 +2,9 @@
 
 #include <map>
 
-#include "util.hh"
+#include "environment-variables.hh"
+#include "file-system.hh"
+#include "strings.hh"
 
 struct HydraConfig
 {