From a24803b26f8d86f8ac5f0475731fe435fa63a04c Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 31 Aug 2025 11:18:08 +0200 Subject: [PATCH] ci/eval: remove ofborg references By now, these files have been changed enough to not need the "vendored from" notes anymore. These links would still be there when going through the history of the file, but today GHA CI has not many similarities anymore to what ofborg did, so these are not really helpful. (cherry picked from commit 2aae1425298dc478f02c9f05c01762b656975fd2) --- ci/eval/attrpaths.nix | 15 ++++----------- ci/eval/compare/default.nix | 1 - ci/eval/compare/maintainers.nix | 1 - ci/eval/outpaths.nix | 2 -- 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/ci/eval/attrpaths.nix b/ci/eval/attrpaths.nix index 0c571c7be4be..c4e9db24b20e 100644 --- a/ci/eval/attrpaths.nix +++ b/ci/eval/attrpaths.nix @@ -2,19 +2,12 @@ # *superset* of all attrpaths of derivations which might be # part of a release on *any* platform. # -# Both this expression and what ofborg uses (outpaths.nix) -# are essentially single-threaded (under the current cppnix -# implementation). -# -# This expression runs much, much, much faster and uses much, much -# less memory than the ofborg script by skipping the -# platform-relevance checks. The ofborg outpaths.nix script takes -# half an hour on a 3ghz core and peaks at 60gbytes of memory; this -# expression runs on the same machine in 44 seconds with peak memory -# usage of 5gbytes. +# This expression runs single-threaded under all current Nix +# implementations, but much faster and with much less memory +# used than ./outpaths.nix itself. # # Once you have the list of attrnames you can split it up into -# $NUM_CORES batches and run the platform checks separately for each +# $NUM_CORES batches and evaluate the outpaths separately for each # batch, in parallel. # # To dump the attrnames: diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix index cfd9b78510d0..f5c1b1b1dab0 100644 --- a/ci/eval/compare/default.nix +++ b/ci/eval/compare/default.nix @@ -105,7 +105,6 @@ let ) rebuildsByKernel # Set the "11.by: package-maintainer" label to whether all packages directly # changed are maintained by the PR's author. - # (https://github.com/NixOS/ofborg/blob/df400f44502d4a4a80fa283d33f2e55a4e43ee90/ofborg/src/tagger.rs#L83-L88) // { "11.by: package-maintainer" = maintainers ? ${githubAuthorId} diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix index 488eb0ea9201..d0c5057a0499 100644 --- a/ci/eval/compare/maintainers.nix +++ b/ci/eval/compare/maintainers.nix @@ -1,7 +1,6 @@ { lib, }: -# Almost directly vendored from https://github.com/NixOS/ofborg/blob/5a4e743f192fb151915fcbe8789922fa401ecf48/ofborg/src/maintainers.nix { changedattrs, changedpathsjson, diff --git a/ci/eval/outpaths.nix b/ci/eval/outpaths.nix index 9e67da1fe73a..a8485af326fc 100644 --- a/ci/eval/outpaths.nix +++ b/ci/eval/outpaths.nix @@ -2,8 +2,6 @@ # When using as a callable script, passing `--argstr path some/path` overrides $PWD. #!nix-shell -p nix -i "nix-env -qaP --no-name --out-path --arg checkMeta true -f ci/eval/outpaths.nix" -# Vendored from: -# https://raw.githubusercontent.com/NixOS/ofborg/74f38efa7ef6f0e8e71ec3bfc675ae4fb57d7491/ofborg/src/outpaths.nix { checkMeta, includeBroken ? true, # set this to false to exclude meta.broken packages from the output