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 #66822

Merged
merged 133 commits into from Aug 31, 2019
Merged

Staging next #66822

merged 133 commits into from Aug 31, 2019

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented Aug 18, 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 @

dtzWill and others added 30 commits July 25, 2019 23:35
https://roy.marples.name/blog/dhcpcd-8-0-2-released

> I don't anticipate any more releases for a while as this is looking
really good now!
ssh-keysign is used for host-based authentication, and is designed to be used
as SUID-root program. OpenSSH defaults to referencing it from libexec, which
cannot be made SUID in Nix.
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cmake-cursesui-qt5ui/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/glib/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/jsoncpp/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/phonon-qt5/versions
Because we're using plain buildtype these have to be
passed manually.

See: https://gitlab.gnome.org/GNOME/gtk/blob/3.24.10/meson.build#L59

With autotools the mapping for the the options to the defines was:

yes:     G_ENABLE_DEBUG G_ENABLE_CONSISTENCY_CHECKS
minimum: G_ENABLE_DEBUG G_DISABLE_CAST_CHECKS
no:      G_DISABLE_CAST_CHECKS G_DISABLE_ASSERT G_DISABLE_CHECKS

So we're passing the exact ones that would've been used for minimum.

Additionally it isn't a good idea to pass the equivalents used for "no" 
as it eliminates G_ENABLE_DEBUG which disables pre-condition checks and 
assertions. The actual option only existed to serve people who needed a 
specific build of GTK for very specific environments. And now they are
much better served with meson's plain buildtype and figuring out what to
pass themselves.
This is what would have been passed before with the release
buildtype.

See: https://gitlab.gnome.org/GNOME/glib/blob/2.60.4/meson.build#L208
I fail to see where or for what it is useful for.
glib,gtk: correct CLAGS for plain buildtype
Clean up the expression and prepare for tests. Unfortunately, I could not get them pass.
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/vala/versions
enchant: 2.2.3 -> 2.2.4
Replay Qt 5.12.3 version bump
@flokli
Copy link
Contributor

flokli commented Aug 18, 2019

@FRidh can we sneak in #66725 here as well? It's another big rebuild, and was just an hour too late ;-)

@vcunat
Copy link
Member

vcunat commented Aug 20, 2019

qt5.qtbase on darwin: #66266 (comment)

Broke the build as the pname variable was used to create the URL
Introduced by 46420bb
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/nixos-19-09-feature-freeze/3707/7

nyanloutre and others added 6 commits August 22, 2019 12:19
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
@vcunat vcunat mentioned this pull request Aug 25, 2019
1 task
Fortunately the issue was caught as a hash mismatch.
Attributes: firefox-esr-60, tor-browser(-8-5), icecat
Thanks to Symphorien: #67426
There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.

Hydra nixpkgs: ?compare=1538611
@vcunat
Copy link
Member

vcunat commented Aug 25, 2019

Relatively a lot of remaining build regressions since master are due to some python packages. Otherwise the qtbase problem (above) still holds, and several Qt apps won't build (probably easy, details in the same thread).

@flokli
Copy link
Contributor

flokli commented Aug 25, 2019

@vcunat can you cherry pick #66725 in here? That's another stdenv rebuild, which should make the wrapQtAppsHook a bit smarter, and should probably be done before branching off 19.09.

@vcunat
Copy link
Member

vcunat commented Aug 25, 2019

Rebuild-wise, the current commit is almost all finished. It might be better to merge to master and reiterate, though the currently remaining number of build regressions worries me a little.

@FRidh FRidh requested a review from adisbladis as a code owner August 31, 2019 07:51
@adisbladis adisbladis removed their request for review August 31, 2019 10:21
disassembler and others added 2 commits August 31, 2019 06:53
* upstream/master:
  vimPlugins: update (#67823)
  mattermost-desktop: 4.2.0 -> 4.2.3 (#67717)
  lightspark: init at 0.8.1 (#67425)
  anki: 2.1.11 -> 2.1.14 (#67738)
  nixos/{namecoind,bitcoind}: removing the altcoin prefix
  rust-cbindgen: 0.8.7 -> 0.9.0
@FRidh FRidh merged commit 69d58ee into master Aug 31, 2019
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