From 20c8263e3c993d4ba0a2a0bedd531a7f32861441 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 7 Dec 2023 11:40:30 -0500
Subject: [PATCH] Update to Nix master
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The point of this branch is to always track Nix master, so we are
proactively ready to upgrade to the next Nix release when it is ready.
Flake lock file updates:
• Updated input 'nix':
'github:NixOS/nix/50f8f1c8bc019a4c0fd098b9ac674b94cfc6af0d' (2023-11-27)
→ 'github:NixOS/nix/c3827ff6348a4d5199eaddf8dbc2ca2e2ef46ec5' (2023-12-07)
• Added input 'nix/libgit2':
'github:libgit2/libgit2/45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5' (2023-10-18)
---
flake.lock | 24 ++++++++++++++++++++----
flake.nix | 2 +-
src/hydra-queue-runner/build-remote.cc | 2 +-
src/hydra-queue-runner/nar-extractor.cc | 2 +-
src/hydra-queue-runner/queue-monitor.cc | 2 +-
5 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/flake.lock b/flake.lock
index 2871e70a..ae4f60eb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -16,6 +16,22 @@
"type": "github"
}
},
+ "libgit2": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1697646580,
+ "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=",
+ "owner": "libgit2",
+ "repo": "libgit2",
+ "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5",
+ "type": "github"
+ },
+ "original": {
+ "owner": "libgit2",
+ "repo": "libgit2",
+ "type": "github"
+ }
+ },
"lowdown-src": {
"flake": false,
"locked": {
@@ -35,6 +51,7 @@
"nix": {
"inputs": {
"flake-compat": "flake-compat",
+ "libgit2": "libgit2",
"lowdown-src": "lowdown-src",
"nixpkgs": [
"nixpkgs"
@@ -42,16 +59,15 @@
"nixpkgs-regression": "nixpkgs-regression"
},
"locked": {
- "lastModified": 1701122567,
- "narHash": "sha256-iA8DqS+W2fWTfR+nNJSvMHqQ+4NpYMRT3b+2zS6JTvE=",
+ "lastModified": 1701948782,
+ "narHash": "sha256-rEu4hLHZIy3fgf88BpiaVfl79hNSESRfQNbmxAO5uzg=",
"owner": "NixOS",
"repo": "nix",
- "rev": "50f8f1c8bc019a4c0fd098b9ac674b94cfc6af0d",
+ "rev": "c3827ff6348a4d5199eaddf8dbc2ca2e2ef46ec5",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "2.19.2",
"repo": "nix",
"type": "github"
}
diff --git a/flake.nix b/flake.nix
index 5a5aef55..fdeaa6ca 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
description = "A Nix-based continuous build system";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
- inputs.nix.url = "github:NixOS/nix/2.19.2";
+ inputs.nix.url = "github:NixOS/nix";
inputs.nix.inputs.nixpkgs.follows = "nixpkgs";
outputs = { self, nixpkgs, nix }:
diff --git a/src/hydra-queue-runner/build-remote.cc b/src/hydra-queue-runner/build-remote.cc
index f41585c8..dad414bf 100644
--- a/src/hydra-queue-runner/build-remote.cc
+++ b/src/hydra-queue-runner/build-remote.cc
@@ -350,7 +350,7 @@ static std::map<StorePath, ValidPathInfo> queryPathInfos(
auto references = ServeProto::Serialise<StorePathSet>::read(localStore, conn);
readLongLong(conn.from); // download size
auto narSize = readLongLong(conn.from);
- auto narHash = Hash::parseAny(readString(conn.from), htSHA256);
+ auto narHash = Hash::parseAny(readString(conn.from), HashAlgorithm::SHA256);
auto ca = ContentAddress::parseOpt(readString(conn.from));
readStrings<StringSet>(conn.from); // sigs
ValidPathInfo info(localStore.parseStorePath(storePathS), narHash);
diff --git a/src/hydra-queue-runner/nar-extractor.cc b/src/hydra-queue-runner/nar-extractor.cc
index 3c6857bf..ff4aa268 100644
--- a/src/hydra-queue-runner/nar-extractor.cc
+++ b/src/hydra-queue-runner/nar-extractor.cc
@@ -42,7 +42,7 @@ struct Extractor : ParseSink
void preallocateContents(uint64_t size) override
{
expectedSize = size;
- hashSink = std::make_unique<HashSink>(htSHA256);
+ hashSink = std::make_unique<HashSink>(HashAlgorithm::SHA256);
}
void receiveContents(std::string_view data) override
diff --git a/src/hydra-queue-runner/queue-monitor.cc b/src/hydra-queue-runner/queue-monitor.cc
index 6c339af6..3ce9bba2 100644
--- a/src/hydra-queue-runner/queue-monitor.cc
+++ b/src/hydra-queue-runner/queue-monitor.cc
@@ -677,7 +677,7 @@ BuildOutput State::getBuildOutputCached(Connection & conn, nix::ref<nix::Store>
product.fileSize = row[2].as<off_t>();
}
if (!row[3].is_null())
- product.sha256hash = Hash::parseAny(row[3].as<std::string>(), htSHA256);
+ product.sha256hash = Hash::parseAny(row[3].as<std::string>(), HashAlgorithm::SHA256);
if (!row[4].is_null())
product.path = row[4].as<std::string>();
product.name = row[5].as<std::string>();