Merge remote-tracking branch 'NixOS/master' into staging

This commit is contained in:
Matthew Bauer
2019-04-23 22:00:42 -04:00
395 changed files with 10057 additions and 5223 deletions
@@ -15,7 +15,9 @@ in python3Packages.buildPythonApplication {
buildInputs = with python3Packages; [ mock pytest ];
propagatedBuildInputs = with python3Packages; [ cloudpickle pyinotify ];
propagatedBuildInputs = with python3Packages; [ cloudpickle ]
++ stdenv.lib.optional stdenv.isLinux pyinotify
++ stdenv.lib.optional stdenv.isDarwin macfsevents;
# Tests fail due to mysterious gdbm.open() resource temporarily
# unavailable errors.