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

[pull] nixos-19.09 from NixOS:nixos-19.09 #268

Merged
merged 31 commits into from Jan 10, 2020

Conversation

pull[bot]
Copy link

@pull pull bot commented Jan 10, 2020

See Commits and Changes for more details.


Created by pull[bot]. Want to support this open source service? Please star it : )

risicle and others added 30 commits January 2, 2020 18:49
sourced from debian as patch isn't even in upstream master yet.

(cherry picked from commit 302a77a)
(cherry picked from commit 787a7f6)
apache-kafka.nix: Add missing quote inside tmpfiles rule
Traceback (most recent call last):
  File "/nix/store/8qkdlyv2ckrimvi50qvl0anzv66jcp2j-python-swiftclient-3.6.0/bin/.swift-wrapped", line 7, in <module>
    from swiftclient.shell import main
  File "/nix/store/8qkdlyv2ckrimvi50qvl0anzv66jcp2j-python-swiftclient-3.6.0/lib/python3.7/site-packages/swiftclient/__init__.py", line 20, in <module>
    from .client import *  # noqa
  File "/nix/store/8qkdlyv2ckrimvi50qvl0anzv66jcp2j-python-swiftclient-3.6.0/lib/python3.7/site-packages/swiftclient/client.py", line 33, in <module>
    from swiftclient import version as swiftclient_version
  File "/nix/store/8qkdlyv2ckrimvi50qvl0anzv66jcp2j-python-swiftclient-3.6.0/lib/python3.7/site-packages/swiftclient/version.py", line 15, in <module>
    import pkg_resources
ModuleNotFoundError: No module named 'pkg_resources'

(cherry picked from commit dfd115a)
(cherry picked from commit 3b15451)
(cherry picked from commit 3f0fee7)
(cherry picked from commit aab1f2d)
(cherry picked from commit b4983fe)
Previously when this function was called without a value coercible to a
string it would throw an error instead of returning false. Now it does.

As a result this now allows the use of a type like `either path attrs`
without it erroring out when a definition is an attribute set.

The warning about there not being a isPath primop was removed because
this is not the case anymore, there is builtins.isPath. But also there
always was `builtins.typeOf x == "path"` that could've been used
instead. However the path type now stands for more than just path types,
but absolute paths in general.

(cherry picked from commit d7a109b)

See #76861 (comment)
for why this is cherry-picked
(cherry picked from commit 6cd31dd)
Signed-off-by: Domen Kožar <domen@dev.si>
[19.09] firefox: 72.0 -> 72.0.1
firefox-bin: 72.0 -> 72.0.1 [security] CVE-2019-17026 [19.09]
@pull pull bot added the ⤵️ pull label Jan 10, 2020
@pull pull bot requested a review from nyanloutre January 10, 2020 10:00
@pull pull bot merged this pull request into nyanloutre:nixos-19.09 Jan 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet