make flake.nix test pure

hydra-eval-jobs: use nix-eval-jobs's --select rather --expr
the current use of builtins.getFlake, mean we don't have pure evaluation
2025-11-11 15:39:23 +01:00 · 2025-11-11 15:12:42 +01:00
37 changed files with 202 additions and 288 deletions
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,7 +16,7 @@ jobs:
            runner: ubuntu-24.04-arm
    runs-on: ${{ matrix.runner }}
    steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v3
      with:
        fetch-depth: 0
    - uses: cachix/install-nix-action@v31
--- a/.github/workflows/update-flakes.yml
+++ b/.github/workflows/update-flakes.yml
@@ -11,12 +11,12 @@ jobs:
      contents: write
      pull-requests: write
    steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v3
    - uses: cachix/install-nix-action@v31
    - name: Update flake inputs
      run: nix flake update
    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v8
+      uses: peter-evans/create-pull-request@v5
      with:
        commit-message: "flake.lock: Update"
        title: "Update flake inputs"
--- a/flake.lock
+++ b/flake.lock
@@ -3,16 +3,16 @@
    "nix": {
      "flake": false,
      "locked": {
-        "lastModified": 1772065213,
-        "narHash": "sha256-DbYpmZAD6aebwxepBop5Ub4S39sLg9UIJziTbeD832k=",
+        "lastModified": 1760573252,
+        "narHash": "sha256-mcvNeNdJP5R7huOc8Neg0qZESx/0DMg8Fq6lsdx0x8U=",
        "owner": "NixOS",
        "repo": "nix",
-        "rev": "0769726d44b0782fecbd7b9749e24320c77af317",
+        "rev": "3c39583e5512729f9c5a44c3b03b6467a2acd963",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "2.33-maintenance",
+        "ref": "2.32-maintenance",
        "repo": "nix",
        "type": "github"
      }
@@ -20,32 +20,32 @@
    "nix-eval-jobs": {
      "flake": false,
      "locked": {
-        "lastModified": 1767025318,
-        "narHash": "sha256-i68miKHGdueWggcDAF+Kca9g6S3ipkW629XbMpQYfn0=",
+        "lastModified": 1760478325,
+        "narHash": "sha256-hA+NOH8KDcsuvH7vJqSwk74PyZP3MtvI/l+CggZcnTc=",
        "owner": "nix-community",
        "repo": "nix-eval-jobs",
-        "rev": "79dd7adbb5f75b08fb4b9bddd712ebc52baa46bc",
+        "rev": "daa42f9e9c84aeff1e325dd50fda321f53dfd02c",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "v2.33.0",
+        "ref": "v2.32.1",
        "repo": "nix-eval-jobs",
        "type": "github"
      }
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1772934839,
-        "narHash": "sha256-6mMYkB7BTTsc4thtCFbh3Aj5yth3EPI6L9L5DR6tpWc=",
+        "lastModified": 1759652726,
+        "narHash": "sha256-2VjnimOYDRb3DZHyQ2WH2KCouFqYm9h0Rr007Al/WSA=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "d351a3bce30b8f0d0a36281754b62942977fabe5",
+        "rev": "06b2985f0cc9eb4318bf607168f4b15af1e5e81d",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-25.11-small",
+        "ref": "nixos-25.05-small",
        "repo": "nixpkgs",
        "type": "github"
      }
--- a/flake.nix
+++ b/flake.nix
@@ -1,16 +1,16 @@
 {
  description = "A Nix-based continuous build system";

-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11-small";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05-small";

  inputs.nix = {
-    url = "github:NixOS/nix/2.33-maintenance";
+    url = "github:NixOS/nix/2.32-maintenance";
    # We want to control the deps precisely
    flake = false;
  };

  inputs.nix-eval-jobs = {
-    url = "github:nix-community/nix-eval-jobs/v2.33.0";
+    url = "github:nix-community/nix-eval-jobs/v2.32.1";
    # We want to control the deps precisely
    flake = false;
  };
@@ -59,7 +59,7 @@

        manual = forEachSystem (system: let
          pkgs = nixpkgs.legacyPackages.${system};
-          hydra = self.packages.${pkgs.stdenv.hostPlatform.system}.hydra;
+          hydra = self.packages.${pkgs.hostPlatform.system}.hydra;
        in
          pkgs.runCommand "hydra-manual-${hydra.version}" { }
            ''
--- a/hydra-api.yaml
+++ b/hydra-api.yaml
@@ -574,131 +574,6 @@ paths:
              schema:
                $ref: '#/components/schemas/JobsetEvalBuilds'

-  /jobset/{project-id}/{jobset-id}/latest-eval:
-    get:
-      summary: Redirects to the latest finished evaluation for a jobset
-      parameters:
-      - name: project-id
-        in: path
-        description: project identifier
-        required: true
-        schema:
-          type: string
-      - name: jobset-id
-        in: path
-        description: jobset identifier
-        required: true
-        schema:
-          type: string
-      responses:
-        '302':
-          description: the evaluation to redirect to
-          headers:
-            Location:
-              example: /eval/1?name={jobset-id}
-              schema:
-                type: string
-
-  /job/{project-id}/{jobset-id}/{job-id}/latest:
-    get:
-      summary: Redirects to the latest succesful build for a job
-      parameters:
-      - name: project-id
-        in: path
-        description: project identifier
-        required: true
-        schema:
-          type: string
-      - name: jobset-id
-        in: path
-        description: jobset identifier
-        required: true
-        schema:
-          type: string
-      - name: job-id
-        in: path
-        description: job identifier
-        required: true
-        schema:
-          type: string
-      responses:
-        '302':
-          description: the build to redirect to
-          headers:
-            Location:
-              example: /build/1
-              schema:
-                type: string
-
-  /job/{project-id}/{jobset-id}/{job-id}/latest-for/{system}:
-    get:
-      summary: Redirects to the latest succesful build for a job
-      parameters:
-      - name: project-id
-        in: path
-        description: project identifier
-        required: true
-        schema:
-          type: string
-      - name: jobset-id
-        in: path
-        description: jobset identifier
-        required: true
-        schema:
-          type: string
-      - name: job-id
-        in: path
-        description: job identifier
-        required: true
-        schema:
-          type: string
-      - name: system
-        in: path
-        description: system
-        required: true
-        schema:
-          type: string
-        example: x86_64-linux
-      responses:
-        '302':
-          description: the build to redirect to
-          headers:
-            Location:
-              example: /build/1
-              schema:
-                type: string
-
-  /job/{project-id}/{jobset-id}/{job-id}/latest-finished:
-    get:
-      summary: Redirects to the latest succesful build for a job from a finished evaluation
-      parameters:
-      - name: project-id
-        in: path
-        description: project identifier
-        required: true
-        schema:
-          type: string
-      - name: jobset-id
-        in: path
-        description: jobset identifier
-        required: true
-        schema:
-          type: string
-      - name: job-id
-        in: path
-        description: job identifier
-        required: true
-        schema:
-          type: string
-      responses:
-        '302':
-          description: the build to redirect to
-          headers:
-            Location:
-              example: /build/1
-              schema:
-                type: string
-
 components:
  schemas:

--- a/nixos-modules/default.nix
+++ b/nixos-modules/default.nix
@@ -4,7 +4,7 @@
  hydra = { pkgs, lib,... }: {
    _file = ./default.nix;
    imports = [ ./hydra.nix ];
-    services.hydra-dev.package = lib.mkDefault self.packages.${pkgs.stdenv.hostPlatform.system}.hydra;
+    services.hydra-dev.package = lib.mkDefault self.packages.${pkgs.hostPlatform.system}.hydra;
  };

  hydraTest = { pkgs, ... }: {
--- a/package.nix
+++ b/package.nix
@@ -31,7 +31,7 @@
 , perl
 , pixz
 , boost
-, postgresql_17
+, postgresql_13
 , nlohmann_json
 , prometheus-cpp

@@ -192,7 +192,7 @@ stdenv.mkDerivation (finalAttrs: {
    subversion
    breezy
    openldap
-    postgresql_17
+    postgresql_13
    pixz
    nix-eval-jobs
  ];
--- a/src/hydra-queue-runner/build-remote.cc
+++ b/src/hydra-queue-runner/build-remote.cc
@@ -273,7 +273,7 @@ static BuildResult performBuild(
                auto drvOutput = DrvOutput { outputHash, outputName };
                successP->builtOutputs.insert_or_assign(
                    std::move(outputName),
-                    Realisation { {.outPath = *outputPath}, drvOutput });
+                    Realisation { drvOutput, *outputPath });
            }
        }
    }
--- a/src/hydra-queue-runner/hydra-queue-runner.cc
+++ b/src/hydra-queue-runner/hydra-queue-runner.cc
@@ -537,12 +537,12 @@ void State::notifyBuildFinished(pqxx::work & txn, BuildID buildId,

 std::shared_ptr<PathLocks> State::acquireGlobalLock()
 {
-    auto lockPath = std::filesystem::path(hydraData) / "queue-runner/lock";
+    Path lockPath = hydraData + "/queue-runner/lock";

-    createDirs(lockPath.parent_path());
+    createDirs(dirOf(lockPath));

    auto lock = std::make_shared<PathLocks>();
-    if (!lock->lockPaths({lockPath}, "", false)) return 0;
+    if (!lock->lockPaths(PathSet({lockPath}), "", false)) return 0;

    return lock;
 }
--- a/src/hydra-queue-runner/queue-monitor.cc
+++ b/src/hydra-queue-runner/queue-monitor.cc
@@ -1,6 +1,5 @@
 #include "state.hh"
 #include "hydra-build-result.hh"
-#include <nix/store/derived-path.hh>
 #include <nix/store/globals.hh>
 #include <nix/store/parsed-derivations.hh>
 #include <nix/util/thread-pool.hh>
@@ -488,24 +487,24 @@ Step::ptr State::createStep(ref<Store> destStore,
       it's not runnable yet, and other threads won't make it
       runnable while step->created == false. */
    step->drv = std::make_unique<Derivation>(localStore->readDerivation(drvPath));
-    DerivationOptions<nix::SingleDerivedPath> drvOptions;
-    try {
-        drvOptions = derivationOptionsFromStructuredAttrs(
-            *localStore,
-            step->drv->inputDrvs,
-            step->drv->env,
-            get(step->drv->structuredAttrs));
-    } catch (Error & e) {
-        e.addTrace({}, "while parsing derivation '%s'", localStore->printStorePath(drvPath));
-        throw;
+    {
+        try {
+            step->drvOptions = std::make_unique<DerivationOptions>(
+                DerivationOptions::fromStructuredAttrs(
+                    step->drv->env,
+                    step->drv->structuredAttrs ? &*step->drv->structuredAttrs : nullptr));
+        } catch (Error & e) {
+            e.addTrace({}, "while parsing derivation '%s'", localStore->printStorePath(drvPath));
+            throw;
+        }
    }

-    step->preferLocalBuild = drvOptions.willBuildLocally(*localStore, *step->drv);
+    step->preferLocalBuild = step->drvOptions->willBuildLocally(*localStore, *step->drv);
    step->isDeterministic = getOr(step->drv->env, "isDetermistic", "0") == "1";

    step->systemType = step->drv->platform;
    {
-        StringSet features = step->requiredSystemFeatures = drvOptions.getRequiredSystemFeatures(*step->drv);
+        StringSet features = step->requiredSystemFeatures = step->drvOptions->getRequiredSystemFeatures(*step->drv);
        if (step->preferLocalBuild)
            features.insert("local");
        if (!features.empty()) {
--- a/src/hydra-queue-runner/state.hh
+++ b/src/hydra-queue-runner/state.hh
@@ -172,6 +172,7 @@ struct Step

    nix::StorePath drvPath;
    std::unique_ptr<nix::Derivation> drv;
+    std::unique_ptr<nix::DerivationOptions> drvOptions;
    nix::StringSet requiredSystemFeatures;
    bool preferLocalBuild;
    bool isDeterministic;
--- a/src/lib/Hydra/Controller/API.pm
+++ b/src/lib/Hydra/Controller/API.pm
@@ -220,11 +220,11 @@ sub scmdiff : Path('/api/scmdiff') Args(0) {
        my $clonePath = getSCMCacheDir . "/git/" . sha256_hex($uri);
        die if ! -d $clonePath;
        my ($stdout1, $stderr1);
-        run3(['git', '--git-dir', '.git', '-C', $clonePath, 'log', "$rev1..$rev2"], \undef, \$stdout1, \$stderr1);
+        run3(['git', '-C', $clonePath, 'log', "$rev1..$rev2"], \undef, \$stdout1, \$stderr1);
        $diff .= $stdout1 if $? == 0;

        my ($stdout2, $stderr2);
-        run3(['git', '--git-dir', '.git', '-C', $clonePath, 'diff', "$rev1..$rev2"], \undef, \$stdout2, \$stderr2);
+        run3(['git', '-C', $clonePath, 'diff', "$rev1..$rev2"], \undef, \$stdout2, \$stderr2);
        $diff .= $stdout2 if $? == 0;
    }

--- a/src/lib/Hydra/Controller/User.pm
+++ b/src/lib/Hydra/Controller/User.pm
@@ -106,11 +106,11 @@ sub doEmailLogin {
    my $allowed_domains = $c->config->{allowed_domains} // ($c->config->{persona_allowed_domains} // "");
    if ($allowed_domains ne "") {
        my $email_ok = 0;
-        my @domains = split /,/, $allowed_domains;
+        my @domains = split ',', $allowed_domains;
        map { $_ =~ s/^\s*(.*?)\s*$/$1/ } @domains;

        foreach my $domain (@domains) {
-            $email_ok = $email_ok || ((split /@/, $email)[1] eq $domain);
+            $email_ok = $email_ok || ((split '@', $email)[1] eq $domain);
        }
        error($c, "Your email address does not belong to a domain that is allowed to log in.\n")
            unless $email_ok;
--- a/src/lib/Hydra/Plugin/EmailNotification.pm
+++ b/src/lib/Hydra/Plugin/EmailNotification.pm
@@ -71,7 +71,7 @@ sub buildFinished {

        my $to = $build->jobset->emailoverride ne "" ? $build->jobset->emailoverride : $build->maintainers;

-        foreach my $address (split /,/, ($to // "")) {
+        foreach my $address (split ",", ($to // "")) {
            $address = trim $address;

            $addresses{$address} //= { builds => [] };
--- a/src/lib/Hydra/Plugin/GitInput.pm
+++ b/src/lib/Hydra/Plugin/GitInput.pm
@@ -38,7 +38,7 @@ sub _parseValue {
        $start_options = 2;
    }
    foreach my $option (@parts[$start_options .. $#parts]) {
-        (my $key, my $value) = split(/=/, $option);
+        (my $key, my $value) = split('=', $option);
        $options->{$key} = $value;
    }
    return ($uri, $branch, $deepClone, $options);
@@ -265,7 +265,7 @@ sub getCommits {

    my $res = [];
    foreach my $line (split /\n/, $out) {
-        my ($revision, $author, $email, $date) = split /\t/, $line;
+        my ($revision, $author, $email, $date) = split "\t", $line;
        push @$res, { revision => $revision, author => decode("utf-8", $author), email => $email };
    }

--- a/src/lib/Hydra/Plugin/GiteaStatus.pm
+++ b/src/lib/Hydra/Plugin/GiteaStatus.pm
@@ -63,9 +63,9 @@ sub common {
            my $accessToken = $self->{config}->{gitea_authorization}->{$repoOwner};

            my $rev = $i->revision;
+            my $domain = URI->new($i->uri)->host;
            my $host;
            unless (defined $gitea_url) {
-                my $domain = URI->new($i->uri)->host;
                $host = "https://$domain";
            } else {
                $host = $gitea_url->value;
--- a/src/lib/Hydra/Plugin/GithubPulls.pm
+++ b/src/lib/Hydra/Plugin/GithubPulls.pm
@@ -31,10 +31,10 @@ sub _iterate {
        $pulls->{$pull->{number}} = $pull;
    }
    # TODO Make Link header parsing more robust!!!
-    my @links = split /,/, ($res->header("Link") // "");
+    my @links = split ',', ($res->header("Link") // "");
    my $next = "";
    foreach my $link (@links) {
-        my ($url, $rel) = split /;/, $link;
+        my ($url, $rel) = split ";", $link;
        if (trim($rel) eq 'rel="next"') {
            $next = substr trim($url), 1, -1;
            last;
--- a/src/lib/Hydra/Plugin/GithubRefs.pm
+++ b/src/lib/Hydra/Plugin/GithubRefs.pm
@@ -83,10 +83,10 @@ sub _iterate {
        $refs->{$ref_name} = $ref;
    }
    # TODO Make Link header parsing more robust!!!
-    my @links = split /,/, $res->header("Link");
+    my @links = split ',', $res->header("Link");
    my $next = "";
    foreach my $link (@links) {
-        my ($url, $rel) = split /;/, $link;
+        my ($url, $rel) = split ";", $link;
        if (trim($rel) eq 'rel="next"') {
            $next = substr trim($url), 1, -1;
            last;
--- a/src/lib/Hydra/Plugin/GitlabPulls.pm
+++ b/src/lib/Hydra/Plugin/GitlabPulls.pm
@@ -49,10 +49,10 @@ sub _iterate {
        $pulls->{$pull->{iid}} = $pull;
    }
    # TODO Make Link header parsing more robust!!!
-    my @links = split /,/, $res->header("Link");
+    my @links = split ',', $res->header("Link");
    my $next = "";
    foreach my $link (@links) {
-        my ($url, $rel) = split /;/, $link;
+        my ($url, $rel) = split ";", $link;
        if (trim($rel) eq 'rel="next"') {
            $next = substr trim($url), 1, -1;
            last;
@@ -84,7 +84,7 @@ sub fetchInput {
    my $tempdir = File::Temp->newdir("gitlab-pulls" . "XXXXX", TMPDIR => 1);
    my $filename = "$tempdir/gitlab-pulls-sorted.json";
    open(my $fh, ">", $filename) or die "Cannot open $filename for writing: $!";
-    print $fh JSON::MaybeXS->new(canonical => 1, pretty => 1, utf8 => 1)->encode(\%pulls);
+    print $fh JSON::MaybeXS->new(canonical => 1, pretty => 1)->encode(\%pulls);
    close $fh;
    my $storePath = addToStore($filename);
    my $timestamp = time;
--- a/src/lib/Hydra/Plugin/MercurialInput.pm
+++ b/src/lib/Hydra/Plugin/MercurialInput.pm
@@ -126,7 +126,7 @@ sub getCommits {
    my $res = [];
    foreach my $line (split /\n/, $out) {
        if ($line ne "") {
-            my ($revision, $author, $email) = split /\t/, $line;
+            my ($revision, $author, $email) = split "\t", $line;
            push @$res, { revision => $revision, author => $author, email => $email };
        }
    }
--- a/src/lib/Hydra/Plugin/PathInput.pm
+++ b/src/lib/Hydra/Plugin/PathInput.pm
@@ -12,31 +12,19 @@ sub supportedInputTypes {
    $inputTypes->{'path'} = 'Local path or URL';
 }

-sub _parseValue {
-    # The input is a local path or URL, optionally followed by a
-    # time period specified in seconds.
-    my ($config, $value) = @_;
-    my @parts = split ' ', $value;
-    (my $uri, my $freq) = @parts;
-    # By default don't check a path more often than every 30 seconds,
-    # but the second path argument can change that value or the global
-    # path_input_cache_validity_seconds configuration, in that order.
-    my $timeout = defined $freq ? $freq : ($config->{path_input_cache_validity_seconds} // 30);
-
-    return ($uri, $timeout);
-}
-
 sub fetchInput {
    my ($self, $type, $name, $value) = @_;

    return undef if $type ne "path";

-    my ($uri, $timeout) = _parseValue($self->{config}, $value);
+    my $uri = $value;

    my $timestamp = time;
    my $sha256;
    my $storePath;

+    my $timeout = $self->{config}->{path_input_cache_validity_seconds} // 30;
+
    # Some simple caching: don't check a path more than once every N seconds.
    (my $cachedInput) = $self->{db}->resultset('CachedPathInputs')->search(
        {srcpath => $uri, lastseen => {">", $timestamp - $timeout}},
--- a/src/lib/Hydra/Plugin/RunCommand.pm
+++ b/src/lib/Hydra/Plugin/RunCommand.pm
@@ -85,7 +85,7 @@ sub isBuildEligibleForDynamicRunCommand {
 sub configSectionMatches {
    my ($name, $project, $jobset, $job) = @_;

-    my @elems = split /:/, $name;
+    my @elems = split ':', $name;

    die "invalid section name '$name'\n" if scalar(@elems) > 3;

--- a/src/lib/Hydra/Schema/Result/Builds.pm
+++ b/src/lib/Hydra/Schema/Result/Builds.pm
@@ -563,7 +563,7 @@ makeQueries('', "");
 makeQueries('ForProject', "and jobset_id in (select id from jobsets j where j.project = ?)");
 makeQueries('ForJobset', "and jobset_id = ?");
 makeQueries('ForJob', "and jobset_id = ? and job = ?");
-makeQueries('ForJobName', "and jobset_id = (select id from jobsets j where j.project = ? and j.name = ?) and job = ?");
+makeQueries('ForJobName', "and jobset_id = (select id from jobsets j where j.name = ?) and job = ?");

 sub as_json {
  my ($self) = @_;
--- a/src/lib/Hydra/Schema/Result/JobsetEvalInputs.pm
+++ b/src/lib/Hydra/Schema/Result/JobsetEvalInputs.pm
@@ -66,11 +66,6 @@ __PACKAGE__->table("jobsetevalinputs");
  data_type: 'text'
  is_nullable: 1

-=head2 shortRevLength
-
-  data_type: 'number'
-  is_nullable: 1
-
 =head2 value

  data_type: 'text'
@@ -107,8 +102,6 @@ __PACKAGE__->add_columns(
  { data_type => "text", is_nullable => 1 },
  "revision",
  { data_type => "text", is_nullable => 1 },
-  "shortRevLength",
-  { data_type => "integer", is_nullable => 1 },
  "value",
  { data_type => "text", is_nullable => 1 },
  "dependency",
@@ -190,28 +183,4 @@ sub json_hint {
    return \%hint;
 }

-# Revision to be rendered by the frontend
-sub frontend_revision() {
-    my ($self) = @_;
-    my $type = $self->get_column('type');
-    if ($type eq 'svn' or $type eq 'svn-checkout' or $type eq 'bzr' or $type eq 'bzr-checkout') {
-        return 'r' . $self->get_column('revision');
-    } elsif ($type eq 'git') {
-        # Find the longest revision length of this URI
-        my $schema = $self->result_source->schema;
-        my $maxLength = $schema
-            ->resultset('JobsetEvalInputs')
-            ->search({ uri => $self->get_column('uri')})
-            ->get_column('shortRevLength')
-            ->max;
-        # Fall back to a fixed value if there was no value
-        return substr($self->get_column('revision'), 0, $maxLength || 12);
-    } elsif ($type eq 'bzr') {
-        return substr($self->get_column('revision'), 0, 12);
-    } else {
-        return $self->get_column('revision');
-    }
-
-}
-
 1;
--- a/src/root/build.tt
+++ b/src/root/build.tt
@@ -568,7 +568,7 @@ END;
          running the following command:</p>

 <div class="card bg-light"><div class="card-body p-2"><code>
-<span class="shell-prompt"># </span>nix build '[% HTML.escape(eval.flake) %]#hydraJobs.[% HTML.escape(job) %]'
+<span class="shell-prompt"># </span>nix build [% HTML.escape(eval.flake) %]#hydraJobs.[% HTML.escape(job) %]
 </code></div></div>

        [% ELSE %]
--- a/src/root/common.tt
+++ b/src/root/common.tt
@@ -347,24 +347,13 @@ BLOCK renderDiffUri;
    url = res.0;
    branch = res.1;
    IF bi1.type == "hg" || bi1.type == "git" %]
-      [% IF url.substr(0, 19) == "https://github.com/";
-         github_url = url.replace('\.git$', '') %]
-        <a target="_blank" [% HTML.attributes(href =>
-          github_url
-          _ "/compare/"
-          _ bi1.revision
-          _ "..."
-          _ bi2.revision,
-        ) %]>[% HTML.escape(contents) %]</a>
-      [% ELSE %]
-        <a target="_blank" [% HTML.attributes(href => c.uri_for('/api/scmdiff', {
-          uri = url,
-          rev1 = bi1.revision,
-          rev2 = bi2.revision,
-          type = bi1.type,
-          branch = branch
-        })) %]>[% HTML.escape(contents) %]</a>
-      [% END %]
+      <a target="_blank" [% HTML.attributes(href => c.uri_for('/api/scmdiff', {
+        uri = url,
+        rev1 = bi1.revision,
+        rev2 = bi2.revision,
+        type = bi1.type,
+        branch = branch
+      })) %]>[% HTML.escape(contents) %]</a>
    [% ELSE;
      contents;
    END;
@@ -422,7 +411,7 @@ BLOCK renderInputDiff; %]
              [% ELSIF bi1.uri == bi2.uri && bi1.revision != bi2.revision %]
                [% IF bi1.type == "git" %]
                  <tr><td>
-                    <b>[% HTML.escape(bi1.name) %]</b></td><td><tt>[% INCLUDE renderDiffUri contents=(bi1.frontend_revision _ ' to ' _ bi2.frontend_revision) %]</tt>
+                    <b>[% HTML.escape(bi1.name) %]</b></td><td><tt>[% INCLUDE renderDiffUri contents=(bi1.revision.substr(0, 12) _ ' to ' _ bi2.revision.substr(0, 12)) %]</tt>
                  </td></tr>
                [% ELSE %]
                  <tr><td>
@@ -463,10 +452,16 @@ BLOCK renderPager %]


 BLOCK renderShortEvalInput;
-  IF input.type == "build" || input.type == "sysbuild" %]
+  IF input.type == "svn" || input.type == "svn-checkout" || input.type == "bzr" || input.type == "bzr-checkout" %]
+    r[% input.revision %]
+  [% ELSIF input.type == "git" %]
+    <tt>[% input.revision.substr(0, 7) | html %]</tt>
+  [% ELSIF input.type == "hg" %]
+    <tt>[% input.revision.substr(0, 12) | html %]</tt>
+  [% ELSIF input.type == "build" || input.type == "sysbuild" %]
    <a [% HTML.attributes(href => c.uri_for('/build' input.get_column('dependency'))) %]>[% HTML.escape(input.get_column('dependency')) %]</a>
  [% ELSE %]
-    <tt>[% input.frontend_revision | html %]</tt>
+    <tt>[% input.revision | html %]</tt>
  [% END;
 END;

--- a/src/root/job.tt
+++ b/src/root/job.tt
@@ -9,8 +9,8 @@
 [% INCLUDE includeFlot %]

 [% IF !jobExists(jobset, job) %]
-<div class="alert alert-warning">This job is not a member of the
-<a [% HTML.attributes(href => c.uri_for('/jobset' project.name jobset.name
+<div class="alert alert-warning">This job is not a member of the <a
+[% HTML.attributes(href => c.uri_for('/jobset' project.name jobset.name
 'evals')) %]>latest evaluation</a> of its jobset. This means it was
 removed or had an evaluation error.</div>
 [% END %]
--- a/src/root/reproduce.tt
+++ b/src/root/reproduce.tt
@@ -117,7 +117,7 @@ else
    revCount="$(cat "$tmpDir/[% input.name %]/rev-count")"
 fi

-args+=(--arg '[% input.name %]' "{ outPath = $inputDir; rev = \"[% input.revision %]\"; shortRev = \"[% input.frontend_revision %]\"; revCount = $revCount; }")
+args+=(--arg '[% input.name %]' "{ outPath = $inputDir; rev = \"[% input.revision %]\"; shortRev = \"[% input.revision.substr(0, 7) %]\"; revCount = $revCount; }")

 [%+ ELSIF input.type == "hg" %]

--- a/src/script/hydra-eval-jobset
+++ b/src/script/hydra-eval-jobset
@@ -160,7 +160,7 @@ sub fetchInputSystemBuild {
    $jobsetName ||= $jobset->name;

    my @latestBuilds = $db->resultset('LatestSucceededForJobName')
-        ->search({}, {bind => [$projectName, $jobsetName, $jobName]});
+        ->search({}, {bind => [$jobsetName, $jobName]});

    my @validBuilds = ();
    foreach my $build (@latestBuilds) {
@@ -358,21 +358,14 @@ sub evalJobs {
    my @cmd;

    if (defined $flakeRef) {
-        my $nix_expr =
-            "let " .
-            "flake = builtins.getFlake (toString \"$flakeRef\"); " .
-            "in " .
-            "flake.hydraJobs " .
-            "or flake.checks " .
-            "or (throw \"flake '$flakeRef' does not provide any Hydra jobs or checks\")";
-
        @cmd = ("nix-eval-jobs",
                # Disable the eval cache to prevent SQLite database contention.
                # Since Hydra typically evaluates each revision only once,
                # parallel workers would compete for database locks without
                # providing any benefit from caching.
                "--option", "eval-cache", "false",
-                "--expr", $nix_expr);
+                "--flake", $flakeRef,
+                "--select", "flake: flake.outputs.hydraJobs or flake.outputs.checks or (throw \"flake '$flakeRef' does not provide any Hydra jobs or checks\")");
    } else {
        my $nixExprInput = $inputInfo->{$nixExprInputName}->[0]
            or die "cannot find the input containing the job expression\n";
@@ -891,7 +884,6 @@ sub checkJobsetWrapped {
                        , type => $input->{type}
                        , uri => $input->{uri}
                        , revision => $input->{revision}
-                        , shortRevLength => length($input->{shortRev})
                        , value => $input->{value}
                        , dependency => $input->{id}
                        , path => $input->{storePath} || "" # !!! temporary hack
--- a/src/sql/hydra.sql
+++ b/src/sql/hydra.sql
@@ -487,12 +487,11 @@ create table JobsetEvalInputs (
    altNr         integer not null,

    -- Copied from the jobsetinputs from which the build was created.
-    type           text not null,
-    uri            text,
-    revision       text,
-    shortRevLength smallint, -- length of a short revision at the time this was checked out
-    value          text,
-    dependency     integer, -- build ID of the input, for type == 'build'
+    type          text not null,
+    uri           text,
+    revision      text,
+    value         text,
+    dependency    integer, -- build ID of the input, for type == 'build'

    path          text,

--- a/src/sql/meson.build
+++ b/src/sql/meson.build
@@ -1,7 +1,90 @@
-# Install all SQL files in this directory.
-# This includes hydra.sql, test.sql, update-dbix.pl, and all upgrade-*.sql files.
-install_subdir('.',
-  install_dir: hydra_libexecdir / 'sql',
-  strip_directory: true,
-  exclude_files: ['meson.build', 'update-dbix-harness.sh'],
+sql_files = files(
+  'hydra.sql',
+  'test.sql',
+  'update-dbix.pl',
+  'upgrade-2.sql',
+  'upgrade-3.sql',
+  'upgrade-4.sql',
+  'upgrade-5.sql',
+  'upgrade-6.sql',
+  'upgrade-7.sql',
+  'upgrade-8.sql',
+  'upgrade-9.sql',
+  'upgrade-10.sql',
+  'upgrade-11.sql',
+  'upgrade-12.sql',
+  'upgrade-13.sql',
+  'upgrade-14.sql',
+  'upgrade-15.sql',
+  'upgrade-16.sql',
+  'upgrade-17.sql',
+  'upgrade-18.sql',
+  'upgrade-19.sql',
+  'upgrade-20.sql',
+  'upgrade-21.sql',
+  'upgrade-22.sql',
+  'upgrade-23.sql',
+  'upgrade-24.sql',
+  'upgrade-25.sql',
+  'upgrade-26.sql',
+  'upgrade-27.sql',
+  'upgrade-28.sql',
+  'upgrade-29.sql',
+  'upgrade-30.sql',
+  'upgrade-31.sql',
+  'upgrade-32.sql',
+  'upgrade-33.sql',
+  'upgrade-34.sql',
+  'upgrade-35.sql',
+  'upgrade-36.sql',
+  'upgrade-37.sql',
+  'upgrade-38.sql',
+  'upgrade-39.sql',
+  'upgrade-40.sql',
+  'upgrade-41.sql',
+  'upgrade-42.sql',
+  'upgrade-43.sql',
+  'upgrade-44.sql',
+  'upgrade-45.sql',
+  'upgrade-46.sql',
+  'upgrade-47.sql',
+  'upgrade-48.sql',
+  'upgrade-49.sql',
+  'upgrade-50.sql',
+  'upgrade-51.sql',
+  'upgrade-52.sql',
+  'upgrade-53.sql',
+  'upgrade-54.sql',
+  'upgrade-55.sql',
+  'upgrade-56.sql',
+  'upgrade-57.sql',
+  'upgrade-58.sql',
+  'upgrade-59.sql',
+  'upgrade-60.sql',
+  'upgrade-61.sql',
+  'upgrade-62.sql',
+  'upgrade-63.sql',
+  'upgrade-64.sql',
+  'upgrade-65.sql',
+  'upgrade-66.sql',
+  'upgrade-67.sql',
+  'upgrade-68.sql',
+  'upgrade-69.sql',
+  'upgrade-70.sql',
+  'upgrade-71.sql',
+  'upgrade-72.sql',
+  'upgrade-73.sql',
+  'upgrade-74.sql',
+  'upgrade-75.sql',
+  'upgrade-76.sql',
+  'upgrade-77.sql',
+  'upgrade-78.sql',
+  'upgrade-79.sql',
+  'upgrade-80.sql',
+  'upgrade-81.sql',
+  'upgrade-82.sql',
+  'upgrade-83.sql',
+  'upgrade-84.sql',
 )
+
+install_data(sql_files, install_dir: hydra_libexecdir / 'sql')
--- a/src/sql/upgrade-85.sql
+++ b/src/sql/upgrade-85.sql
@@ -1 +0,0 @@
-ALTER TABLE JobsetEvalInputs ADD COLUMN shortRevLength smallint;
--- a/t/jobs/basic.nix
+++ b/t/jobs/basic.nix
@@ -1,4 +1,6 @@
-with import ./config.nix;
+{ system ? builtins.currentSystem }:
+
+with import ./config.nix { inherit system; };
 {
  empty_dir =
    mkDerivation {
--- a/t/jobs/config.nix.in
+++ b/t/jobs/config.nix.in
@@ -1,9 +1,11 @@
+{ system ? builtins.currentSystem }:
+
 rec {
  path = "@testPath@";

  mkDerivation = args:
    derivation ({
-      system = builtins.currentSystem;
+      inherit system;
      PATH = path;
    } // args);
  mkContentAddressedDerivation = args: mkDerivation ({
--- a/t/jobs/flake-checks/flake.nix
+++ b/t/jobs/flake-checks/flake.nix
@@ -1,6 +1,11 @@
 {
-  outputs = { ... }: {
-    checks =
-      import ./basic.nix;
-  };
+  outputs = { self, ... }:
+    let
+      systems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
+      forAllSystems = f: builtins.listToAttrs (map (system: { name = system; value = f system; }) systems);
+    in {
+      checks = forAllSystems (system:
+        import ./basic.nix { inherit system; }
+      );
+    };
 }
--- a/t/jobs/flake-hydraJobs/flake.nix
+++ b/t/jobs/flake-hydraJobs/flake.nix
@@ -1,6 +1,11 @@
 {
-  outputs = { ... }: {
-    hydraJobs =
-      import ./basic.nix;
-  };
+  outputs = { self, ... }:
+    let
+      systems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
+      forAllSystems = f: builtins.listToAttrs (map (system: { name = system; value = f system; }) systems);
+    in {
+      hydraJobs = forAllSystems (system:
+        import ./basic.nix { inherit system; }
+      );
+    };
 }
--- a/t/queue-runner/notifications.t
+++ b/t/queue-runner/notifications.t
@@ -109,7 +109,7 @@ subtest "Build: not substitutable, unsubstitutable" => sub {
    subtest "Second notification: step_finished" => sub {
        my ($channelName, $pid, $payload) = @{$dbh->func("pg_notifies")};
        is($channelName, "step_finished", "The event is for the step finishing");
-        my ($buildId, $stepNr, $logFile) = split /\t/, $payload;
+        my ($buildId, $stepNr, $logFile) = split "\t", $payload;
        is($buildId, $build->id, "The payload is the build's ID");
        is($stepNr, 1, "The payload is the build's step number");
        isnt($logFile, undef, "The log file is passed");
Author	SHA1	Message	Date
Jörg Thalheim	b254962aa8	make flake.nix test pure	2025-11-11 15:39:23 +01:00
Jörg Thalheim	281b49208c	hydra-eval-jobs: use nix-eval-jobs's --select rather --expr the current use of builtins.getFlake, mean we don't have pure evaluation	2025-11-11 15:12:42 +01:00
				`@@ -1 +0,0 @@`
				`ALTER TABLE JobsetEvalInputs ADD COLUMN shortRevLength smallint;`