From a94f80e5128847184b29f283738ee62dd4240c21 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Thu, 16 May 2024 16:47:20 -0700 Subject: [PATCH] nixexpr -> lixexpr --- meson.build | 8 ++++---- src/buffered-io.cc | 4 ++-- src/drv.cc | 26 +++++++++++++------------- src/drv.hh | 4 ++-- src/eval-args.cc | 6 +++--- src/eval-args.hh | 12 ++++++------ src/nix-eval-jobs.cc | 26 +++++++++++++------------- src/worker.cc | 42 +++++++++++++++++++++--------------------- src/worker.hh | 4 ++-- 9 files changed, 66 insertions(+), 66 deletions(-) diff --git a/meson.build b/meson.build index 00086fd..60dfef7 100644 --- a/meson.build +++ b/meson.build @@ -3,10 +3,10 @@ project('nix-eval-jobs', 'cpp', license : 'GPL-3.0', ) -nix_main_dep = dependency('nix-main', required: true) -nix_store_dep = dependency('nix-store', required: true) -nix_expr_dep = dependency('nix-expr', required: true) -nix_cmd_dep = dependency('nix-cmd', required: true) +nix_main_dep = dependency('lix-main', required: true) +nix_store_dep = dependency('lix-store', required: true) +nix_expr_dep = dependency('lix-expr', required: true) +nix_cmd_dep = dependency('lix-cmd', required: true) threads_dep = dependency('threads', required: true) nlohmann_json_dep = dependency('nlohmann_json', required: true) boost_dep = dependency('boost', required: true) diff --git a/src/buffered-io.cc b/src/buffered-io.cc index c74d65e..469dbe2 100644 --- a/src/buffered-io.cc +++ b/src/buffered-io.cc @@ -1,9 +1,9 @@ #include #include -#include +#include #include #include -#include +#include #include "buffered-io.hh" diff --git a/src/drv.cc b/src/drv.cc index c5e1339..5af2dfc 100644 --- a/src/drv.cc +++ b/src/drv.cc @@ -1,19 +1,19 @@ -#include // IWYU pragma: keep +#include // IWYU pragma: keep -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/drv.hh b/src/drv.hh index a5de64a..ab817c2 100644 --- a/src/drv.hh +++ b/src/drv.hh @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include #include #include diff --git a/src/eval-args.cc b/src/eval-args.cc index 871c6b0..b127638 100644 --- a/src/eval-args.cc +++ b/src/eval-args.cc @@ -1,8 +1,8 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/eval-args.hh b/src/eval-args.hh index fe50583..84f2ba1 100644 --- a/src/eval-args.hh +++ b/src/eval-args.hh @@ -1,12 +1,12 @@ #pragma once -#include -#include -#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/nix-eval-jobs.cc b/src/nix-eval-jobs.cc index 855fa98..ee082f7 100644 --- a/src/nix-eval-jobs.cc +++ b/src/nix-eval-jobs.cc @@ -1,10 +1,10 @@ -#include // IWYU pragma: keep +#include // IWYU pragma: keep -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include @@ -12,16 +12,16 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/worker.cc b/src/worker.cc index ef7b100..656cb07 100644 --- a/src/worker.cc +++ b/src/worker.cc @@ -1,34 +1,34 @@ -#include // IWYU pragma: keep +#include // IWYU pragma: keep // doesn't exist on macOS // IWYU pragma: no_include -#include -#include -#include +#include +#include +#include #include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/worker.hh b/src/worker.hh index 45e9032..caf4200 100644 --- a/src/worker.hh +++ b/src/worker.hh @@ -1,6 +1,6 @@ #pragma once -#include -#include +#include +#include #include "eval-args.hh"