From d66f3aaa14337691dcea0b1f4781d2c382987770 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Mar 2023 23:57:54 +0000 Subject: [PATCH 1/4] build(deps): bump DeterminateSystems/update-flake-lock from 16 to 17 Bumps [DeterminateSystems/update-flake-lock](https://github.com/DeterminateSystems/update-flake-lock) from 16 to 17. - [Release notes](https://github.com/DeterminateSystems/update-flake-lock/releases) - [Commits](https://github.com/DeterminateSystems/update-flake-lock/compare/v16...v17) --- updated-dependencies: - dependency-name: DeterminateSystems/update-flake-lock dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/update-flake-lock.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-flake-lock.yml b/.github/workflows/update-flake-lock.yml index 56f361a..83ef511 100644 --- a/.github/workflows/update-flake-lock.yml +++ b/.github/workflows/update-flake-lock.yml @@ -16,6 +16,6 @@ jobs: extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - name: Update flake.lock - uses: DeterminateSystems/update-flake-lock@v16 + uses: DeterminateSystems/update-flake-lock@v17 with: token: ${{ secrets.GH_TOKEN_FOR_UPDATES }} From 2f518e70ecf4468fbeae598e6f80158cdfabcf2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 9 Mar 2023 20:57:30 +0100 Subject: [PATCH 2/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/dc531e3a9ce757041e1afaff8ee932725ca60002' (2023-03-01) → 'github:hercules-ci/flake-parts/c13d60b89adea3dc20704c045ec4d50dd964d447' (2023-03-09) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/75c8abce0657f9981be937f2bc7b88125d98c03f' (2023-03-09) → 'github:NixOS/nixpkgs/8d8f5ede919dc60a86ac37311a63092411c72e90' (2023-03-09) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index d2fb4df..9e533d9 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1677714448, - "narHash": "sha256-Hq8qLs8xFu28aDjytfxjdC96bZ6pds21Yy09mSC156I=", + "lastModified": 1678379998, + "narHash": "sha256-TZdfNqftHhDuIFwBcN9MUThx5sQXCTeZk9je5byPKRw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "dc531e3a9ce757041e1afaff8ee932725ca60002", + "rev": "c13d60b89adea3dc20704c045ec4d50dd964d447", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1678321859, - "narHash": "sha256-WnAM2zrtDJDfSEmiiklSAHfep+XMIjfpU/8aTXwHZ5A=", + "lastModified": 1678391601, + "narHash": "sha256-KpP4agiaNf2PO67HlvToZKuWS1jvDrORz09bJXkE8bQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "75c8abce0657f9981be937f2bc7b88125d98c03f", + "rev": "8d8f5ede919dc60a86ac37311a63092411c72e90", "type": "github" }, "original": { From 94b3a3a43dff7722b6503c2e9309e6183bbafe08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 9 Mar 2023 21:01:15 +0100 Subject: [PATCH 3/4] update nix version --- .nix-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.nix-version b/.nix-version index 8b980bc..d286829 100644 --- a/.nix-version +++ b/.nix-version @@ -1 +1 @@ -2_13 +2_14 From 54a9b264313c4aecc5a0861da418ca0d3975199a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 9 Mar 2023 22:18:00 +0100 Subject: [PATCH 4/4] fix build with nix 2.14 --- src/nix-eval-jobs.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/nix-eval-jobs.cc b/src/nix-eval-jobs.cc index 7b22fc4..b9c5a19 100644 --- a/src/nix-eval-jobs.cc +++ b/src/nix-eval-jobs.cc @@ -21,6 +21,7 @@ #include #include #include +#include #include @@ -328,8 +329,9 @@ static void worker(ref state, Bindings &autoArgs, AutoCloseFD &to, if (name == "recurseForDerivations") { auto attrv = v->attrs->get(state->sRecurseForDerivations); - recurse = - state->forceBool(*attrv->value, attrv->pos); + recurse = state->forceBool( + *attrv->value, attrv->pos, + "while evaluating recurseForDerivations"); } } if (recurse)