Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 02682e509389a6de23a2614da3b43abebf45a4f2
      
https://github.com/NixOS/nixpkgs/commit/02682e509389a6de23a2614da3b43abebf45a4f2
  Author: Patrick Mahoney <p...@polycrystal.org>
  Date:   2017-04-22 (Sat, 22 Apr 2017)

  Changed paths:
    M pkgs/development/ocaml-modules/lwt/default.nix

  Log Message:
  -----------
  ocamlPackages.ocaml_lwt: use buildOcaml

This adds the shared objects setup hook to prepare
CAML_LD_LIBRARY_PATH.


  Commit: d27e250627dd2f03e1436410c69b49f6463874ca
      
https://github.com/NixOS/nixpkgs/commit/d27e250627dd2f03e1436410c69b49f6463874ca
  Author: Patrick Mahoney <p...@polycrystal.org>
  Date:   2017-04-22 (Sat, 22 Apr 2017)

  Changed paths:
    M pkgs/development/ocaml-modules/lambda-term/default.nix

  Log Message:
  -----------
  ocamlPackages.lambdaTerm: use buildOcaml

This adds the shared objects setup hook to prepare
CAML_LD_LIBRARY_PATH.


  Commit: 1a7586ce24598c03c2ab823e74e5e2413b450cdf
      
https://github.com/NixOS/nixpkgs/commit/1a7586ce24598c03c2ab823e74e5e2413b450cdf
  Author: Patrick Mahoney <p...@polycrystal.org>
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
    M pkgs/development/tools/ocaml/utop/default.nix

  Log Message:
  -----------
  ocamlPackages.utop: fix environment variables

In the wrapper scripts, both OCAMLPATH and CAML_LD_LIBRARY_PATH where
being created with a trailing literal $OCAMLPATH, rather than the
expanded version. Thus if, for example, ocamlPackages.core was present
in OCAMLPATH prior to running utop, the wrapper script would set the
variable to $utop_dependencies:'$OCAMLPATH', and when using utop to
open Core.Std, the following error was reported:

    findlib: [WARNING] cannot read directory $OCAMLPATH: No such file
    or directory

This patch fixes the quoting issue, and further refactors the build to
use standard wrapProgram helper, and uses an "inner derivation" to
re-use the setupHook machinery of buildOCaml and findlib instead of
manually specifying the OCAMLPATH required for utop along with
transitive dependencies.


  Commit: 9ae5487b196ed3ec442aff504839dc8fff1aa36b
      
