From ca98f42b390697b5889eb770df1f9316117da861 Mon Sep 17 00:00:00 2001 From: leo60228 Date: Tue, 28 May 2024 17:10:27 -0400 Subject: [PATCH] nixexpr -> lixexpr --- configure.ac | 4 ++-- flake.lock | 11 +++++------ flake.nix | 2 +- src/hydra-eval-jobs/Makefile.am | 2 +- src/hydra-eval-jobs/hydra-eval-jobs.cc | 2 +- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index e5c57d14..2f4cf848 100644 --- a/configure.ac +++ b/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 diff --git a/flake.lock b/flake.lock index e57e97dd..5f975b8e 100644 --- a/flake.lock +++ b/flake.lock @@ -26,16 +26,15 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1714955862, - "narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=", - "ref": "refs/tags/2.90-beta.1", - "rev": "b6799ab0374a8e1907a48915d3187e07da41d88c", - "revCount": 15501, + "lastModified": 1716890497, + "narHash": "sha256-NH7keFO8/FpGZp5OLmmP5wPGRYZ+MtWfdZNa1HPmqUA=", + "ref": "refs/heads/main", + "rev": "71b32bb87cd48dbbd672c8ca6b041ed36f3bae11", + "revCount": 15662, "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" } diff --git a/flake.nix b/flake.nix index a4bc8ec2..7252a96d 100644 --- a/flake.nix +++ b/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 }: diff --git a/src/hydra-eval-jobs/Makefile.am b/src/hydra-eval-jobs/Makefile.am index 90742a30..d5f99eed 100644 --- a/src/hydra-eval-jobs/Makefile.am +++ b/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 diff --git a/src/hydra-eval-jobs/hydra-eval-jobs.cc b/src/hydra-eval-jobs/hydra-eval-jobs.cc index 0246efd5..3505af00 100644 --- a/src/hydra-eval-jobs/hydra-eval-jobs.cc +++ b/src/hydra-eval-jobs/hydra-eval-jobs.cc @@ -12,7 +12,7 @@ #include "util.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"