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

Merged
merged 254 commits into from Feb 10, 2019
Merged

Staging next #54306

merged 254 commits into from Feb 10, 2019

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented Jan 19, 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 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.

pbogdan and others added 30 commits December 9, 2018 23:28
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gnutar/versions
* add generic x86_32 support

- Add support for i386-i586.
- Add `isx86_32` predicate that can replace most uses of `isi686`.
- `isi686` is reinterpreted to mean "exactly i686 arch, and not say i585 or i386".
- This branch was used to build working i586 kernel running on i586 hardware.

* revert `isi[345]86`, remove dead code

- Remove changes to dead code in `doubles.nix` and `for-meta.nix`.
- Remove `isi[345]86` predicates since other cpu families don't have specific model predicates.

* remove i386-linux since linux not supported on that cpu
"Update to iproute2 utility to support new features in Linux 4.20.
This release is mostly small fixes but there are several changes
related to ip neigh support for offloaded entries." [0]

File changes:
+share/man/man8/tc-taprio.8.gz

nix path-info -S:
4.19.0 42681224
4.20.0 42714224

[0]: https://www.spinics.net/lists/netdev/msg543288.html
gmp: don't use uname to detect system features
exclude freetype-config
In particular this fixes the libmediaart tests.

closes #53701
pythonPackages.pycairo: 1.16.3 -> 1.18.0
Long live... eh, I hope the new KSK won't live as long as the old one.
Anyway, it doesn't really matter how fast people update this.
https://www.ietf.org/mail-archive/web/dnsop/current/msg24989.html
See RFC 5011 for details of the protocol.

I re-tested validation with both of these files, to be sure.
This package contains several CMake files used for setting up its
provided tools for use in other projects build with CMake.
While packaging *ktouch* I found out that the ${_qt5Core_install_prefix}
variable doesn't expand at all, rendering the path to the `qmlcachegen`
binary useless. As a fix, the command itself is used instead of the path
to the binary.
packaging the `ktouch` touch typing tutor. Due to Qt impurities, it
needs to be installed in a profile to find it runtime dependencies.
ninja sources include re2c's output files, so unless we change the sources by applying a patch, re2c is not even launched
anyway, it is not relevant to building docs
We can't run the checkPhase when build != host, so we may as well make
the checkInputs native.

This signicantly improves the situation of Python packages when enabling
strictDeps.
@vcunat
Copy link
Member

vcunat commented Feb 3, 2019

I'm afraid darwin is still in a too bad shape: https://hydra.nixos.org/eval/1503346?filter=darwin&compare=1503325&full=#tabs-now-fail EDIT: it seems largely because of libvdpau.

@vcunat vcunat mentioned this pull request Feb 4, 2019
11 tasks
Seems to be necessary for some reason. Otherwise we are missing
symbols.
@matthewbauer
Copy link
Member

@vcunat I pushed a commit to fix libvdpau

Hydra nixpkgs: ?compare=1503899
- it's the pkgconfig confusion again: eb3f0ae #54306
- unfortunately the build succeeded silently with
  > DBus v1 does not seem to be installed.
- pyqt5 uses correct pkgconfig due to using different callPackage
Hydra nixpkgs: ?compare=1504357
@vcunat
Copy link
Member

vcunat commented Feb 9, 2019

Which packages do you expect 3d979f4 to fix?

Some was missed: 6ae1cc2 (found via ffado build failure); hopefully there won't be many more.

@vcunat
Copy link
Member

vcunat commented Feb 9, 2019

The sage problem was also from the same group. @dotlambda: I must say I'm still not really convinced about the advantages of not propagating the pkg-config command from python*Packages.pkgconfig, but I'm keeping that as it is.

Again: eb3f0ae #54306
Apparently the derivation needs both pkgconfigs
(it fails when missing either).
@dotlambda
Copy link
Member

I must say I'm still not really convinced about the advantages of not propagating the pkg-config command from python*Packages.pkgconfig, but I'm keeping that as it is.

The advantage is that people only use the Python package when it's really needed. It's also a general scheme people should learn. E.g. pythonPackages.graphviz had the same problem: #52523. There, it makes even more sense not to propagate since the package is also used at runtime.

@FlorianFranzen
Copy link
Contributor

I would like to ask to include #54486, which fixes Python's sysconfig module again.

@vcunat
Copy link
Member

vcunat commented Feb 10, 2019

@FlorianFranzen: that's a huge rebuild, unfortunately, and the issue seems to be present in master already, so I'd think we leave that to the next iteration (i.e. the usual staging workflow).

@vcunat vcunat self-assigned this Feb 10, 2019
@vcunat vcunat merged commit 64edccb into master Feb 10, 2019
@FlorianFranzen
Copy link
Contributor

@vcunat Ok, thanks. I created #55519 to get that going then.

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