https://github.com/NixOS/nixpkgs/commit/9ae5487b196ed3ec442aff504839dc8fff1aa36b
  Author: Michael Raskin <7c6f4...@mail.ru>
  Date:   2017-05-01 (Mon, 01 May 2017)

  Changed paths:
    M doc/cross-compilation.xml
    M doc/languages-frameworks/ruby.xml
    M doc/multiple-output.xml
    M lib/customisation.nix
    M lib/licenses.nix
    M lib/maintainers.nix
    M lib/systems/doubles.nix
    M lib/systems/parse.nix
    M lib/systems/platforms.nix
    M lib/trivial.nix
    M nixos/doc/manual/administration/imperative-containers.xml
    M nixos/doc/manual/configuration/file-systems.xml
    M nixos/doc/manual/installation/installing-usb.xml
    M nixos/doc/manual/release-notes/rl-1709.xml
    M nixos/lib/make-disk-image.nix
    M nixos/maintainers/scripts/ec2/amazon-image.nix
    M nixos/modules/config/i18n.nix
    M nixos/modules/installer/tools/nix-fallback-paths.nix
    M nixos/modules/installer/tools/nixos-prepare-root.sh
    M nixos/modules/misc/extra-arguments.nix
    M nixos/modules/misc/ids.nix
    M nixos/modules/misc/nixpkgs.nix
    M nixos/modules/module-list.nix
    A nixos/modules/profiles/hardened.nix
    A nixos/modules/programs/browserpass.nix
    M nixos/modules/programs/command-not-found/command-not-found.nix
    M nixos/modules/programs/environment.nix
    A nixos/modules/programs/qt5ct.nix
    A nixos/modules/programs/zsh/oh-my-zsh.nix
    A nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
    M nixos/modules/programs/zsh/zsh.nix
    M nixos/modules/rename.nix
    M nixos/modules/security/grsecurity.nix
    M nixos/modules/security/grsecurity.xml
    A nixos/modules/security/lock-kernel-modules.nix
    M nixos/modules/services/backup/znapzend.nix
    M nixos/modules/services/continuous-integration/hydra/default.nix
    A nixos/modules/services/databases/clickhouse.nix
    M nixos/modules/services/hardware/amd-hybrid-graphics.nix
    M nixos/modules/services/misc/gogs.nix
    M nixos/modules/services/misc/jackett.nix
    M nixos/modules/services/misc/plex.nix
    M nixos/modules/services/misc/radarr.nix
    M nixos/modules/services/misc/sonarr.nix
    M nixos/modules/services/monitoring/cadvisor.nix
    M nixos/modules/services/monitoring/graphite.nix
    M nixos/modules/services/monitoring/longview.nix
    M nixos/modules/services/monitoring/munin.nix
    A nixos/modules/services/networking/aria2.nix
    M nixos/modules/services/networking/avahi-daemon.nix
    M nixos/modules/services/networking/i2pd.nix
    M nixos/modules/services/networking/networkmanager.nix
    M nixos/modules/services/networking/radicale.nix
    A nixos/modules/services/networking/xrdp.nix
    M nixos/modules/services/scheduling/fcron.nix
    A nixos/modules/services/security/sshguard.nix
    M nixos/modules/services/web-apps/atlassian/confluence.nix
    M nixos/modules/services/x11/desktop-managers/default.nix
    M nixos/modules/services/x11/desktop-managers/plasma5.nix
    M nixos/modules/services/x11/display-managers/default.nix
    M nixos/modules/services/x11/display-managers/lightdm.nix
    M nixos/modules/services/x11/display-managers/sddm.nix
    M nixos/modules/services/x11/display-managers/slim.nix
    M nixos/modules/services/x11/xserver.nix
    M nixos/modules/system/boot/loader/grub/grub.nix
    M nixos/modules/system/boot/stage-1-init.sh
    M nixos/modules/tasks/trackpoint.nix
    M nixos/modules/virtualisation/azure-image.nix
    M nixos/modules/virtualisation/docker.nix
    M nixos/modules/virtualisation/google-compute-image.nix
    M nixos/modules/virtualisation/qemu-vm.nix
    M nixos/release-combined.nix
    M nixos/release.nix
    R nixos/tests/grsecurity.nix
    A nixos/tests/hardened.nix
    M nixos/tests/misc.nix
    M nixos/tests/mysql-replication.nix
    A nixos/tests/radicale.nix
    A nixos/tests/slim.nix
    A nixos/tests/xrdp.nix
    M pkgs/applications/altcoins/bitcoin-unlimited.nix
    A pkgs/applications/audio/google-play-music-desktop-player/default.nix
    M pkgs/applications/display-managers/sddm/default.nix
    M pkgs/applications/display-managers/slim/default.nix
    A pkgs/applications/display-managers/slim/no-logfile.patch
    M pkgs/applications/editors/emacs-modes/elpa-generated.nix
    M pkgs/applications/editors/emacs-modes/melpa-generated.nix
    M pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
    M pkgs/applications/editors/emacs/default.nix
    M pkgs/applications/editors/emacs/macport.nix
    M pkgs/applications/editors/kile/default.nix
    M pkgs/applications/editors/rstudio/default.nix
    M pkgs/applications/editors/rstudio/r-location.patch
    M pkgs/applications/graphics/apitrace/default.nix
    A pkgs/applications/graphics/displaycal/default.nix
    M pkgs/applications/graphics/gimp/plugins/default.nix
    M pkgs/applications/graphics/krita/default.nix
    M pkgs/applications/graphics/ocrad/default.nix
    M pkgs/applications/graphics/tesseract/default.nix
    M pkgs/applications/kde/ark/default.nix
    M pkgs/applications/kde/fetch.sh
    M pkgs/applications/kde/kcachegrind.nix
    M pkgs/applications/kde/kdelibs/default.nix
    M pkgs/applications/kde/marble.nix
    M pkgs/applications/kde/srcs.nix
    M pkgs/applications/misc/calibre/default.nix
    R pkgs/applications/misc/cortex/default.nix
    A pkgs/applications/misc/deepin-terminal/default.nix
    A pkgs/applications/misc/dockbarx/default.nix
    M pkgs/applications/misc/girara/default.nix
    M pkgs/applications/misc/haxor-news/default.nix
    M pkgs/applications/misc/hugo/default.nix
    M pkgs/applications/misc/jekyll/Gemfile
    M pkgs/applications/misc/jekyll/Gemfile.lock
    M pkgs/applications/misc/jekyll/default.nix
    M pkgs/applications/misc/jekyll/gemset.nix
    M pkgs/applications/misc/khal/default.nix
    M pkgs/applications/misc/mwic/default.nix
    M pkgs/applications/misc/nut/default.nix
    M pkgs/applications/misc/qsyncthingtray/default.nix
    M pkgs/applications/misc/robomongo/default.nix
    M pkgs/applications/misc/rtv/default.nix
    M pkgs/applications/misc/sc-im/default.nix
    A pkgs/applications/misc/termdown/default.nix
    M pkgs/applications/misc/udiskie/default.nix
    M pkgs/applications/misc/wordnet/default.nix
    M pkgs/applications/misc/xca/default.nix
    M pkgs/applications/networking/browsers/firefox-bin/default.nix
    M pkgs/applications/networking/browsers/firefox-bin/sources.nix
    A pkgs/applications/networking/browsers/firefox/common.nix
    R pkgs/applications/networking/browsers/firefox/default.nix
    A pkgs/applications/networking/browsers/firefox/packages.nix
    M pkgs/applications/networking/browsers/qutebrowser/default.nix
    A pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
    R pkgs/applications/networking/browsers/torbrowser/default.nix
    M pkgs/applications/networking/cluster/marathon/default.nix
    M pkgs/applications/networking/cluster/mesos/default.nix
    M pkgs/applications/networking/cluster/terraform/default.nix
    M pkgs/applications/networking/dropbox/default.nix
    M pkgs/applications/networking/flexget/default.nix
    A pkgs/applications/networking/instant-messengers/coyim/default.nix
    M pkgs/applications/networking/instant-messengers/dino/default.nix
    M pkgs/applications/networking/instant-messengers/franz/default.nix
    M pkgs/applications/networking/instant-messengers/rambox/default.nix
    M pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
    A pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
    M pkgs/applications/networking/ipfs/default.nix
    M pkgs/applications/networking/irc/weechat/default.nix
    M pkgs/applications/networking/mailreaders/claws-mail/default.nix
    M pkgs/applications/networking/mailreaders/sylpheed/default.nix
    M pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
    M pkgs/applications/networking/mailreaders/thunderbird/default.nix
    M pkgs/applications/networking/mumble/default.nix
    M pkgs/applications/networking/owncloud-client/default.nix
    M pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
    M pkgs/applications/networking/remote/teamviewer/default.nix
    A pkgs/applications/networking/remote/xrdp/default.nix
    M pkgs/applications/networking/syncthing/default.nix
    M pkgs/applications/office/antiword/default.nix
    M pkgs/applications/office/beancount/bean-add.nix
    A pkgs/applications/office/mytetra/default.nix
    M pkgs/applications/office/planner/default.nix
    M pkgs/applications/science/biology/ants/default.nix
    M pkgs/applications/science/electronics/fritzing/default.nix
    M pkgs/applications/science/logic/coq/HEAD.nix
    A pkgs/applications/science/logic/cubicle/default.nix
    M pkgs/applications/science/math/R/default.nix
    M pkgs/applications/science/math/csdp/default.nix
    M pkgs/applications/science/math/geogebra/default.nix
    M pkgs/applications/science/math/speedcrunch/default.nix
    M pkgs/applications/version-management/git-and-tools/qgit/default.nix
    M pkgs/applications/video/dvdauthor/default.nix
    M pkgs/applications/video/mpv/default.nix
    M pkgs/applications/virtualization/OVMF/default.nix
    M pkgs/applications/virtualization/qemu/default.nix
    M pkgs/applications/virtualization/qemu/no-etc-install.patch
    M pkgs/applications/virtualization/xen/generic.nix
    M pkgs/build-support/docker/default.nix
    M pkgs/build-support/fetchdarcs/default.nix
    A pkgs/build-support/fetchs3/default.nix
    R pkgs/build-support/grsecurity/default.nix
    M pkgs/build-support/kde/wrapper.nix
    M pkgs/build-support/release/ant-build.nix
    M pkgs/build-support/setup-hooks/make-wrapper.sh
    M pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
    M pkgs/build-support/vm/windows/default.nix
    A pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix
    M pkgs/desktops/enlightenment/efl.nix
    M pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
    M pkgs/desktops/gnome-3/3.22/core/dconf/default.nix
    M pkgs/desktops/gnome-3/3.22/core/vte/default.nix
    A pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix
    M pkgs/desktops/kde-4.14/kde-package/4.14.3.nix
    R pkgs/desktops/kde-4.14/kdebindings/pykde4-gcc-5.patch
    R pkgs/desktops/kde-4.14/kdebindings/pykde4.nix
    M pkgs/desktops/plasma-5/default.nix
    M pkgs/desktops/plasma-5/fetch.sh
    M pkgs/desktops/plasma-5/kwin/default.nix
    R pkgs/desktops/plasma-5/libkscreen.nix
    A pkgs/desktops/plasma-5/libkscreen/default.nix
    A pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch
    A pkgs/desktops/plasma-5/libkscreen/series
    M pkgs/desktops/plasma-5/srcs.nix
    M pkgs/desktops/xfce/default.nix
    A pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix
    M pkgs/development/compilers/colm/default.nix
    M pkgs/development/compilers/crystal/default.nix
    M pkgs/development/compilers/emscripten-fastcomp/default.nix
    M pkgs/development/compilers/emscripten/default.nix
    M pkgs/development/compilers/gcc/4.5/default.nix
    M pkgs/development/compilers/gcc/4.8/default.nix
    M pkgs/development/compilers/gcc/4.9/default.nix
    M pkgs/development/compilers/gcc/5/default.nix
    M pkgs/development/compilers/gcc/6/default.nix
    M pkgs/development/compilers/gcc/builder.sh
    M pkgs/development/compilers/gcc/snapshot/default.nix
    M pkgs/development/compilers/ghc/head.nix
    M pkgs/development/compilers/halvm/2.4.0.nix
    M pkgs/development/compilers/julia/0.5.nix
    M pkgs/development/compilers/kotlin/default.nix
    M pkgs/development/compilers/mono/4.6.nix
    M pkgs/development/compilers/ponyc/default.nix
    A pkgs/development/compilers/reason/default.nix
    M pkgs/development/compilers/rust/rustc.nix
    M pkgs/development/compilers/sbcl/default.nix
    M pkgs/development/compilers/swift/default.nix
    M pkgs/development/coq-modules/QuickChick/default.nix
    M pkgs/development/go-modules/generic/default.nix
    M pkgs/development/haskell-modules/configuration-common.nix
    M pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
    M pkgs/development/haskell-modules/configuration-hackage2nix.yaml
    M pkgs/development/haskell-modules/generic-stack-builder.nix
    M pkgs/development/haskell-modules/hackage-packages.nix
    M pkgs/development/haskell-modules/make-package-set.nix
    M pkgs/development/interpreters/perl/default.nix
    A pkgs/development/interpreters/perl/sw_vers.patch
    M pkgs/development/interpreters/php/default.nix
    M pkgs/development/interpreters/python/cpython/3.3/default.nix
    M pkgs/development/interpreters/python/cpython/3.4/default.nix
    M pkgs/development/interpreters/python/cpython/3.5/default.nix
    M pkgs/development/interpreters/python/cpython/3.6/default.nix
    A pkgs/development/libraries/audio/libgme/default.nix
    R pkgs/development/libraries/cimg/builder.sh
    M pkgs/development/libraries/cimg/default.nix
    M pkgs/development/libraries/clutter/default.nix
    M pkgs/development/libraries/cpp-hocon/default.nix
    M pkgs/development/libraries/ctpp2/default.nix
    M pkgs/development/libraries/curlcpp/default.nix
    M pkgs/development/libraries/dbus/default.nix
    A pkgs/development/libraries/eccodes/default.nix
    M pkgs/development/libraries/exempi/default.nix
    M pkgs/development/libraries/farbfeld/default.nix
    M pkgs/development/libraries/ffmpeg-full/default.nix
    R pkgs/development/libraries/ffmpeg/3.1.nix
    R pkgs/development/libraries/ffmpeg/3.2.nix
    A pkgs/development/libraries/ffmpeg/3.3.nix
    M pkgs/development/libraries/ffmpeg/generic.nix
    M pkgs/development/libraries/gdal/default.nix
    M pkgs/development/libraries/glib/default.nix
    M pkgs/development/libraries/gstreamer/bad/default.nix
    M pkgs/development/libraries/gstreamer/good/default.nix
    M pkgs/development/libraries/gtk+/3.x.nix
    M pkgs/development/libraries/harfbuzz/default.nix
    M pkgs/development/libraries/hunspell/default.nix
    M pkgs/development/libraries/imlib2/default.nix
    M pkgs/development/libraries/kde-frameworks/default.nix
    M pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
    M pkgs/development/libraries/kde-frameworks/fetch.sh
    M pkgs/development/libraries/kde-frameworks/kinit/default.nix
    A pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch
    M pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch
    M pkgs/development/libraries/kde-frameworks/kinit/series
    R pkgs/development/libraries/kde-frameworks/kwindowsystem.nix
    A pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
    A 
pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch
    A pkgs/development/libraries/kde-frameworks/kwindowsystem/series
    M pkgs/development/libraries/kde-frameworks/srcs.nix
    M pkgs/development/libraries/kirigami/default.nix
    R pkgs/development/libraries/kirigami/v2.nix
    M pkgs/development/libraries/leatherman/default.nix
    M pkgs/development/libraries/libav/default.nix
    R pkgs/development/libraries/libav/vpxenc-11.6-libvpx-1.5.patch
    M pkgs/development/libraries/libconfig/default.nix
    M pkgs/development/libraries/libconfuse/default.nix
    M pkgs/development/libraries/libdiscid/default.nix
    M pkgs/development/libraries/libdvdread/default.nix
    M pkgs/development/libraries/libfm/default.nix
    M pkgs/development/libraries/libgtop/default.nix
    M pkgs/development/libraries/libhttpseverywhere/default.nix
    M pkgs/development/libraries/libidn2/default.nix
    M pkgs/development/libraries/libinfinity/default.nix
    M pkgs/development/libraries/liblo/default.nix
    M pkgs/development/libraries/libmatroska/default.nix
    M pkgs/development/libraries/libmicrohttpd/default.nix
    M pkgs/development/libraries/libsamplerate/default.nix
    M pkgs/development/libraries/libssh/default.nix
    M pkgs/development/libraries/libtiger/default.nix
    M pkgs/development/libraries/libxml2/default.nix
    M pkgs/development/libraries/libxslt/default.nix
    A pkgs/development/libraries/libytnef/default.nix
    M pkgs/development/libraries/log4cpp/default.nix
    A pkgs/development/libraries/log4shib/default.nix
    M pkgs/development/libraries/menu-cache/default.nix
    M pkgs/development/libraries/mesa/default.nix
    M pkgs/development/libraries/opencv/default.nix
    A pkgs/development/libraries/opensaml-cpp/default.nix
    M pkgs/development/libraries/pango/default.nix
    M pkgs/development/libraries/physics/fastnlo/default.nix
    M pkgs/development/libraries/physics/rivet/default.nix
    M pkgs/development/libraries/physics/yoda/default.nix
    R 
pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch
    M pkgs/development/libraries/qt-5/5.6/qtbase/series
    R pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths-darwin.patch
    M pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths.patch
    M pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch
    R pkgs/development/libraries/qt-5/5.8/qtbase/decrypt-ssl-traffic.patch
    M pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
    R pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-dbus.patch
    M pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-gl.patch
    M pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-libXcursor.patch
    R pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-openssl.patch
    M pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-resolv.patch
    M pkgs/development/libraries/qt-5/5.8/qtbase/libressl.patch
    R pkgs/development/libraries/qt-5/5.8/qtbase/mkspecs-libgl.patch
    R 
pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch
    A 
pkgs/development/libraries/qt-5/5.8/qtbase/qnativesocketengine-type-pun.patch
    A pkgs/development/libraries/qt-5/5.8/qtbase/qpa-plugin-path.patch
    M pkgs/development/libraries/qt-5/5.8/qtbase/series
    M pkgs/development/libraries/qt-5/5.8/qtbase/tzdir.patch
    M pkgs/development/libraries/qt-5/5.8/qtbase/xdg-config-dirs.patch
    M pkgs/development/libraries/qt-5/make-qt-wrapper.sh
    M pkgs/development/libraries/qtstyleplugins/default.nix
    M pkgs/development/libraries/qtwebkit-plugins/default.nix
    M pkgs/development/libraries/qwt/6_qt4.nix
    M pkgs/development/libraries/science/math/blas/default.nix
    A pkgs/development/libraries/shibboleth-sp/default.nix
    M pkgs/development/libraries/speex/default.nix
    M pkgs/development/libraries/speexdsp/default.nix
    M pkgs/development/libraries/ucommon/default.nix
    M pkgs/development/libraries/vulkan-loader/default.nix
    R pkgs/development/libraries/wxGTK-2.8/default.nix
    R pkgs/development/libraries/wxGTK-2.9/default.nix
    R pkgs/development/libraries/wxGTK-3.0/default.nix
    R pkgs/development/libraries/wxmac/default.nix
    A pkgs/development/libraries/wxwidgets/2.8/default.nix
    A pkgs/development/libraries/wxwidgets/2.9/default.nix
    A pkgs/development/libraries/wxwidgets/3.0/default.nix
    A pkgs/development/libraries/wxwidgets/3.0/mac.nix
    M pkgs/development/libraries/xalanc/default.nix
    M pkgs/development/libraries/xml-security-c/default.nix
    A pkgs/development/libraries/xml-tooling-c/default.nix
    M pkgs/development/libraries/zimg/default.nix
    M pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
    M pkgs/development/mobile/androidenv/platforms-linux.nix
    M pkgs/development/mobile/androidenv/platforms-macosx.nix
    M pkgs/development/node-packages/README.md
    M pkgs/development/ocaml-modules/base/default.nix
    M pkgs/development/ocaml-modules/functoria/default.nix
    M pkgs/development/ocaml-modules/llvm/default.nix
    A pkgs/development/ocaml-modules/merlin_extend/default.nix
    M pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
    M pkgs/development/ocaml-modules/ocurl/default.nix
    A pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
    M pkgs/development/ocaml-modules/spacetime_lib/default.nix
    A pkgs/development/perl-modules/File-Slurp/silence-deprecation.patch
    A pkgs/development/python-modules/APScheduler/default.nix
    A pkgs/development/python-modules/Wand/default.nix
    A pkgs/development/python-modules/Wand/libraries.patch
    A pkgs/development/python-modules/asn1crypto/default.nix
    M pkgs/development/python-modules/astroid/default.nix
    M pkgs/development/python-modules/bcrypt.nix
    A pkgs/development/python-modules/coveralls/default.nix
    A pkgs/development/python-modules/django-compat/default.nix
    A pkgs/development/python-modules/django/1_11.nix
    M pkgs/development/python-modules/django_guardian.nix
    A pkgs/development/python-modules/dkimpy/default.nix
    A pkgs/development/python-modules/dogpile.cache/default.nix
    A pkgs/development/python-modules/ezdxf/default.nix
    A pkgs/development/python-modules/flask-restplus/0.8.nix
    A pkgs/development/python-modules/guessit/default.nix
    A pkgs/development/python-modules/httpbin/default.nix
    M pkgs/development/python-modules/hypothesis.nix
    A pkgs/development/python-modules/ipykernel/default.nix
    A pkgs/development/python-modules/ipyparallel/default.nix
    A pkgs/development/python-modules/ipython/5.nix
    A pkgs/development/python-modules/ipython/default.nix
    A pkgs/development/python-modules/ipywidgets/default.nix
    A pkgs/development/python-modules/jedi/default.nix
    A pkgs/development/python-modules/jupyter_client/default.nix
    A pkgs/development/python-modules/kitchen/default.nix
    A pkgs/development/python-modules/line_profiler/default.nix
    M pkgs/development/python-modules/llvmlite/default.nix
    A pkgs/development/python-modules/notebook/default.nix
    M pkgs/development/python-modules/numba/default.nix
    M pkgs/development/python-modules/pandas/default.nix
    A pkgs/development/python-modules/pbr/default.nix
    A pkgs/development/python-modules/plumbum/default.nix
    M pkgs/development/python-modules/pycryptodome/default.nix
    M pkgs/development/python-modules/pylint/default.nix
    M pkgs/development/python-modules/pyside/apiextractor.nix
    M pkgs/development/python-modules/pyside/default.nix
    M pkgs/development/python-modules/pyside/generatorrunner.nix
    M pkgs/development/python-modules/pyside/shiboken.nix
    M pkgs/development/python-modules/pyside/tools.nix
    A pkgs/development/python-modules/pyspread/default.nix
    A pkgs/development/python-modules/pytest-httpbin/default.nix
    M pkgs/development/python-modules/pytest/default.nix
    A pkgs/development/python-modules/qtconsole/default.nix
    A pkgs/development/python-modules/statsmodels/default.nix
    A pkgs/development/python-modules/tqdm/default.nix
    A pkgs/development/python-modules/vcrpy/default.nix
    A pkgs/development/python-modules/widgetsnbextension/default.nix
    M pkgs/development/python-modules/wxPython/3.0.nix
    A pkgs/development/python-modules/xarray/default.nix
    A pkgs/development/python-modules/zxcvbn-python/default.nix
    M pkgs/development/r-modules/README.md
    M pkgs/development/r-modules/bioc-packages.nix
    M pkgs/development/r-modules/cran-packages.nix
    M pkgs/development/r-modules/default.nix
    M pkgs/development/r-modules/generate-shell.nix
    M pkgs/development/ruby-modules/bundix/default.nix
    M pkgs/development/ruby-modules/gem-config/default.nix
    M pkgs/development/tools/ammonite/default.nix
    M pkgs/development/tools/backblaze-b2/default.nix
    M pkgs/development/tools/boomerang/default.nix
    A pkgs/development/tools/boomerang/fix-install.patch
    A pkgs/development/tools/boomerang/fix-output.patch
    A pkgs/development/tools/build-managers/doit/default.nix
    M pkgs/development/tools/build-managers/meson/default.nix
    M pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
    M pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix
    M pkgs/development/tools/continuous-integration/jenkins/default.nix
    M pkgs/development/tools/misc/binutils/default.nix
    A pkgs/development/tools/misc/premake/5.nix
    M pkgs/development/tools/misc/sysbench/default.nix
    M pkgs/development/tools/ocaml/cppo/default.nix
    M pkgs/development/tools/ocaml/utop/default.nix
    M pkgs/development/tools/parsing/antlr/3.4.nix
    M pkgs/development/tools/parsing/byacc/default.nix
    M pkgs/development/tools/rust/bindgen/default.nix
    M pkgs/development/tools/yarn/default.nix
    M pkgs/games/factorio/default.nix
    M pkgs/games/factorio/fetch.nix
    M pkgs/games/mudlet/libs.patch
    M pkgs/misc/emulators/wine/sources.nix
    M pkgs/misc/screensavers/xlockmore/default.nix
    M pkgs/misc/uboot/default.nix
    M pkgs/misc/vim-plugins/default.nix
    M pkgs/misc/vim-plugins/vim-plugin-names
    M pkgs/misc/xosd/default.nix
    M pkgs/os-specific/darwin/ios-cross/default.nix
    M pkgs/os-specific/linux/amdgpu-pro/default.nix
    M pkgs/os-specific/linux/amdgpu-pro/patches/0001-disable-firmware-copy.patch
    M pkgs/os-specific/linux/amdgpu-pro/patches/0002-linux-4.9-fixes.patch
    M 
pkgs/os-specific/linux/amdgpu-pro/patches/0003-Change-seq_printf-format-for-64-bit-context.patch
    M 
pkgs/os-specific/linux/amdgpu-pro/patches/0004-fix-warnings-for-Werror.patch
    M pkgs/os-specific/linux/bluez/bluez5.nix
    M pkgs/os-specific/linux/bridge-utils/default.nix
    M pkgs/os-specific/linux/facetimehd/default.nix
    M pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix
    M pkgs/os-specific/linux/guvcview/default.nix
    A pkgs/os-specific/linux/ioport/default.nix
    M pkgs/os-specific/linux/kbd/default.nix
    R pkgs/os-specific/linux/kernel-headers/3.18.nix
    R 
pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.14.patch
    R pkgs/os-specific/linux/kernel/chromiumos-patches/mfd-fix-dependency.patch
    R pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix
    R pkgs/os-specific/linux/kernel/grsecurity-nixos-kmod.patch
    A pkgs/os-specific/linux/kernel/hardened-config.nix
    M pkgs/os-specific/linux/kernel/linux-4.10.nix
    M pkgs/os-specific/linux/kernel/linux-4.4.nix
    M pkgs/os-specific/linux/kernel/linux-4.9.nix
    R pkgs/os-specific/linux/kernel/linux-chromiumos-3.14.nix
    R pkgs/os-specific/linux/kernel/linux-grsecurity.nix
    M pkgs/os-specific/linux/kernel/linux-mptcp.nix
    M pkgs/os-specific/linux/kernel/patches.nix
    M pkgs/os-specific/linux/lvm2/default.nix
    M pkgs/os-specific/linux/nvidia-x11/generic.nix
    M pkgs/os-specific/linux/nvidia-x11/legacy173.nix
    M pkgs/os-specific/linux/nvidia-x11/persistenced.nix
    M pkgs/os-specific/linux/nvidia-x11/settings.nix
    M pkgs/os-specific/linux/rtkit/default.nix
    A pkgs/os-specific/linux/upstart/check-config.nix
    M pkgs/os-specific/linux/upstart/default.nix
    M pkgs/os-specific/linux/util-linux/default.nix
    M pkgs/os-specific/linux/wireguard/default.nix
    M pkgs/os-specific/linux/zfs/default.nix
    M pkgs/os-specific/windows/mingw-w64/default.nix
    M pkgs/os-specific/windows/mingwrt/default.nix
    M pkgs/os-specific/windows/w32api/default.nix
    M pkgs/servers/asterisk/default.nix
    M pkgs/servers/atlassian/confluence.nix
    M pkgs/servers/atlassian/jira.nix
    A pkgs/servers/clickhouse/default.nix
    A pkgs/servers/clickhouse/prefix.patch
    A pkgs/servers/clickhouse/termcap.patch
    M pkgs/servers/dns/knot-resolver/default.nix
    M pkgs/servers/etcd/default.nix
    R pkgs/servers/etcd/deps.nix
    M pkgs/servers/http/nginx/mainline.nix
    M pkgs/servers/jackett/default.nix
    M pkgs/servers/monitoring/grafana/default.nix
    M pkgs/servers/monitoring/longview/default.nix
    M pkgs/servers/monitoring/prometheus/alertmanager.nix
    M pkgs/servers/monitoring/prometheus/node-exporter.nix
    M pkgs/servers/nosql/eventstore/default.nix
    M pkgs/servers/pulseaudio/default.nix
    M pkgs/servers/radicale/default.nix
    M pkgs/servers/rt/default.nix
    M pkgs/servers/sip/sipwitch/default.nix
    A pkgs/servers/sql/percona/5.6.x.nix
    M pkgs/servers/tvheadend/default.nix
    M pkgs/servers/web-apps/wallabag/default.nix
    M pkgs/servers/web-apps/wordpress/default.nix
    M pkgs/servers/xmpp/pyIRCt/default.nix
    M pkgs/servers/xmpp/pyMAILt/default.nix
    M pkgs/shells/mksh/default.nix
    M pkgs/shells/oh-my-zsh/default.nix
    M pkgs/stdenv/adapters.nix
    M pkgs/stdenv/booter.nix
    M pkgs/stdenv/cross/default.nix
    M pkgs/stdenv/darwin/default.nix
    M pkgs/stdenv/generic/default.nix
    M pkgs/stdenv/generic/setup.sh
    M pkgs/stdenv/linux/default.nix
    M pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
    M pkgs/tools/X11/xpra/default.nix
    M pkgs/tools/bluetooth/blueman/default.nix
    M pkgs/tools/compression/lhasa/default.nix
    M pkgs/tools/graphics/icoutils/default.nix
    M pkgs/tools/inputmethods/anthy/default.nix
    M pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
    M pkgs/tools/misc/asciinema/default.nix
    M pkgs/tools/misc/bc/default.nix
    R pkgs/tools/misc/bc/readlinefix.patch
    M pkgs/tools/misc/desktop-file-utils/default.nix
    M pkgs/tools/misc/fzf/default.nix
    M pkgs/tools/misc/fzf/deps.nix
    M pkgs/tools/misc/grc/default.nix
    M pkgs/tools/misc/qt5ct/default.nix
    A pkgs/tools/misc/radeon-profile/default.nix
    M pkgs/tools/misc/system-config-printer/default.nix
    M pkgs/tools/misc/vdirsyncer/default.nix
    M pkgs/tools/misc/youtube-dl/default.nix
    M pkgs/tools/networking/flvstreamer/default.nix
    M pkgs/tools/networking/i2pd/default.nix
    M pkgs/tools/networking/miniupnpc/default.nix
    M pkgs/tools/networking/network-manager/default.nix
    A pkgs/tools/networking/nfdump/default.nix
    M pkgs/tools/networking/nzbget/default.nix
    M pkgs/tools/networking/offlineimap/default.nix
    M pkgs/tools/package-management/gx/go/default.nix
    A pkgs/tools/package-management/nix-bundle/default.nix
    A pkgs/tools/package-management/nix-update-source/default.nix
    M pkgs/tools/package-management/nix/default.nix
    A pkgs/tools/security/browserpass/default.nix
    A pkgs/tools/security/masscan/default.nix
    A 
