From 13209fb02420f6f70e2d9d97c242893ae38abaa8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 9 May 2022 01:46:54 +0000
Subject: [PATCH 1/2] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/e10da1c7f542515b609f8dfbcf788f3d85b14936' (2022-04-26)
  → 'github:NixOS/nixpkgs/c777cdf5c564015d5f63b09cc93bef4178b19b01' (2022-05-05)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 389a35c..a6d0863 100644
--- a/flake.lock
+++ b/flake.lock
@@ -17,11 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1651007983,
-        "narHash": "sha256-GNay7yDPtLcRcKCNHldug85AhAvBpTtPEJWSSDYBw8U=",
+        "lastModified": 1651726670,
+        "narHash": "sha256-dSGdzB49SEvdOJvrQWfQYkAefewXraHIV08Vz6iDXWQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e10da1c7f542515b609f8dfbcf788f3d85b14936",
+        "rev": "c777cdf5c564015d5f63b09cc93bef4178b19b01",
         "type": "github"
       },
       "original": {

From 882d2376cff749d83ca36debca5172da1920c757 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 7 May 2022 09:01:41 +0200
Subject: [PATCH 2/2] fixes for nixUnstable

---
 src/nix-eval-jobs.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/nix-eval-jobs.cc b/src/nix-eval-jobs.cc
index 8ffd036..eb97d0b 100644
--- a/src/nix-eval-jobs.cc
+++ b/src/nix-eval-jobs.cc
@@ -287,14 +287,14 @@ static void worker(EvalState &state, Bindings &autoArgs, AutoCloseFD &to,
                     path.size() == 0; // Dont require `recurseForDerivations =
                                       // true;` for top-level attrset
 
-                for (auto &i : v->attrs->lexicographicOrder()) {
-                    std::string name(i->name);
+                for (auto &i : v->attrs->lexicographicOrder(state.symbols)) {
+                    const std::string &name = state.symbols[i->name];
                     attrs.push_back(name);
 
                     if (name == "recurseForDerivations") {
                         auto attrv =
                             v->attrs->get(state.sRecurseForDerivations);
-                        recurse = state.forceBool(*attrv->value, *attrv->pos);
+                        recurse = state.forceBool(*attrv->value, attrv->pos);
                     }
                 }
                 if (recurse)