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.

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

Staging next #66381

Merged
merged 176 commits into from Aug 18, 2019
Merged

Staging next #66381

merged 176 commits into from Aug 18, 2019

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented Aug 9, 2019

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 nix-review --run "nix-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

bhipple and others added 30 commits May 24, 2019 17:29
@bhipple
libtool2: enable parallel builds
62a8927
@dtzWill
gnutls: 3.6.8 -> 3.6.9
e309ddb 
https://gitlab.com/gnutls/gnutls/blob/gnutls_3_6_9/NEWS
@FRidh
way-cooler: fix eval
802f51b
@vcunat
Merge #65406: gnutls: 3.6.8 -> 3.6.9 (into staging)
507dfa0
@arcnmx @Mic92
cargo: remove darwin hack
b53e237 
This seems to have recently resolved itself with updates
and is no longer necessary.
@AtkinsChang @Mic92
buildRustPackage: Avoid altering .cargo/config in source
626ccd7
@AtkinsChang @Mic92
buildRustPackage: Remove unneeded cat
fb961d1
@jtojnar
libuchardet: remove unneeded CMake flags
652e858 
Not necessary since #52856
@primeos
scons: 3.0.5 -> 3.1.0
51dc2cd 
Announcement:
https://scons.org/scons-310-is-available.html

Changelog:
https://raw.githubusercontent.com/SConsProject/scons/rel_3.1.0/src/CHANGES.txt
@primeos
Merge pull request #65392 from primeos/scons
511c57a 
scons: 3.0.5 -> 3.1.0
@jtojnar
libjpeg_turbo: remove unneeded CMake flags
0568b62 
Not necessary since #52856
@jtojnar
openimageio2: remove unneeded CMake flags
2e11dca 
Not necessary since #52856
@jtojnar
openimageio: remove unneeded CMake flags
6928f1e 
Not necessary since #52856
@jtojnar
shaderc: remove unneeded CMake flags
9aa10f0 
Not necessary since #52856

Parallel building is enabled by default with CMake.
@samueldr
qt56: Enforce strict compatible version paths
ed50ec8
@samueldr
qt59: Enforce strict compatible version paths
fb96e45
@samueldr
qt511: Enforce strict compatible version paths
4d0bff9
@samueldr
qt512: Enforce strict compatible version paths
6cb99e7
[cpan2nix] perlPackages.Catmandu: init at 1.2002
8e9ec74 
dependencies:
perlPackages.AnyURIEscape: init at 0.01
perlPackages.ConfigOnion: init at 1.007
perlPackages.DataUtil: init at 0.66
perlPackages.DispatchClass: init at 0.02
perlPackages.LogAnyAdapterLog4perl: init at 0.09
perlPackages.MooXAliases: init at 0.001006
perlPackages.ParserMGC: init at 0.16
perlPackages.PathIteratorRule: init at 1.014
perlPackages.TestFilename: init at 0.03
perlPackages.TestLWPUserAgent: init at 0.033
perlPackages.TextHogan: init at 2.02
perlPackages.TryTinyByClass: init at 0.01
perlPackages.URITemplate: init at 0.24
perlPackages.vidir: 0.040 -> 0.042
cbba47e
[cpan2nix] perlPackages.CatalystPluginSmartURI: init at 0.041
ad898b7 
dependencies:
perlPackages.TimeOut: init at 0.11
perlPackages.URISmartURI: init at 0.032
[cpan2nix] perlPackages.XMLSAX: 1.00 -> 1.02
86ba870
[cpan2nix] perlPackages.ApacheTest: 1.40 -> 1.41
7a49463
[cpan2nix] perlPackages.CPANPerlReleases: 3.94 -> 4.08
48fce19
[cpan2nix] perlPackages.CanaryStability: 2012 -> 2013
3079c8f
[cpan2nix] perlPackages.CatalystManual: 5.9000 -> 5.9010
464e6d5
[cpan2nix] perlPackages.ClassEHierarchy: 2.00 -> 2.01
6e988d4
[cpan2nix] perlPackages.CpanelJSONXS: 4.11 -> 4.12
4f74265
[cpan2nix] perlPackages.CryptRijndael: cleanup
5778ee5
[cpan2nix] perlPackages.CryptX: 0.063 -> 0.064
1727d8f
@vcunat
Copy link
Member

vcunat commented Aug 10, 2019

@NixOS/darwin-maintainers: there's been a mass failure for about a week (I think) – swift-corefoundation doesn't build (repeatedly), can some of you have a look?

@LnL7
Copy link
Member

LnL7 commented Aug 13, 2019

Unfortunately I can't seem to reproduce that locally. (both on 10.12 and 10.14)

[175/180] CompileC: String.subproj/CFRegularExpression.c
[176/180] CompileC: String.subproj/CFRunArray.c
[177/180] CompileC: URL.subproj/CFURL.c
[178/180] CompileC: String.subproj/CFString.c
[179/180] CompileC: Base.subproj/CFKnownLocations.c
[180/180] Link: Build/CoreFoundation/libCoreFoundation.dylib
ld: warning: directory not found for option '-L../bootstrap/x86_64-apple-darwin/usr/lib'
ld: warning: undefined base symbol '__TMC15SwiftFoundation19_NSCFConstantString' for alias '___CFConstantStringClassReference'
installing
post-installation fixup
strip is /nix/store/68cs638458sifx94qila1xwpbmw88yrq-cctools-binutils-darwin/bin/strip
patching script interpreter paths in /nix/store/0y4lhd3n4dq1v4771p703jcxrbwcg4i1-swift-corefoundation
warning: rewriting hashes in '/nix/store/lpgv4agfpz7p08pnvp63n20k7ffhhznq-swift-corefoundation'; cross fingers
/nix/store/lpgv4agfpz7p08pnvp63n20k7ffhhznq-swift-corefoundation

@grahamc
Copy link
Member

grahamc commented Aug 13, 2019

I just managed to run the build on 10.13.6 which is what hydra runs.

@vcunat
Copy link
Member

vcunat commented Aug 14, 2019

And it succeeded?

Running pass 'Interprocedural Sparse Conditional Constant Propagation' on module 'Base.subproj/CFRuntime.c'.

Perhaps it's possible to work around it by tweaking optimization parameters for this package/file.

@FRidh
Copy link
Member Author

FRidh commented Aug 17, 2019

@NixOS/darwin-maintainers are there any ideas how to proceed?

@FRidh FRidh merged commit 295888c into master Aug 18, 2019
@FRidh FRidh mentioned this pull request Aug 18, 2019
Closed
@FRidh
Copy link
Member Author

FRidh commented Aug 18, 2019

opened a separate issue for darwin issue #66811

@grahamc
Copy link
Member

grahamc commented Aug 18, 2019

We were able to reproduce it when running it in a loop... but only sometimes. Ugh.

@ivan ivan mentioned this pull request Aug 25, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LnL7 LnL7 Awaiting requested review from LnL7

@Mic92 Mic92 Awaiting requested review from Mic92 Mic92 is a code owner

@ttuegel ttuegel Awaiting requested review from ttuegel ttuegel is a code owner

Assignees
No one assigned
Labels
6.topic: nixos 6.topic: python 6.topic: qt/kde 6.topic: rust 8.has: module (update) 8.has: package (new) 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ 10.rebuild-linux-stdenv
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet