lix-project/hydra
3
0
Fork 6
Code Issues 2 Pull requests 1 Packages Projects Releases Wiki Activity

Compare commits

base: lix-project:cbe527a3ee6256de0c5bde5b10821f5095b60e22
Branches Tags
lix-project:main
lix-project:lix-update
..
compare: lix-project:62bc5b54b2e2d09383ffe197fc7340af7eb698f7
Branches Tags
lix-project:main
lix-project:lix-update

No commits in common. "cbe527a3ee6256de0c5bde5b10821f5095b60e22" and "62bc5b54b2e2d09383ffe197fc7340af7eb698f7" have entirely different histories.
cbe527a3ee ... 62bc5b54b2

11 changed files with 22 additions and 42 deletions
Show stats Expand all files Collapse all files

4
configure.ac
View file

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

40
flake.lock
View file

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

2
flake.nix
View file

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

2
src/hydra-eval-jobs/Makefile.am
View file

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

4
src/hydra-eval-jobs/hydra-eval-jobs.cc
View file

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

1
src/hydra-evaluator/hydra-evaluator.cc
View file

@ -1,6 +1,5 @@
#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"

2
src/hydra-queue-runner/build-remote.cc
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"

1
src/hydra-queue-runner/build-result.cc
View file

@ -1,5 +1,6 @@
#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>

1
src/hydra-queue-runner/queue-monitor.cc
View file

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

3
src/libhydra/db.hh
View file

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

4
src/libhydra/hydra-config.hh
View file

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