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

Staging next #64236

Merged
merged 83 commits into from Jul 10, 2019
Merged

Staging next #64236

merged 83 commits into from Jul 10, 2019

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented Jul 3, 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.

layus and others added 30 commits June 14, 2019 14:38
The Linux kernel includes libelf headers with -Wundef and -Werror enabled, resulting in an error when the headers are found through -I as opposed to -isystem.

Fixes #59929
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/glib-networking/versions
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gpgme/versions
meson: 0.49.1 → 0.50.1
Using "builtins.currentSystem" doesn't work in pure evaluation mode,
and even when it's explicitly set (which it always is, in
nixos/lib/eval-config.nix), it breaks manual generation because the
manual tries to render the default value.
The vulnerability seems quite serious.
It isn't practical to use fetchpatch here due to bootstrapping,
so I just committed the small patch file.
They have no users in nixpkgs.
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libshout/versions
postgresql: 9.4.22 -> 9.4.23, 9.5.17 -> 9.5.18, 9.6.13 -> 9.6.14, 10.8 -> 10.9, 11.3 -> 11.4
libelf: Add patch to prevent -Wundef warnings.
This reverts commit 58cbb1b.

78054a5 is more elaborated upgrade.
bc109b1 on master created a separate
expression based on wxGTK30, but that expression was modified on staging
in f0733a0. Let's sync that.
We disabled them by default when they were introduced in

#42994

but enabling them probably makes more sense:

#54398
#63491
This should allow us to inherit optimization/striping from stdenv
@FRidh
Copy link
Member Author

FRidh commented Jul 3, 2019

Automake fails

stripping (with command strip and flags -S) in /nix/store/67rfgwqzas6lrsymv0vinacbkmv57xzv-automake-1.15/bin 
checking for references to /build/ in /nix/store/67rfgwqzas6lrsymv0vinacbkmv57xzv-automake-1.15...
invalid ownership on file '/nix/store/67rfgwqzas6lrsymv0vinacbkmv57xzv-automake-1.15/bin/aclocal'

https://hydra.nixos.org/build/95671911

see #64126

@FRidh
Copy link
Member Author

FRidh commented Jul 5, 2019

I have not been able to reproduce this issue locally.

There are several thousand rebuilds from master already.
Hydra nixpkgs: ?compare=1528940
@vcunat
Copy link
Member

vcunat commented Jul 8, 2019

Darwin stdenv won't build, at least on Hydra: https://hydra.nixos.org/build/95653283 I don't know if that's also some impurity from the builders.

@FRidh
Copy link
Member Author

FRidh commented Jul 8, 2019

cc @NixOS/darwin-maintainers

@LnL7
Copy link
Member

LnL7 commented Jul 8, 2019

Bootstrapping problem, cmake was updated. That should fix it.

@vcunat vcunat mentioned this pull request Jul 9, 2019
10 tasks
matthewbauer and others added 2 commits July 9, 2019 14:51
This fixes the darwin build, while also using Meson’s auto features as
much as possible. As a result, we avoid using having to specify
default drivers and instead delegate that to Mesa’s build system.
Removed other flags that were specified to the default in Mesa.

The -fno-common is needed to address undefined symbol _lp_dummy_tile
in the build.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet