util.hh split
Some checks failed
Test / tests (push) Has been cancelled

This commit is contained in:
leo60228 2024-06-11 11:27:43 -04:00
parent ca98f42b39
commit cbe527a3ee
Signed by: vriska
GPG key ID: 6F3EB461799AD95E
8 changed files with 36 additions and 15 deletions

View file

@ -3,11 +3,11 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1673956053, "lastModified": 1696426674,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -19,6 +19,7 @@
"nix": { "nix": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"nix2container": "nix2container",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@ -26,11 +27,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1716890497, "lastModified": 1718081112,
"narHash": "sha256-NH7keFO8/FpGZp5OLmmP5wPGRYZ+MtWfdZNa1HPmqUA=", "narHash": "sha256-3cpIVHuyo6yz9n7U/7U/p2Lmwjj1xHdTJR2RkT5JntY=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "71b32bb87cd48dbbd672c8ca6b041ed36f3bae11", "rev": "8a3d063a494c4b8c767190a5ce3e4075a75f9d07",
"revCount": 15662, "revCount": 15756,
"type": "git", "type": "git",
"url": "https://git@git.lix.systems/lix-project/lix" "url": "https://git@git.lix.systems/lix-project/lix"
}, },
@ -39,6 +40,22 @@
"url": "https://git@git.lix.systems/lix-project/lix" "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": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1715218190, "lastModified": 1715218190,
@ -74,11 +91,11 @@
"pre-commit-hooks": { "pre-commit-hooks": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1714478972, "lastModified": 1712055707,
"narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=", "narHash": "sha256-4XLvuSIDZJGS17xEwSrNuJLL7UjDYKGJSbK1WWX2AK8=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "2849da033884f54822af194400f8dff435ada242", "rev": "e35aed5fda3cc79f88ed7f1795021e559582093a",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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