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

merge: master to staging #46402

Merged
merged 364 commits into from Sep 8, 2018
Merged

Conversation

oxij
Copy link
Member

@oxij oxij commented Sep 8, 2018

Motivation for this change

master has a bunch merges with my branches which I want to continue with PRs against staging.

Things done
  • There were no conflicts.

Mic92 and others added 30 commits September 5, 2018 18:15
zfs-unstable:  2018-08-13 -> 2018-09-02
nix: fix a tiny option bug, make AWS support optional
…3d8d31e737ae560a191a1d5 (NixOS#46107)

Also, switch to the now-maintained fork of gocode available at github.com/mdempsky/gocode
…heimdal

Libprefixed to multioutput/heimdal
trivial: treewide: random noop cleanups
A sporadic failure occured on Hydra because a request was sent
to smtpd after the systemd unit was started, but before the daemon
was actually listening. Fix by checking for open ports first.
…6042)

This fixes an issue with shells like fish that are not fully POSIX
compliant. The syntax `ENV=val cmd' doesn't work properly in there.

This issue has been addressed in NixOS#45932 and NixOS#45945, however it has been
recommended to use a single shell (`stdenv.shell' which is either
`bash' or `sh') to significantly reduce the maintenance overload in the
future.

See NixOS#45897 (comment)

Fixes NixOS#45897

/cc @FRidh @xaverdh @etu
disable format hardening
Also move outside python-packages.nix
Also 2018.8.10 does not build in previous state because auto updating
from pypi did not account for a new requirement `networkx`. This has
been added.
…specify the data files

This is more understandable and safer than using a nested list.
…of copying

This prevents duplication in the nix store.
This reverts commit 93ed13f.

libtensorflow is only used by the Haskell tensorflow packages and they
don't work with tensorflow-1.10 yet. So the easiest solution is to
just revert this commit and add it back when they do gain support.
This reverts commit 7139911.

libtensorflow is only used by the Haskell tensorflow packages and they
don't work with tensorflow-1.10 yet. So the easiest solution is to
just revert this commit and add it back when they do gain support.
xeji and others added 4 commits September 8, 2018 21:35
Documentation-related tests failed, the docs didn't build correctly
because of missing dependencies sphinx and manuel. Add them.
kodi: implement `kodiWithPlugins`, add more plugins
For update-mime-database to work, you must have to have some mime
packages installed. In some DEs like XFCE this is not guaranteed to
happen. In that case just skip the update-mime-database call.

Fixes NixOS#46162
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