pkgs/tools/security/sshguard/0001-Remove-the-unnecessary-from-ipset-cmds.patch
    A pkgs/tools/security/sshguard/default.nix
    M pkgs/tools/security/tor/default.nix
    M pkgs/tools/system/acct/default.nix
    M pkgs/tools/system/cron/default.nix
    M pkgs/tools/system/efibootmgr/default.nix
    M pkgs/tools/system/facter/default.nix
    M pkgs/tools/system/runit/default.nix
    A pkgs/tools/text/papertrail/Gemfile
    A pkgs/tools/text/papertrail/Gemfile.lock
    A pkgs/tools/text/papertrail/default.nix
    A pkgs/tools/text/papertrail/gemset.nix
    A pkgs/tools/text/papertrail/shell.nix
    M pkgs/tools/text/patchutils/default.nix
    A pkgs/tools/text/patchutils/drop-comments.patch
    M pkgs/tools/text/platinum-searcher/default.nix
    M pkgs/tools/text/platinum-searcher/deps.nix
    M pkgs/tools/text/proselint/default.nix
    M pkgs/tools/text/ripgrep/default.nix
    M pkgs/tools/text/source-highlight/default.nix
    M pkgs/tools/typesetting/tex/tetex/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/impure.nix
    M pkgs/top-level/ocaml-packages.nix
    M pkgs/top-level/perl-packages.nix
    M pkgs/top-level/python-packages.nix
    M pkgs/top-level/release-cross.nix
    M pkgs/top-level/splice.nix
    M pkgs/top-level/stage.nix

  Log Message:
  -----------
  Merge branch 'master' into ocaml-utop


  Commit: 6955d023092285457e479a56d6af6a9c46b26fc4
      
https://github.com/NixOS/nixpkgs/commit/6955d023092285457e479a56d6af6a9c46b26fc4
  Author: Michael Raskin <7c6f4...@mail.ru>
  Date:   2017-05-01 (Mon, 01 May 2017)

  Changed paths:
    M pkgs/development/ocaml-modules/lambda-term/default.nix
    M pkgs/development/ocaml-modules/lwt/default.nix
    M pkgs/development/tools/ocaml/utop/default.nix

  Log Message:
  -----------
  Merge pull request #25122 from pmahoney/ocaml-utop

ocamlPackages.utop: fix environment variables


Compare: https://github.com/NixOS/nixpkgs/compare/69250aa4ee24...6955d0230922
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to