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

2018-02-03 02:50:21 +02:00
parent 2fb4606f38 c70c9649ea
commit 10c8e6d0c5
87 changed files with 924 additions and 318 deletions
@@ -40,7 +40,7 @@ packagesFun: # packages explicitly requested by the user

 let
  explicitRequires =
-    if builtins.isFunction packagesFun
+    if lib.isFunction packagesFun
      then packagesFun self
    else packagesFun;
 in