!zghijEASpYQWYFzriI:nixos.org

Hydra

368 Members
111 Servers

You have reached the beginning of time (for this room).


SenderMessageTime
20 Sep 2024
@cleverca22:matrix.orgcleverca22 commit e499509595859d670432c0d98162119ecd552666 10:44:34
@cleverca22:matrix.orgcleverca22so basically, i'm just reverting 2 parts of this10:44:45
@joerg:thalheim.ioMic92ah, so something like this is needed: https://github.com/edolstra/nix-serve/commit/06c1e229ac647cf9733af509e83a8407c614100610:53:59
@joerg:thalheim.ioMic92So something like this is missing: https://github.com/NixOS/hydra/pull/1388/commits/e499509595859d670432c0d98162119ecd55266610:54:33
@joerg:thalheim.ioMic92That's a bigger pull request.10:54:47
@cleverca22:matrix.orgcleverca22
commit 045a62ca8ba8fe68c5da1d15b5f97ceb4b91c4c1 (HEAD -> fix-binary-cache, clever/fix-binary-cache)
Author: Michael Bishop <cleverca22@gmail.com>
Date:   Fri Sep 20 05:49:41 2024 -0300

    fix narinfo signature generation

diff --git a/src/lib/Hydra/View/NARInfo.pm b/src/lib/Hydra/View/NARInfo.pm
index bf8711a4..5f40b48f 100644
--- a/src/lib/Hydra/View/NARInfo.pm
+++ b/src/lib/Hydra/View/NARInfo.pm
@@ -7,6 +7,8 @@ use Hydra::Helper::CatalystUtils;
 use MIME::Base64;
 use Nix::Manifest;
 use Hydra::Helper::Nix;
+use Nix::Store;
+use Nix::Utils;
 use base qw/Catalyst::View/;
 
 sub process {
@@ -36,7 +38,7 @@ sub process {
     # Optionally, sign the NAR info file we just created.
     my $secretKeyFile = $c->config->{binary_cache_secret_key_file};
     if (defined $secretKeyFile) {
-        my $secretKey = readFile $secretKeyFile;
+        my $secretKey = readFile($secretKeyFile);
         my $fingerprint = fingerprintPath($storePath, $narHash, $narSize, $refs);
         my $sig = signString($secretKey, $fingerprint);
         $info .= "Sig: $sig\n";
10:57:43
@cleverca22:matrix.orgcleverca22 Mic92: with just these 2 lines restored, it works again 10:57:52
@cleverca22:matrix.orgcleverca22the parens are likely redundant10:58:03
@joerg:thalheim.ioMic92 cleverca22: ok, but these imports are already in master 10:59:15
@joerg:thalheim.ioMic92what version are you on?10:59:20
@cleverca22:matrix.orgcleverca22
In reply to @Ericson2314:matrix.org
cleverca22: it would be nice if you could PR it to the nix-2.21 branch
ah, i forked off this branch, because i was fixing a different error, in the nar endpoint
10:59:59
@joerg:thalheim.ioMic92ok. I am getting confused with all these branches11:00:46
@cleverca22:matrix.orgcleverca22i'm also a bit confused about the history of that 2.21 branch11:01:01
@joerg:thalheim.ioMic92 John Ericson: can you explain how these branches in hydra are supposed to be used? 11:02:16
@cleverca22:matrix.orgcleverca22
In reply to @joerg:thalheim.io
cleverca22: ok, but these imports are already in master
https://github.com/NixOS/hydra/pull/1405
ah yep, somebody else already found and fixed it in master
11:03:10
@joerg:thalheim.ioMic92I even merged it...11:03:27
@cleverca22:matrix.orgcleverca22heh11:03:38
@cleverca22:matrix.orgcleverca22i'll just cherry-pick that into my upcoming PR on the 2.21 branch11:03:50
@cleverca22:matrix.orgcleverca22that will likely cause fewer merge conflicts down the road11:04:35
@cleverca22:matrix.orgcleverca22https://github.com/NixOS/hydra/pull/1414 is my PR11:05:18
@hacker1024:matrix.orghacker1024Thanks for that! I got stuck there and gave up lol11:18:12
@hacker1024:matrix.orghacker1024Now the only thing keeping me from upgrading is the fact that remote builds seem to have completely broke with Nix 2.2111:18:47
@joerg:thalheim.ioMic92 hacker1024: has it something to do with parsing keys? 11:19:53
@hacker1024:matrix.orghacker1024I don't think so, I'm getting the error that this person got https://60228.dev/@leo/11241344970390362711:20:20
@hacker1024:matrix.orghacker1024Related: https://github.com/NixOS/nix/issues/9961#issuecomment-1949315154 But I tried using the same Nix version as Hydra on my remote builders and that didn't help11:20:53

Show newer messages


Back to Room ListRoom Version: 6