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

postfix/dovecot/nginx/bird: fix cross build #51848

Merged
merged 9 commits into from
Dec 11, 2018
Merged

postfix/dovecot/nginx/bird: fix cross build #51848

merged 9 commits into from
Dec 11, 2018

Conversation

Mic92
Copy link
Member

@Mic92 Mic92 commented Dec 10, 2018 •
edited
Loading

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Mic92 Mic92 changed the title Cross postfix postfix: fix cross build Dec 10, 2018
@Mic92 Mic92 added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Dec 10, 2018
@Mic92 Mic92 changed the title postfix: fix cross build postfix/dovecot: fix cross build Dec 10, 2018
Ericson2314
Ericson2314 reviewed Dec 10, 2018
View reviewed changes
Copy link
Member

@Ericson2314 Ericson2314 left a comment

Choose a reason for hiding this comment

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

Nice work! Just one little thing.

pkgs/servers/mail/dovecot/default.nix Outdated
"i_cv_c99_vsnprintf=yes"
"lib_cv_va_copy=yes"
"i_cv_mmap_plays_with_write=yes"
"i_cv_gmtime_max_time_t=${if stdenv.is64bit then "64" else "32"}"
Copy link
Member

Choose a reason for hiding this comment

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

toString stdenv.hostPlatform.parsed.cpu.bits I think works for this? (Written off the top of my head, might have a typo.)

Ericson2314
Ericson2314 approved these changes Dec 11, 2018
View reviewed changes
Copy link
Member

@Ericson2314 Ericson2314 left a comment

Choose a reason for hiding this comment

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

Great!

@Ericson2314
Copy link
Member

Looks like staging is broken for unrelated reasons?

@Mic92
Copy link
Member Author

Mic92 commented Dec 11, 2018 •
edited
Loading

no that was actually legit.

@Mic92 Mic92 changed the title postfix/dovecot: fix cross build postfix/dovecot/nginx: fix cross build Dec 11, 2018
@Mic92 Mic92 force-pushed the cross-postfix branch 2 times, most recently from 07b59e5 to 40bd2d4 Compare December 11, 2018 11:01
@Mic92 Mic92 changed the title postfix/dovecot/nginx: fix cross build postfix/dovecot/nginx/bird: fix cross build Dec 11, 2018
@globin globin merged commit 7bb24a6 into NixOS:staging Dec 11, 2018
@Mic92 Mic92 deleted the cross-postfix branch December 11, 2018 17:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fpletz fpletz fpletz left review comments

@Ericson2314 Ericson2314 Ericson2314 approved these changes

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

Successfully merging this pull request may close these issues.
5 participants
@Mic92 @Ericson2314 @fpletz @globin @GrahamcOfBorg