Merge branch 'osx-10.10' into 'master'

Update conda build config to match the defaults channel

See merge request !161

bob/devtools/data/conda_build_config.yaml

+c_compiler:
+  - clang                      # [osx]
+cxx_compiler:
+  - clangxx                    # [osx]
+fortran_compiler_version:
+# matrix on linux, because the ABI breaks at GCC 8
+  - 7.3.0                      # [linux]
+  - 8.2.0                      # [linux]
+rust_compiler:
+  - rust
+rust_compiler_version:
+  - 1.40.0
+
+c_compiler_version:        # [linux or osx]
+  - 7.3.0                  # [linux]
+  - 10                     # [osx]
+cxx_compiler_version:      # [linux or osx]
+  - 7.3.0                  # [linux]
+  - 10                     # [osx]
+fortran_compiler_version:  # [linux]
+  - 7.3.0                  # [linux]
+clang_variant:
+  - clang
+
 macos_min_version:
   - 10.9
 macos_machine:
@@ -5,11 +29,11 @@ macos_machine:
 MACOSX_DEPLOYMENT_TARGET:
   - 10.9
 CONDA_BUILD_SYSROOT:            # [osx]
-  - /opt/MacOSX10.9.sdk         # [osx]
+  - /opt/MacOSX10.10.sdk        # [osx]
 # This helps CMAKE find the sysroot. See
 # https://cmake.org/cmake/help/v3.11/variable/CMAKE_OSX_SYSROOT.html
 SDKROOT:                        # [osx]
-  - /opt/MacOSX10.9.sdk         # [osx]
+  - /opt/MacOSX10.10.sdk        # [osx]
 # makes autotools verbose
 VERBOSE_AT:
   - V=1
@@ -42,6 +66,8 @@ zip_keys:
     - cxx_compiler              # [win]
     - fortran_compiler_version  # [win]
     - python                    # [win]
+    - nodejs                    # [win]
+    - geos                      # [win]
 
 
 # Here is the version of dependencies are used when building packages (build

doc/macos.rst

@@ -56,6 +56,7 @@ Building the reference setup
 2. To be able to send e-mails from the command-line (e.g., when completing
    cronjobs), via the Idiap SMTP, you will need to modify the postfix
    configuration:
+
    - Edit the file ``/etc/postfix/main.cf`` to add a line stating ``relayhost =
      [smtp.lab.idiap.ch]``  (all e-mails should be routed by this SMTP host)
    - Edit the file ``/etc/postfix/generic`` to add a line stating