vriska/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

nixexpr -> lixexpr

Browse source
This commit is contained in:
leo60228 2024-05-28 17:10:27 -04:00
parent 62bc5b54b2
commit ca98f42b39
Signed by: vriska
GPG key ID: 6F3EB461799AD95E
5 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file 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], [nix-main nix-expr nix-store]) PKG_CHECK_MODULES([NIX], [lix-main lix-expr lix-store])
testPath="$(dirname $(type -p expr))" testPath="$(dirname $(type -p expr))"
AC_SUBST(testPath) AC_SUBST(testPath)
CXXFLAGS+=" -include nix/config.h" CXXFLAGS+=" -include lix/config.h -std=gnu++20"
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile

11
flake.lock
View file

@ -26,16 +26,15 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1714955862, "lastModified": 1716890497,
"narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=", "narHash": "sha256-NH7keFO8/FpGZp5OLmmP5wPGRYZ+MtWfdZNa1HPmqUA=",
"ref": "refs/tags/2.90-beta.1", "ref": "refs/heads/main",
"rev": "b6799ab0374a8e1907a48915d3187e07da41d88c", "rev": "71b32bb87cd48dbbd672c8ca6b041ed36f3bae11",
"revCount": 15501, "revCount": 15662,
"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"
} }

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?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"; 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) -lnixcmd hydra_eval_jobs_LDADD = $(NIX_LIBS) -llixcmd
hydra_eval_jobs_CXXFLAGS = $(NIX_CFLAGS) -I ../libhydra hydra_eval_jobs_CXXFLAGS = $(NIX_CFLAGS) -I ../libhydra

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

@ -12,7 +12,7 @@
#include "util.hh" #include "util.hh"
#include "get-drvs.hh" #include "get-drvs.hh"
#include "globals.hh" #include "globals.hh"
#include "common-eval-args.hh" #include "lix/libcmd/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"