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

Merge #185 #187

Browse source 
185: build(deps): bump DeterminateSystems/update-flake-lock from 16 to 17 r=Mic92 a=dependabot[bot]



187: fix build with nix 2.14 r=Mic92 a=Mic92



Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
This commit is contained in:
bors[bot] 2023-03-09 21:22:29 +00:00 committed by GitHub
parent 93ff38217d d66f3aaa14 54a9b26431
commit 9527cd3b82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/update-flake-lock.yml vendored
View file

@ -16,6 +16,6 @@ jobs:
extra_nix_config: | extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- name: Update flake.lock - name: Update flake.lock
uses: DeterminateSystems/update-flake-lock@v16 uses: DeterminateSystems/update-flake-lock@v17
with: with:
token: ${{ secrets.GH_TOKEN_FOR_UPDATES }} token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}

2
.nix-version
View file

@ -1 +1 @@
2_13 2_14

12
flake.lock
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1677714448, "lastModified": 1678379998,
"narHash": "sha256-Hq8qLs8xFu28aDjytfxjdC96bZ6pds21Yy09mSC156I=", "narHash": "sha256-TZdfNqftHhDuIFwBcN9MUThx5sQXCTeZk9je5byPKRw=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "dc531e3a9ce757041e1afaff8ee932725ca60002", "rev": "c13d60b89adea3dc20704c045ec4d50dd964d447",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -22,11 +22,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1678321859, "lastModified": 1678391601,
"narHash": "sha256-WnAM2zrtDJDfSEmiiklSAHfep+XMIjfpU/8aTXwHZ5A=", "narHash": "sha256-KpP4agiaNf2PO67HlvToZKuWS1jvDrORz09bJXkE8bQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "75c8abce0657f9981be937f2bc7b88125d98c03f", "rev": "8d8f5ede919dc60a86ac37311a63092411c72e90",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
src/nix-eval-jobs.cc
View file

@ -21,6 +21,7 @@
#include <nix/error.hh> #include <nix/error.hh>
#include <nix/installables.hh> #include <nix/installables.hh>
#include <nix/path-with-outputs.hh> #include <nix/path-with-outputs.hh>
#include <nix/installable-flake.hh>
#include <nix/value-to-json.hh> #include <nix/value-to-json.hh>
@ -328,8 +329,9 @@ static void worker(ref<EvalState> state, Bindings &autoArgs, AutoCloseFD &to,
if (name == "recurseForDerivations") { if (name == "recurseForDerivations") {
auto attrv = auto attrv =
v->attrs->get(state->sRecurseForDerivations); v->attrs->get(state->sRecurseForDerivations);
recurse = recurse = state->forceBool(
state->forceBool(*attrv->value, attrv->pos); *attrv->value, attrv->pos,
"while evaluating recurseForDerivations");
} }
} }
if (recurse) if (recurse)