[staging] treewide: cmake buildInputs to nativeBuildInputs, minor cleanups #108022
Conversation
siraben
force-pushed
the
cmake-native-build-inputs
branch
from
dc8364f
to
3139ea1
Compare
siraben
force-pushed
the
cmake-native-build-inputs
branch
3 times, most recently
from
b7081cf
to
1ddb6fb
Compare
|
Can you also add a |
siraben
force-pushed
the
cmake-native-build-inputs
branch
from
1ddb6fb
to
1da3b21
Compare
siraben
changed the title
|
Does anyone know of situations where you do want Pending packages that trip up the regex: ag -l "buildInputs.*cmake" -f pkgs |
There exists maybe one but I am not aware of any right now and if a package really needs cmake in buildInputs we should comment that. Also in the past similar things where made with pkg-config and autoReconfHook. Having cmake and other buildTools in nativeBuildInputs is really important for cross compiling and matters there the most. But changing all the other cmake into nativeBuildInputs could be a part two PR to get this PR merged in the next days. |
siraben
force-pushed
the
cmake-native-build-inputs
branch
4 times, most recently
from
cbbabd7
to
99de0d3
Compare
|
@Ericson2314 do you still have that |
|
Bumped trackballs from 1.3.1 to 1.3.2, game builds and runs. |
|
I can target staging instead if the rebuilds are too much. |
|
master is fine for now |
|
I've noticed that in several cases cmake being in buildInputs can be indicative of a misunderstanding of the two buildInputs, since other packages like automake, gnumake, texinfo end up in the buildInputs as well. |
|
When making these changes its good for your sanity to also set |
|
I do not have enough computing resources to do a proper |
siraben
force-pushed
the
cmake-native-build-inputs
branch
2 times, most recently
from
a7eec40
to
5fd50b1
Compare
ofborg
bot
added
10.rebuild-linux: 1001-2500
and removed
10.rebuild-darwin: 11-100
10.rebuild-linux: 101-500
labels
|
this is also getting to the point that we should move this to staging: |
|
Ok, I will rebase on staging. Which of the staging branches should I rebase on? |
siraben
force-pushed
the
cmake-native-build-inputs
branch
from
792c743
to
ea8cbb9
Compare
|
I think this is enough changes for now, so we can see what regressions were introduced and remediate them. Thanks all for the feedback so far. |
|
|
/rebase-staging |
siraben
force-pushed
the
cmake-native-build-inputs
branch
3 times, most recently
from
343bb73
to
47ad347
Compare
|
Hah, didn't know it was going to be done automatically, I just did it and force-pushed. |
digs through fish history begin
git ls-files | xargs sed -i -E \
-e 's%( *buildInputs.*=.*\[.*)autoreconfHook%\1FOO_FOO_FOO%g' \
-e 's%( *buildInputs.*=.*\[.*)pkgconfig%\1BAR_BAR_BAR%g'
git ls-files | xargs sed -i -E \
-e '/FOO_FOO_FOO.*BAR_BAR_BAR/i \ nativeBuildInputs = [ autoreconfHook pkgconfig ];' \
-e '/BAR_BAR_BAR.*FOO_FOO_FOO/i \ nativeBuildInputs = [ autoreconfHook pkgconfig ];'
git ls-files | xargs sed -i -E -e 's% *FOO_FOO_FOO(.*) +BAR_BAR_BAR%\1%g' -e 's% *BAR_BAR_BAR(.*) +FOO_FOO_FOO%\1%g'
git ls-files | xargs sed -i -E \
-e '/FOO_FOO_FOO/i \ nativeBuildInputs = [ autoreconfHook ];' \
-e '/BAR_BAR_BAR/i \ nativeBuildInputs = [ pkgconfig ];'
git ls-files | xargs sed -i -E -e 's% *FOO_FOO_FOO%%g' -e 's% *BAR_BAR_BAR%%g'
endBut this is an abomination and someone should use hnix to write something better :). |
|
Thanks for doing this grunt work, @siraben! |
It was recently implemented, and I forgot about it when I made my first comment |
jonringer
changed the title
siraben
force-pushed
the
cmake-native-build-inputs
branch
from
47ad347
to
6070629
Compare
siraben
force-pushed
the
cmake-native-build-inputs
branch
from
6070629
to
fcbc6c8
Compare
|
@FRidh does staging have different merge requirements? Will the regressions be fixed later? |
|
@siraben I wanted to get this in to avoid merge conflicts. Regressions still need to be fixed though, preferably as soon as possible, but I would expect them to be few compared to the amount of changes made here already. Maybe I am wrong and I should not have merged this yet! |
Motivation for this change
It is very likely that
cmakeshould be innativeBuildInputsrather thanbuildInputs, which would matter when cross-compiling,cmakeshould be built on the build platform but not the host.Additionally I am performing minor changes to the expressions that should not change the outcome, for instance
pkgconfig->pkg-configfetchFromGit->fetchFromGitHubgpl(2|3)->gpl(2|3)(Only|Plus)enableParallelBuilding = true(already defaults to true when using cmake)Edit: after seeing the affected packages approach 1000+ I have made much more conservative changes, future PRs should be done to check if packages like
flex,bison,doxygenetc. are placed in the correct inputs list.Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)