Merge pull request #1415 from NixOS/nix-2.23

Update to Nix 2.23
2024-09-24 12:00:47 -04:00 · 2024-09-24 11:38:01 -04:00 · 2024-09-24 11:25:33 -04:00 · 2024-09-24 11:25:10 -04:00 · 2024-09-24 11:23:21 -04:00 · 2024-09-20 13:24:47 +02:00
7 changed files with 13 additions and 10 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -80,16 +80,16 @@
        "pre-commit-hooks": "pre-commit-hooks"
      },
      "locked": {
-        "lastModified": 1713874370,
-        "narHash": "sha256-gW1mO/CvsQQ5gvgiwzxsGhPFI/tx30NING+qgF5Do0s=",
+        "lastModified": 1727132408,
+        "narHash": "sha256-esYY9tT7Q79rG4+Xvf32L3AZvVGgdVeT1n0uK6Gd6ls=",
        "owner": "NixOS",
        "repo": "nix",
-        "rev": "1c8150ac312b5f9ba1b3f6768ff43b09867e5883",
+        "rev": "5ffd239adc9b7fddca7a2a59a8b87da5af14ec4d",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "2.22-maintenance",
+        "ref": "2.23-maintenance",
        "repo": "nix",
        "type": "github"
      }
--- 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.11-small";
-  inputs.nix.url = "github:NixOS/nix/2.22-maintenance";
+  inputs.nix.url = "github:NixOS/nix/2.23-maintenance";
  inputs.nix.inputs.nixpkgs.follows = "nixpkgs";

  outputs = { self, nixpkgs, nix }:
--- a/nixos-modules/hydra.nix
+++ b/nixos-modules/hydra.nix
@@ -464,10 +464,12 @@ in
          ''
            set -eou pipefail
            compression=$(sed -nr 's/compress_build_logs_compression = ()/\1/p' ${baseDir}/hydra.conf)
-            if [[ $compression == zstd ]]; then
+            if [[ $compression == "" ]]; then
+              compression="bzip2"
+            elif [[ $compression == zstd ]]; then
              compression="zstd --rm"
            fi
-            find ${baseDir}/build-logs -type f -name "*.drv" -mtime +3 -size +0c | xargs -r $compression --force --quiet
+            find ${baseDir}/build-logs -type f -name "*.drv" -mtime +3 -size +0c | xargs -r "$compression" --force --quiet
          '';
        startAt = "Sun 01:45";
      };
--- a/src/hydra-queue-runner/state.hh
+++ b/src/hydra-queue-runner/state.hh
@@ -23,6 +23,7 @@
 #include "nar-extractor.hh"
 #include "serve-protocol.hh"
 #include "serve-protocol-impl.hh"
+#include "serve-protocol-connection.hh"
 #include "machines.hh"


