buildbot: assorted cleanups #23642
buildbot: assorted cleanups #23642
Conversation
| let | ||
| withPlugins = plugins: runCommand "wrapped-${package.name}" { buildInputs = [ makeWrapper ]; } '' | ||
| makeWrapper ${package}/bin/buildbot $out/bin/buildbot \ | ||
| --set PYTHONPATH ${lib.makeSearchPathOutput "lib" pythonPackages.python.sitePackages plugins} |
There was a problem hiding this comment.
@FRidh turns out this actually works 😄 when I tested it (which led to me opening that other issue) I accidentally passed in the wrong set of packages so was testing the wrong thing!
There was a problem hiding this comment.
Yep. Earlier there was a PR to change --prefix PYTHONPATH to --set PYTHONPATH. I didn't want that because PYTHONPATH is still a Python feature. That's the reason we now patch scripts. Now you break that feature ;-)
There was a problem hiding this comment.
Err, just realized these don't stack nicely. Going to push a fix now.
There was a problem hiding this comment.
@FRidh should I use --prefix then? I mostly don't expect external callers to supply reasonable nix-compatible values here, but no harm in letting them shoot themselves I guess.
copumpkin
force-pushed
the
buildbot-cleanup
branch
2 times, most recently
from
7a14f11
to
49b20e5
Compare
|
@FRidh pushed fix to use |
Some changes to be more idiomatic and use stdenv building blocks more. I also added a `buildbot.withPlugins` instead of the current plugins mechanism, which forces an unnecessary rebuild of the package and reruns all the tests. This should be equivalent and more pleasant to use in practice.
|
Thanks for the review! |
Some changes to be more idiomatic and use stdenv building blocks more. I also added a
buildbot.withPluginsinstead of the current plugins mechanism, which forces an unnecessary rebuild of the package and reruns all the tests. This should be equivalent and more pleasant to use in practice.cc @FRidh @nand0p
Motivation for this change
I mostly got frustrated with waiting for buildbot tests to rerun every time I changed a dependency. When poking around I saw a few un-idiomatic things in the expression so I changed those too.
Things done
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"./result/bin/)