Merge pull request 'Fix build with latest Lix, use CLang' (#22) from ma27/hydra:flake-update into main

Reviewed-on: https://git.lix.systems/lix-project/hydra/pulls/22

.envrc

@@ -1 +1 @@
-use flake .#clang
+use flake .#

flake.lock

@@ -27,11 +27,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1738174211,
-        "narHash": "sha256-eYmp1mKM4kULV1W+EBtCPk6LmKWl2REivaYfGRl+AWo=",
+        "lastModified": 1739016888,
+        "narHash": "sha256-JUOvTAYx+/bAec9H7C/nnpT1NRm/6tdy5EZ/XuUGHlA=",
         "ref": "refs/heads/main",
-        "rev": "64e33a7e09a0d1faacf2fd3f6ebd647fe4d8346a",
-        "revCount": 17329,
+        "rev": "72326c404487bbf8dc6ee069930c6c2a0319857e",
+        "revCount": 17371,
         "type": "git",
         "url": "https://git.lix.systems/lix-project/lix"
       },
@@ -58,11 +58,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1737672001,
-        "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=",
+        "lastModified": 1738843498,
+        "narHash": "sha256-7x+Q4xgFj9UxZZO9aUDCR8h4vyYut4zPUvfj3i+jBHE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8",
+        "rev": "f5a32fa27df91dfc4b762671a0e0a859a8a0058f",
         "type": "github"
       },
       "original": {

flake.nix

@@ -26,6 +26,7 @@
         hydra = final.callPackage ./package.nix {
           inherit (final.lib) fileset;
           rawSrc = self;
+          stdenv = final.clangStdenv;
         };
       };
 
@@ -79,8 +80,7 @@
             lib.optional (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) pkgs.clang-tools;
         };
       in {
-        default = mkDevShell pkgs.stdenv;
-        clang = mkDevShell pkgs.clangStdenv;
+        default = mkDevShell pkgs.clangStdenv;
       });
 
       nixosModules = import ./nixos-modules {

src/hydra-queue-runner/hydra-queue-runner.cc

@@ -596,7 +596,7 @@ std::shared_ptr<PathLocks> State::acquireGlobalLock()
     createDirs(dirOf(lockPath));
 
     auto lock = std::make_shared<PathLocks>();
-    if (!lock->lockPaths(PathSet({lockPath}), "", false)) return nullptr;
+    if (!lock->tryLockPaths(PathSet({lockPath}))) return nullptr;
 
     return lock;
 }