Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Various cross improvements #142415

Merged
merged 4 commits into from
Oct 26, 2021
Merged

Various cross improvements #142415

merged 4 commits into from
Oct 26, 2021

Conversation

Artturin
Copy link
Member

@Artturin Artturin commented Oct 20, 2021 •
edited
Loading

Motivation for this change
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@Artturin Artturin mentioned this pull request Oct 20, 2021
Merged
12 tasks
@ofborg ofborg bot requested a review from SuperSandro2000 October 20, 2021 22:15
@Artturin Artturin changed the title Various python package improvements Various python and cross improvements Oct 20, 2021
@Artturin
Copy link
Member Author

include it in your pr, i'll change the target branch to staging and rebase this onto your pr so that we can keep better track of whats working and whats not

@Artturin Artturin changed the base branch from master to staging October 20, 2021 23:58
@legendofmiracles
Copy link
Contributor

Sorry for deleting my comment a second before you replied, I just figured out what you were trying to do...

Are the tinycss and libotf changes related to my work? I'm not seeing the link between them 😅

@legendofmiracles
Copy link
Contributor

Oh also, maybe i'm not understanding git correctly, but if your PR depends on mine
And mine depends on yours to get cairo* to work, how is that supposed to work?

@Artturin Artturin force-pushed the crossfixes1 branch 2 times, most recently from 4114ef4 to 56bcaf4 Compare October 21, 2021 00:08
@Artturin
Copy link
Member Author

Artturin commented Oct 21, 2021 •
edited
Loading

uhhh well(had to use reflog to reset 😅), just apply this pr as a patch to your PR and when i do changes i'll send a git diff patch to the comments so you can apply it

git apply - <<< $(curl https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/142415.patch)

@Artturin
Copy link
Member Author

Sorry for deleting my comment a second before you replied, I just figured out what you were trying to do...

Are the tinycss and libotf changes related to my work? I'm not seeing the link between them sweat_smile

not related to yours but they're related to cross-compiling. we can keep them separate and apply the cairo fixes to your pr

@legendofmiracles
Copy link
Contributor

git apply - <<< $(curl https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/142415.patch)

Done, both build fine after my final touches. But it seems the other two, at first glance unrelated, patches are also needed, how am i supposed to commit them one?

If I were to commit them as well, wouldn't that result in doubled commits?

@Artturin
Copy link
Member Author

no worries, just commit them and i'll remove them from here

@legendofmiracles
Copy link
Contributor

Commited everything but the libotf patch

@Artturin
Copy link
Member Author

Result of nixpkgs-review pr 142415 run on x86_64-linux 1

2 packages marked as broken and skipped:
  • cedille
  • octavePackages.vrml
1 package failed to build:
  • gcl_2_6_13_pre
45 packages built:
  • aerc
  • afew
  • agda
  • alot
  • astroid
  • auctex
  • cask
  • cflow
  • cscope
  • emacs
  • fcitx-engines.m17n
  • fcitx5-m17n
  • framac
  • gcl
  • lieer (gmailieer)
  • i3status-rust
  • ibus-engines.m17n
  • ibus-engines.typing-booster
  • ibus-engines.typing-booster-unwrapped
  • idutils
  • libotf
  • m17n_db
  • m17n_lib
  • meli
  • mlterm
  • mozart (mozart-binary ,mozart2-binary)
  • mu
  • muchsync
  • neomutt
  • notmuch
  • notmuch-addrlookup
  • octavePackages.miscellaneous
  • pycflow2dot
  • pydb
  • python38Packages.alot
  • python38Packages.notmuch
  • python38Packages.notmuch2
  • python38Packages.pycflow2dot
  • python39Packages.notmuch
  • python39Packages.notmuch2
  • python39Packages.pycflow2dot
  • rtags
  • supercollider_scel
  • uim
  • why3

@Artturin Artturin marked this pull request as ready for review October 25, 2021 16:50
@legendofmiracles
Copy link
Contributor

Does your nixpkgs-review also cross compile?

@Artturin
Copy link
Member Author

Does your nixpkgs-review also cross compile?

No

@Artturin
Copy link
Member Author

@ofborg eval

SuperSandro2000
SuperSandro2000 reviewed Oct 26, 2021
View reviewed changes
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please set strictDeps for all if possible.

@Artturin
libotf: fix cross-compilation by applying a patch from debian
be3d12d 
patch makes it so that pkg-config is used to find the avaibility of the
freetype library instead of the freetype-config binary
@Artturin
m17n-db: fix cross-compilation
c5ef7d7 
enable strictDeps
had to add gawk and bash as there are some scripts with the sh shebang and
gawk shebang
@Artturin
m17n-lib: fix cross-compilation
a354a24 
without reconf the build fails with

./configure: line 21532: syntax error near unexpected token `ANTHY,'
./configure: line 21532: `PKG_CHECK_MODULES(ANTHY, anthy, HAVE_ANTHY=yes, HAVE_ANTHY=no)'
@SuperSandro2000
Copy link
Member

This is a semi-automatic executed nixpkgs-review with nixpkgs-review-checks extension. It is checked by a human on a best effort basis and does not build all packages (e.g. lumo, tensorflow or pytorch).

Result of nixpkgs-review pr 142415 run on x86_64-linux 1

2 packages marked as broken and skipped:
  • cedille
  • octavePackages.vrml
1 package failed to build and already failed to build on hydra master:
  • gcl_2_6_13_pre: log was empty
45 packages built:
  • aerc
  • afew
  • agda
  • alot
  • astroid
  • auctex
  • cask
  • cflow
  • cscope
  • emacs
  • fcitx-engines.m17n
  • fcitx5-m17n
  • framac
  • gcl
  • i3status-rust
  • ibus-engines.m17n
  • ibus-engines.typing-booster
  • ibus-engines.typing-booster-unwrapped
  • idutils
  • libotf
  • lieer
  • m17n_db
  • m17n_lib
  • meli
  • mlterm
  • mozart2-binary
  • mu
  • muchsync
  • neomutt
  • notmuch
  • notmuch-addrlookup
  • octavePackages.miscellaneous
  • pycflow2dot
  • pydb
  • python38Packages.alot
  • python38Packages.notmuch
  • python38Packages.notmuch2
  • python38Packages.pycflow2dot
  • python39Packages.notmuch
  • python39Packages.notmuch2
  • python39Packages.pycflow2dot
  • rtags
  • supercollider_scel
  • uim
  • why3

@SuperSandro2000 SuperSandro2000 merged commit 2558d8e into NixOS:master Oct 26, 2021
@Artturin Artturin deleted the crossfixes1 branch November 5, 2021 18:04
@gebner gebner mentioned this pull request Dec 3, 2021
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@Mindavi Mindavi Mindavi approved these changes

@symphorien symphorien symphorien approved these changes

@legendofmiracles legendofmiracles Awaiting requested review from legendofmiracles

@bendlas bendlas Awaiting requested review from bendlas

@astsmtl astsmtl Awaiting requested review from astsmtl

@amaxine amaxine Awaiting requested review from amaxine

@hedning hedning Awaiting requested review from hedning

@jtojnar jtojnar Awaiting requested review from jtojnar

@dasj19 dasj19 Awaiting requested review from dasj19

Assignees
No one assigned
Labels
6.topic: cross-compilation Building packages on a different platform than they will be used on 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Artturin @legendofmiracles @SuperSandro2000 @jtojnar @Mindavi @symphorien