From fd86a1a0687d27e8d65ca6d06912f8f97ae9dc52 Mon Sep 17 00:00:00 2001
From: Jade Lovelace <lix@jade.fyi>
Date: Tue, 18 Jun 2024 23:08:04 -0700
Subject: [PATCH] Fix on latest lix

Fixes: https://git.lix.systems/lix-project/nix-eval-jobs/issues/9
---
 flake.lock    | 10 +++++-----
 flake.nix     |  2 +-
 shell.nix     |  1 +
 src/worker.cc |  5 +----
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/flake.lock b/flake.lock
index 2270df4..b864e06 100644
--- a/flake.lock
+++ b/flake.lock
@@ -47,15 +47,15 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1718590005,
-        "narHash": "sha256-fiWc1ZyMlTXXSjcmoEQ+NHhIgtcImPHszbOu5c515cU=",
-        "rev": "98d0249d5c7f5dcc1d2436c4829f073fca668f80",
+        "lastModified": 1718767907,
+        "narHash": "sha256-gpd+mGQxqVHw2kO6rSPQel8TkChHh9UpqxjsmQi0QJM=",
+        "rev": "85f282ef572577899b3d80ba8def1b920a386218",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/98d0249d5c7f5dcc1d2436c4829f073fca668f80.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/85f282ef572577899b3d80ba8def1b920a386218.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/release-2.90.tar.gz"
+        "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
       }
     },
     "nix-github-actions": {
diff --git a/flake.nix b/flake.nix
index 5fdcfb4..a2cc479 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,7 +9,7 @@
   inputs.nix-github-actions.url = "github:nix-community/nix-github-actions";
   inputs.nix-github-actions.inputs.nixpkgs.follows = "nixpkgs";
   inputs.lix = {
-    url = "https://git.lix.systems/lix-project/lix/archive/release-2.90.tar.gz";
+    url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
     inputs.nixpkgs.follows = "nixpkgs";
   };
 
diff --git a/shell.nix b/shell.nix
index 13a5d34..7035ed9 100644
--- a/shell.nix
+++ b/shell.nix
@@ -23,6 +23,7 @@ in
 pkgs.mkShell {
   inherit (nix-eval-jobs) buildInputs;
   nativeBuildInputs = nix-eval-jobs.nativeBuildInputs ++ [
+    pkgs.clang-tools
     (pkgs.python3.withPackages (ps: [
       ps.pytest
     ]))
diff --git a/src/worker.cc b/src/worker.cc
index 817d81f..5e5ff9f 100644
--- a/src/worker.cc
+++ b/src/worker.cc
@@ -30,15 +30,12 @@
 #include <lix/libexpr/value.hh>
 #include <lix/libutil/terminal.hh>
 #include <exception>
-#include <map>
-#include <memory>
 #include <numeric>
 #include <optional>
 #include <sstream>
 #include <string>
 #include <string_view>
 #include <utility>
-#include <vector>
 
 #include "worker.hh"
 #include "drv.hh"
@@ -51,7 +48,7 @@ static nix::Value *releaseExprTopLevelValue(nix::EvalState &state,
     nix::Value vTop;
 
     if (args.fromArgs) {
-        nix::Expr *e = state.parseExprFromString(
+        nix::Expr &e = state.parseExprFromString(
             args.releaseExpr, state.rootPath(nix::CanonPath::fromCwd()));
         state.eval(e, vTop);
     } else {