--- a/src/lib/Hydra/Controller/Root.pm
+++ b/src/lib/Hydra/Controller/Root.pm
@@ -330,7 +330,7 @@ sub nar :Local :Args(1) {
    else {
        $path = $Nix::Config::storeDir . "/$path";

-        gone($c, "Path " . $path . " is no longer available.") unless isValidPath($path);
+        gone($c, "Path " . $path . " is no longer available.") unless $MACHINE_LOCAL_STORE->isValidPath($path);

        $c->stash->{current_view} = 'NixNAR';
        $c->stash->{storePath} = $path;
--- a/src/lib/Hydra/Plugin/S3Backup.pm
+++ b/src/lib/Hydra/Plugin/S3Backup.pm
@@ -92,7 +92,7 @@ sub buildFinished {
        my $hash = substr basename($path), 0, 32;
        my ($deriver, $narHash, $time, $narSize, $refs) = queryPathInfo($path, 0);
        my $system;
-        if (defined $deriver and isValidPath($deriver)) {
+        if (defined $deriver and $MACHINE_LOCAL_STORE->isValidPath($deriver)) {
            $system = derivationFromPath($deriver)->{platform};
        }
        foreach my $reference (@{$refs}) {
--- a/src/lib/Hydra/Plugin/SubversionInput.pm
+++ b/src/lib/Hydra/Plugin/SubversionInput.pm
@@ -46,7 +46,7 @@ sub fetchInput {

    $MACHINE_LOCAL_STORE->addTempRoot($cachedInput->storepath) if defined $cachedInput;

-    if (defined $cachedInput && isValidPath($cachedInput->storepath)) {
+    if (defined $cachedInput && $MACHINE_LOCAL_STORE->isValidPath($cachedInput->storepath)) {
        $storePath = $cachedInput->storepath;
        $sha256 = $cachedInput->sha256hash;
    } else {
Author	SHA1	Message	Date
John Ericson	95003f2eb5	Merge pull request #1415 from NixOS/nix-2.23 Update to Nix 2.23	2024-09-24 12:00:47 -04:00
John Ericson	029116422d	Update to Nix 2.23 Flake lock file updates: • Updated input 'nix': 'github:NixOS/nix/1c8150ac312b5f9ba1b3f6768ff43b09867e5883' (2024-04-23) → 'github:NixOS/nix/5ffd239adc9b7fddca7a2a59a8b87da5af14ec4d' (2024-09-23)	2024-09-24 11:38:01 -04:00
John Ericson	108e409559	Merge branch 'nix-2.22'	2024-09-24 11:25:33 -04:00
John Ericson	1a5bd9e103	Merge remote-tracking branch 'upstream/nix-2.21' into nix-2.22	2024-09-24 11:25:10 -04:00
John Ericson	647191cd4a	Merge remote-tracking branch 'upstream/nix-2.21'	2024-09-24 11:23:21 -04:00
Jörg Thalheim	73e51b94b1	Merge pull request #1414 from cleverca22/fix-binary-cache fix nar endpoint for binary cache hosting	2024-09-20 13:24:47 +02:00
hacker1024	1ef6b5e7b4	Use Nix::Store and Nix::Utils in NARInfo.pm These are required for the `signString` and `readFile` subroutines used when signing NARs. (cherry picked from commit `b94a7b6d5c`)	2024-09-20 08:04:23 -03:00
Jörg Thalheim	44248d3cf4	Merge pull request #1412 from NixOS/hydra-compress-logs set a default for hydra-compress-logs service	2024-09-20 09:21:34 +02:00
Michael Bishop	cc1b6d394e	fix the binary cache calling isValidPath, and 2 other files with the same issue	2024-09-20 04:08:22 -03:00
zowoq	b472f55563	set a default for hydra-compress-logs service follow up from `99ca560d58`	2024-09-20 09:04:15 +02:00
Jörg Thalheim	c61bdd2c28	Merge pull request #1410 from NixOS/compiler-warnings hydra-queue-runner: fix compilation warning	2024-09-20 09:00:55 +02:00
John Ericson	879ceb5cdc	flake.lock: Update Flake lock file updates: • Updated input 'nix': 'github:NixOS/nix/60824fa97c588a0faf68ea61260a47e388b0a4e5' (2024-04-11) → 'github:NixOS/nix/1ebc34e9c54b740ea4f4466443047d709dccf5b2' (2024-05-16)	2024-05-21 18:23:35 -04:00
John Ericson	898ca2f600	Merge branch 'nix-2.20' into nix-2.21	2024-05-21 18:23:04 -04:00
John Ericson	21044bc4d9	flake.lock: Update Flake lock file updates: • Updated input 'nix': 'github:NixOS/nix/8f42912c80c0a03f62f6a3d28a3af05a9762565d' (2024-01-30) → 'github:NixOS/nix/ab48ea416a203e9ccefb70aa634e27477e4c1ac4' (2024-05-15)	2024-05-21 18:01:30 -04:00