From 0118770092fd2388cea1695360a677732203b388 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 16 Nov 2022 17:05:00 +0100
Subject: [PATCH] Use the lazy-trees branch of Nix

---
 flake.lock                             | 12 ++++++------
 flake.nix                              |  2 +-
 src/hydra-eval-jobs/hydra-eval-jobs.cc |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/flake.lock b/flake.lock
index b41b843a..9c937f84 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,16 +23,16 @@
         "nixpkgs-regression": "nixpkgs-regression"
       },
       "locked": {
-        "lastModified": 1661606874,
-        "narHash": "sha256-9+rpYzI+SmxJn+EbYxjGv68Ucp22bdFUSy/4LkHkkDQ=",
-        "owner": "NixOS",
+        "lastModified": 1668607642,
+        "narHash": "sha256-lNnk5thRq43XPcA+5KwoHgdsKf3urmE4B2xzHokVMbc=",
+        "owner": "edolstra",
         "repo": "nix",
-        "rev": "11e45768b34fdafdcf019ddbd337afa16127ff0f",
+        "rev": "561440bd6ddebd53d7b42bced22cb78fd607a6de",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "2.11.0",
+        "owner": "edolstra",
+        "ref": "lazy-trees",
         "repo": "nix",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index cd9f094d..51e1830f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "A Nix-based continuous build system";
 
   inputs.nixpkgs.follows = "nix/nixpkgs";
-  inputs.nix.url = "github:NixOS/nix/2.11.0";
+  inputs.nix.url = "github:edolstra/nix/lazy-trees";
 
   outputs = { self, nixpkgs, nix }:
     let
diff --git a/src/hydra-eval-jobs/hydra-eval-jobs.cc b/src/hydra-eval-jobs/hydra-eval-jobs.cc
index 18d39620..de7ae7ba 100644
--- a/src/hydra-eval-jobs/hydra-eval-jobs.cc
+++ b/src/hydra-eval-jobs/hydra-eval-jobs.cc
@@ -129,7 +129,7 @@ static void worker(
             LockFlags {
                 .updateLockFile = false,
                 .useRegistries = false,
-                .allowMutable = false,
+                .allowUnlocked = false,
             });
 
         callFlake(state, lockedFlake, *vFlake);