delroth/nix-eval-jobs
0
0
Fork 0
forked from lix-project/nix-eval-jobs
Code Pull requests Activity

Fix on latest lix

Browse source 
Fixes: lix-project/nix-eval-jobs#9
This commit is contained in:
jade 2024-06-18 23:08:04 -07:00
parent 9c23772cf2
commit fd86a1a068
4 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
flake.lock
View file

@ -47,15 +47,15 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1718590005, "lastModified": 1718767907,
"narHash": "sha256-fiWc1ZyMlTXXSjcmoEQ+NHhIgtcImPHszbOu5c515cU=", "narHash": "sha256-gpd+mGQxqVHw2kO6rSPQel8TkChHh9UpqxjsmQi0QJM=",
"rev": "98d0249d5c7f5dcc1d2436c4829f073fca668f80", "rev": "85f282ef572577899b3d80ba8def1b920a386218",
"type": "tarball", "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": { "original": {
"type": "tarball", "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": { "nix-github-actions": {

2
flake.nix
View file

@ -9,7 +9,7 @@
inputs.nix-github-actions.url = "github:nix-community/nix-github-actions"; inputs.nix-github-actions.url = "github:nix-community/nix-github-actions";
inputs.nix-github-actions.inputs.nixpkgs.follows = "nixpkgs"; inputs.nix-github-actions.inputs.nixpkgs.follows = "nixpkgs";
inputs.lix = { 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"; inputs.nixpkgs.follows = "nixpkgs";
}; };

1
shell.nix
View file

@ -23,6 +23,7 @@ in
pkgs.mkShell { pkgs.mkShell {
inherit (nix-eval-jobs) buildInputs; inherit (nix-eval-jobs) buildInputs;
nativeBuildInputs = nix-eval-jobs.nativeBuildInputs ++ [ nativeBuildInputs = nix-eval-jobs.nativeBuildInputs ++ [
pkgs.clang-tools
(pkgs.python3.withPackages (ps: [ (pkgs.python3.withPackages (ps: [
ps.pytest ps.pytest
])) ]))

5
src/worker.cc
View file

@ -30,15 +30,12 @@
#include <lix/libexpr/value.hh> #include <lix/libexpr/value.hh>
#include <lix/libutil/terminal.hh> #include <lix/libutil/terminal.hh>
#include <exception> #include <exception>
#include <map>
#include <memory>
#include <numeric> #include <numeric>
#include <optional> #include <optional>
#include <sstream> #include <sstream>
#include <string> #include <string>
#include <string_view> #include <string_view>
#include <utility> #include <utility>
#include <vector>
#include "worker.hh" #include "worker.hh"
#include "drv.hh" #include "drv.hh"
@ -51,7 +48,7 @@ static nix::Value *releaseExprTopLevelValue(nix::EvalState &state,
nix::Value vTop; nix::Value vTop;
if (args.fromArgs) { if (args.fromArgs) {
nix::Expr *e = state.parseExprFromString( nix::Expr &e = state.parseExprFromString(
args.releaseExpr, state.rootPath(nix::CanonPath::fromCwd())); args.releaseExpr, state.rootPath(nix::CanonPath::fromCwd()));
state.eval(e, vTop); state.eval(e, vTop);
} else { } else {