Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 5eb75ce205ac00b1a2403425b6b195627da0f699
      
https://github.com/NixOS/nixpkgs/commit/5eb75ce205ac00b1a2403425b6b195627da0f699
  Author: Matthew Bauer <[email protected]>
  Date:   2017-04-09 (Sun, 09 Apr 2017)

  Changed paths:
    M pkgs/development/tools/xcbuild/platform.nix

  Log Message:
  -----------
  xcbuild: add app bundle specs


  Commit: a78af29ae7e7d2d0c0737271cfdb0ff710493e1d
      
https://github.com/NixOS/nixpkgs/commit/a78af29ae7e7d2d0c0737271cfdb0ff710493e1d
  Author: Matthew Bauer <[email protected]>
  Date:   2017-04-09 (Sun, 09 Apr 2017)

  Changed paths:
    R pkgs/os-specific/darwin/install_name_tool/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  install_name_tool: remove

cctools provides install_name_tool


  Commit: 38fa9910642bc819484726aec596f4827b10ba2f
      
https://github.com/NixOS/nixpkgs/commit/38fa9910642bc819484726aec596f4827b10ba2f
  Author: Matthew Bauer <[email protected]>
  Date:   2017-04-09 (Sun, 09 Apr 2017)

  Changed paths:
    M pkgs/tools/security/pinentry-mac/default.nix

  Log Message:
  -----------
  pinentry_mac: use xcbuild


  Commit: 34422f428d583f57b3cbdaf6bbcc1e0ca61662c4
      
https://github.com/NixOS/nixpkgs/commit/34422f428d583f57b3cbdaf6bbcc1e0ca61662c4
  Author: Matthew Bauer <[email protected]>
  Date:   2017-04-09 (Sun, 09 Apr 2017)

  Changed paths:
    M pkgs/development/tools/xcbuild/toolchain.nix
    A pkgs/os-specific/darwin/ibtool/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  ibtool: add to toolchain

- init package
- add into xcbuild/toolchain.nix


  Commit: 87e6b2c50fb4520d9ef910418f3c686d830dc3df
      
https://github.com/NixOS/nixpkgs/commit/87e6b2c50fb4520d9ef910418f3c686d830dc3df
  Author: Matthew Bauer <[email protected]>
  Date:   2017-04-09 (Sun, 09 Apr 2017)

  Changed paths:
    M pkgs/development/tools/xcbuild/platform.nix
    M pkgs/development/tools/xcbuild/wrapper.nix

  Log Message:
  -----------
  xcbuild: try to fix sdk not found

This is an attempt to get rid of the issues with sdk not found in
xcbuild when building pinentry_mac.


  Commit: 785f6ce5d66505661ee416adc8ca0ef99fa38424
      
https://github.com/NixOS/nixpkgs/commit/785f6ce5d66505661ee416adc8ca0ef99fa38424
  Author: Andrew R. M <[email protected]>
  Date:   2017-04-10 (Mon, 10 Apr 2017)

  Changed paths:
    M pkgs/tools/security/pass/default.nix
    A pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch

  Log Message:
  -----------
  pass: Fix clipboard functionality

Add the patch that was removed that allows pass's clip() function to
work with single binary coreutils. This version of the patch is also
applied to darwin.sh, so this should fix the clipboard functionality in
darwin as well.


  Commit: 769b991be6c44292c09cc2a6a3f5d882b6110ec0
      
https://github.com/NixOS/nixpkgs/commit/769b991be6c44292c09cc2a6a3f5d882b6110ec0
  Author: Aneesh Agrawal <[email protected]>
  Date:   2017-04-10 (Mon, 10 Apr 2017)

  Changed paths:
    M nixos/modules/services/networking/ssh/sshd.nix
    M pkgs/tools/networking/openssh/default.nix

  Log Message:
  -----------
  openssh: 7.4p1 -> 7.5p1

Release notes are available at https://www.openssh.com/txt/release-7.5.
Mostly a bugfix release, no major backwards-incompatible changes.

Remove deprecated `UsePrivilegeSeparation` option,
which is now mandatory.


  Commit: 47a5f9acee9d75c7549802a2526013631510403d
      
https://github.com/NixOS/nixpkgs/commit/47a5f9acee9d75c7549802a2526013631510403d
  Author: Benjamin Staffin <[email protected]>
  Date:   2017-04-10 (Mon, 10 Apr 2017)

  Changed paths:
    M nixos/modules/services/networking/networkmanager.nix

  Log Message:
  -----------
  nixos: Add nm-openvpn to the networkmanager group

This is to satisfy the polkit restriction limiting
org.freedesktop.NetworkManager.* dbus messages to members of that
group.

Should help with #24806


  Commit: 5db1fe64c0a30e8a10cfb524018a471df2bbc3fa
      
https://github.com/NixOS/nixpkgs/commit/5db1fe64c0a30e8a10cfb524018a471df2bbc3fa
  Author: Benjamin Staffin <[email protected]>
  Date:   2017-04-10 (Mon, 10 Apr 2017)

  Changed paths:
    A pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch
    M pkgs/desktops/plasma-5/plasma-nm/default.nix

  Log Message:
  -----------
  plasma-nm: patch in the correct path to openvpn executable

Fixes #24808


  Commit: 7c75940c5e63161fbb6e75c1f8b204fca60e7dcd
      
https://github.com/NixOS/nixpkgs/commit/7c75940c5e63161fbb6e75c1f8b204fca60e7dcd
  Author: Benjamin Staffin <[email protected]>
  Date:   2017-04-10 (Mon, 10 Apr 2017)

  Changed paths:
    M pkgs/desktops/plasma-5/plasma-nm/default.nix

  Log Message:
  -----------
  plasma-nm: enable parallel building

This thing takes a long time to build.


  Commit: f1fdc988844926f90c855f55b66955d61034569a
      
https://github.com/NixOS/nixpkgs/commit/f1fdc988844926f90c855f55b66955d61034569a
  Author: Matthew Bauer <[email protected]>
  Date:   2017-04-11 (Tue, 11 Apr 2017)

  Changed paths:
    M pkgs/development/libraries/pugixml/default.nix
    R pkgs/development/libraries/pugixml/no-long-long.patch

  Log Message:
  -----------
  pugixml: fixup darwin


  Commit: c178ee4726f2123515b47e7853442e16ec3883ed
      
https://github.com/NixOS/nixpkgs/commit/c178ee4726f2123515b47e7853442e16ec3883ed
  Author: Daniel Brockman <[email protected]>
  Date:   2017-04-11 (Tue, 11 Apr 2017)

  Changed paths:
    M pkgs/applications/altcoins/ethabi.nix

  Log Message:
  -----------
  ethabi: 0.2.1 -> 1.0.4


  Commit: bb2eb5b0e8d18424e87918819c9291f3b697e92f
      
https://github.com/NixOS/nixpkgs/commit/bb2eb5b0e8d18424e87918819c9291f3b697e92f
  Author: Matthew Bauer <[email protected]>
  Date:   2017-04-11 (Tue, 11 Apr 2017)

  Changed paths:
    A pkgs/development/tools/ibtool/default.nix
    A pkgs/development/tools/ibtool/nsplist.nix
    A pkgs/development/tools/ibtool/plist-cpp.nix
    R pkgs/os-specific/darwin/ibtool/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  ibtool: use xib2nib src


  Commit: 3ab45f4b369c9c741b55ddedeaac4c797dc61c04
      
https://github.com/NixOS/nixpkgs/commit/3ab45f4b369c9c741b55ddedeaac4c797dc61c04
  Author: Franz Pletz <[email protected]>
  Date:   2017-04-11 (Tue, 11 Apr 2017)

  Changed paths:
    M lib/trivial.nix
    M nixos/modules/config/fonts/fontconfig-penultimate.nix
    M nixos/modules/config/fonts/fontconfig.nix
    M nixos/modules/services/cluster/kubernetes.nix
    M nixos/modules/services/continuous-integration/hydra/default.nix
    M nixos/modules/services/databases/cassandra.nix
    M nixos/modules/services/databases/mongodb.nix
    M nixos/modules/services/logging/graylog.nix
    M nixos/modules/services/misc/cgminer.nix
    M nixos/modules/services/misc/confd.nix
    M nixos/modules/services/misc/matrix-synapse.nix
    M nixos/modules/services/misc/nix-daemon.nix
    M nixos/modules/services/misc/taskserver/default.nix
    M nixos/modules/services/monitoring/collectd.nix
    M nixos/modules/services/monitoring/grafana.nix
    M nixos/modules/services/network-filesystems/netatalk.nix
    M nixos/modules/services/network-filesystems/samba.nix
    M nixos/modules/services/network-filesystems/tahoe.nix
    M nixos/modules/services/networking/aiccu.nix
    M nixos/modules/services/networking/btsync.nix
    M nixos/modules/services/networking/firefox/sync-server.nix
    M nixos/modules/services/networking/i2pd.nix
    M nixos/modules/services/networking/ircd-hybrid/default.nix
    M nixos/modules/services/networking/mosquitto.nix
    M nixos/modules/services/networking/murmur.nix
    M nixos/modules/services/networking/prosody.nix
    M nixos/modules/services/networking/sslh.nix
    M nixos/modules/services/networking/znc.nix
    M nixos/modules/services/security/oauth2_proxy.nix
    M nixos/modules/services/torrent/transmission.nix
    M nixos/modules/services/web-apps/atlassian/crowd.nix
    M nixos/modules/services/web-apps/quassel-webserver.nix
    M nixos/modules/services/web-apps/tt-rss.nix
    M nixos/modules/services/x11/display-managers/sddm.nix
    M nixos/modules/services/x11/hardware/multitouch.nix
    M pkgs/development/java-modules/build-maven-package.nix
    M pkgs/development/ocaml-modules/mtime/default.nix
    M pkgs/development/ocaml-modules/nocrypto/default.nix
    M pkgs/development/ocaml-modules/notty/default.nix
    M pkgs/development/ocaml-modules/vg/default.nix

  Log Message:
  -----------
  treewide: use boolToString function


  Commit: c90058e7748e95f01ceed9544c14fbf753fe77f0
      
https://github.com/NixOS/nixpkgs/commit/c90058e7748e95f01ceed9544c14fbf753fe77f0
  Author: Matthew Bauer <[email protected]>
  Date:   2017-04-12 (Wed, 12 Apr 2017)

  Changed paths:
    M pkgs/development/tools/ibtool/default.nix

  Log Message:
  -----------
  ibtool: update to newer hash


  Commit: 457570f61a2fdad28d56117c0dc7d285a5c06236
      
https://github.com/NixOS/nixpkgs/commit/457570f61a2fdad28d56117c0dc7d285a5c06236
  Author: Matthew Bauer <[email protected]>
  Date:   2017-04-12 (Wed, 12 Apr 2017)

  Changed paths:
    M pkgs/tools/security/pinentry-mac/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  pinentry_mac: switch to pure version

Fixes #24734


  Commit: f6860a6685553098bd7c295f0d435ec934ae7cef
      
https://github.com/NixOS/nixpkgs/commit/f6860a6685553098bd7c295f0d435ec934ae7cef
  Author: Matthew Bauer <[email protected]>
  Date:   2017-04-12 (Wed, 12 Apr 2017)

  Changed paths:
    M pkgs/development/tools/xcbuild/platform.nix

  Log Message:
  -----------
  xcbuild: remove unnecessary flags


  Commit: d697e5c8ee16c4a364aedf0d0ecde1fd9e4c9c9e
      
https://github.com/NixOS/nixpkgs/commit/d697e5c8ee16c4a364aedf0d0ecde1fd9e4c9c9e
  Author: Matthew Bauer <[email protected]>
  Date:   2017-04-12 (Wed, 12 Apr 2017)

  Changed paths:
    R pkgs/development/tools/ibtool/default.nix
    R pkgs/development/tools/ibtool/nsplist.nix
    R pkgs/development/tools/ibtool/plist-cpp.nix
    M pkgs/development/tools/xcbuild/toolchain.nix
    A pkgs/development/tools/xib2nib/default.nix
    A pkgs/development/tools/xib2nib/nsplist.nix
    A pkgs/development/tools/xib2nib/plist-cpp.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  ibtool: rename xib2nib


  Commit: 1781ec934f5a815d13b768a77a4bde8798db26d3
      
https://github.com/NixOS/nixpkgs/commit/1781ec934f5a815d13b768a77a4bde8798db26d3
  Author: Matthew Bauer <[email protected]>
  Date:   2017-04-12 (Wed, 12 Apr 2017)

  Changed paths:
    A pkgs/development/libraries/NSPlist/default.nix
    A pkgs/development/libraries/PlistCpp/default.nix
    M pkgs/development/tools/xib2nib/default.nix
    R pkgs/development/tools/xib2nib/nsplist.nix
    R pkgs/development/tools/xib2nib/plist-cpp.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  xib2nib: move nsplist, plistcpp to own folder

These libraries could be used by other packages so list them in
all-packages.nix as well.


  Commit: 3d1d805245c1b0788e1ce4a01d8455e30ac15739
      
https://github.com/NixOS/nixpkgs/commit/3d1d805245c1b0788e1ce4a01d8455e30ac15739
  Author: Matthew Bauer <[email protected]>
  Date:   2017-04-12 (Wed, 12 Apr 2017)

  Changed paths:
    M pkgs/development/tools/xcbuild/platform.nix
    M pkgs/development/tools/xcbuild/wrapper.nix

  Log Message:
  -----------
  Revert "xcbuild: try to fix sdk not found"

This reverts commit 87e6b2c50fb4520d9ef910418f3c686d830dc3df.


  Commit: 6239da6ade413ce89503d608c9b827ac17359e64
      
https://github.com/NixOS/nixpkgs/commit/6239da6ade413ce89503d608c9b827ac17359e64
  Author: Matthias Beyer <[email protected]>
  Date:   2017-04-12 (Wed, 12 Apr 2017)

  Changed paths:
    A pkgs/applications/science/biology/diamond/default.nix
    A pkgs/applications/science/biology/diamond/diamond-0.8.36-no-warning.patch
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  diamond: init at 0.8.36


  Commit: 13e9cc15f147fd2f472a53c4b40588f48b73e0b5
      
https://github.com/NixOS/nixpkgs/commit/13e9cc15f147fd2f472a53c4b40588f48b73e0b5
  Author: Tristan Helmich <[email protected]>
  Date:   2017-04-12 (Wed, 12 Apr 2017)

  Changed paths:
    M nixos/modules/services/networking/smokeping.nix

  Log Message:
  -----------
  smokeping service: restart on-failure


  Commit: f08e89d2568925d4b94f1d62d6a2f9e4e8a57fbc
      
https://github.com/NixOS/nixpkgs/commit/f08e89d2568925d4b94f1d62d6a2f9e4e8a57fbc
  Author: Lengyel Balázs <[email protected]>
  Date:   2017-04-12 (Wed, 12 Apr 2017)

  Changed paths:
    M pkgs/applications/networking/browsers/chromium/plugins.nix

  Log Message:
  -----------
  chromium: flashplayer: 25.0.0.127 -> 25.0.0.148


  Commit: f94e0a0dc72dc718c424d2992ce17ccc2eacbab2
      
https://github.com/NixOS/nixpkgs/commit/f94e0a0dc72dc718c424d2992ce17ccc2eacbab2
  Author: laMudri <[email protected]>
  Date:   2017-04-12 (Wed, 12 Apr 2017)

  Changed paths:
    M pkgs/applications/networking/mailreaders/thunderbird/default.nix

  Log Message:
  -----------
  thunderbird: add option to enable calendar


  Commit: 75f1a55fbe8a98b497828fd77f6c117d587a62da
      
https://github.com/NixOS/nixpkgs/commit/75f1a55fbe8a98b497828fd77f6c117d587a62da
  Author: Eelco Dolstra <[email protected]>
  Date:   2017-04-12 (Wed, 12 Apr 2017)

  Changed paths:
    M pkgs/applications/networking/mailreaders/thunderbird/default.nix

  Log Message:
  -----------
  Merge pull request #24851 from laMudri/thunderbird-calendar

thunderbird: add option to enable calendar


  Commit: e2abd55a3b4e4b758f4397feeb344674cf114d1c
      
https://github.com/NixOS/nixpkgs/commit/e2abd55a3b4e4b758f4397feeb344674cf114d1c
  Author: Sean Haugh <[email protected]>
  Date:   2017-04-12 (Wed, 12 Apr 2017)

  Changed paths:
    M lib/licenses.nix

  Log Message:
  -----------
  licenses: add MirOS license


  Commit: 5eb098dbd84320b004fcc51e4a6c47ce362e0514
      
https://github.com/NixOS/nixpkgs/commit/5eb098dbd84320b004fcc51e4a6c47ce362e0514
  Author: Yann Hodique <[email protected]>
  Date:   2017-04-12 (Wed, 12 Apr 2017)

  Changed paths:
    M pkgs/applications/misc/hugo/default.nix
    M pkgs/applications/misc/hugo/deps.nix

  Log Message:
  -----------
  hugo: 0.18.1 -> 0.20


  Commit: 80c295f50fe42a6df48d4504b0bd8420ed04e75d
      
https://github.com/NixOS/nixpkgs/commit/80c295f50fe42a6df48d4504b0bd8420ed04e75d
  Author: Fernando J Pando <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    A pkgs/development/python-modules/distro/default.nix
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  pythonPackages.distro: init 1.0.3

- tested on darwin
- tested on nixos


  Commit: c919ceda06dad76968a27050b1091492c363156e
      
https://github.com/NixOS/nixpkgs/commit/c919ceda06dad76968a27050b1091492c363156e
  Author: Sean Haugh <[email protected]>
  Date:   2017-04-12 (Wed, 12 Apr 2017)

  Changed paths:
    A pkgs/data/fonts/envypn-font/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  envypn-font: init at 1.7.1


  Commit: 416337b95c8adfcd2072be4a4b577f613f8af742
      
https://github.com/NixOS/nixpkgs/commit/416337b95c8adfcd2072be4a4b577f613f8af742
  Author: Tim Steinbach <[email protected]>
  Date:   2017-04-12 (Wed, 12 Apr 2017)

  Changed paths:
    M pkgs/applications/editors/atom/default.nix

  Log Message:
  -----------
  atom: 1.15.0 -> 1.16.0


  Commit: 47e82ef817a170186037fa4294d8c858fc9e2b06
      
https://github.com/NixOS/nixpkgs/commit/47e82ef817a170186037fa4294d8c858fc9e2b06
  Author: Tim Steinbach <[email protected]>
  Date:   2017-04-12 (Wed, 12 Apr 2017)

  Changed paths:
    M pkgs/development/tools/build-managers/gradle/default.nix

  Log Message:
  -----------
  gradle: 3.4.1 -> 3.5


  Commit: 1fd7bf9ee3e7e26526aca139ea881afd478932c3
      
https://github.com/NixOS/nixpkgs/commit/1fd7bf9ee3e7e26526aca139ea881afd478932c3
  Author: Dan Peebles <[email protected]>
  Date:   2017-04-12 (Wed, 12 Apr 2017)

  Changed paths:
    M pkgs/applications/editors/nano/default.nix

  Log Message:
  -----------
  nano: remove unnecessary Darwin-specific behavior

It seems to compile just fine without this now that we're on 2.8.1


  Commit: 4672fe6998c04b7f8b56785b7bc42efc9f013d2f
      
https://github.com/NixOS/nixpkgs/commit/4672fe6998c04b7f8b56785b7bc42efc9f013d2f
  Author: Matthew Bauer <[email protected]>
  Date:   2017-04-12 (Wed, 12 Apr 2017)

  Changed paths:
    M pkgs/tools/security/pinentry-mac/default.nix

  Log Message:
  -----------
  pinentry_mac: use precompiled .nib's

sadly, xib2nib hasn't been working like i though. I've just
precompiled into our modified pinentry_mac. Eventually we can get this
fixed but it's not as easy as first thought.


  Commit: 9e5fe7738a5abdd2357c3d72899ca1712a36de3a
      
https://github.com/NixOS/nixpkgs/commit/9e5fe7738a5abdd2357c3d72899ca1712a36de3a
  Author: Matthew Bauer <[email protected]>
  Date:   2017-04-12 (Wed, 12 Apr 2017)

  Changed paths:
    M pkgs/development/libraries/NSPlist/default.nix
    M pkgs/development/libraries/PlistCpp/default.nix
    M pkgs/development/tools/xib2nib/default.nix

  Log Message:
  -----------
  xib2nib: add meta

also:
- NSPlist
- PlistCpp


  Commit: acf45e0f9ce28107b1218414d05c93287b97f59b
      
https://github.com/NixOS/nixpkgs/commit/acf45e0f9ce28107b1218414d05c93287b97f59b
  Author: mucaho <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    A pkgs/development/python-modules/pluginbase/default.nix
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  pythonPackages.pluginbase: init at 0.5


  Commit: fe2ced1ea895a224b97a4d3cfb47782cdd0ceb0a
      
https://github.com/NixOS/nixpkgs/commit/fe2ced1ea895a224b97a4d3cfb47782cdd0ceb0a
  Author: mucaho <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    A pkgs/development/python-modules/node-semver/default.nix
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  pythonPackages.node-semver: init at 0.1.1


  Commit: 8d5e55a0f0b1c546ec69701a54a6cd43c4aa5339
      
https://github.com/NixOS/nixpkgs/commit/8d5e55a0f0b1c546ec69701a54a6cd43c4aa5339
  Author: mucaho <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    A pkgs/development/tools/build-managers/conan/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  conan: init at 0.21.2


  Commit: f21a6940da9a70b25506069943eccdc0855750f3
      
https://github.com/NixOS/nixpkgs/commit/f21a6940da9a70b25506069943eccdc0855750f3
  Author: Daniel Peebles <[email protected]>
  Date:   2017-04-12 (Wed, 12 Apr 2017)

  Changed paths:
    A pkgs/development/libraries/NSPlist/default.nix
    A pkgs/development/libraries/PlistCpp/default.nix
    M pkgs/development/libraries/pugixml/default.nix
    R pkgs/development/libraries/pugixml/no-long-long.patch
    M pkgs/development/tools/xcbuild/platform.nix
    M pkgs/development/tools/xcbuild/toolchain.nix
    A pkgs/development/tools/xib2nib/default.nix
    R pkgs/os-specific/darwin/install_name_tool/default.nix
    M pkgs/tools/security/pinentry-mac/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  Merge pull request #24838 from matthewbauer/ibtool

pinentry_mac: use xcbuild


  Commit: b306e672a18aa3fccc58eebf6e329df851db0ae8
      
https://github.com/NixOS/nixpkgs/commit/b306e672a18aa3fccc58eebf6e329df851db0ae8
  Author: Andrew Cann <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    M pkgs/applications/altcoins/default.nix
    A pkgs/applications/altcoins/hivemind.nix

  Log Message:
  -----------
  hivemind: init at git-2017-04-13

Hivemind is a peer-to-peer oracle protocol which absorbs accurate data
into a blockchain so that bitcoin-users can speculate in prediction
markets.


  Commit: 300c59c7fc5ace2080c1a7422aabb4abaa7ac2ea
      
https://github.com/NixOS/nixpkgs/commit/300c59c7fc5ace2080c1a7422aabb4abaa7ac2ea
  Author: Jörg Thalheim <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    A pkgs/development/python-modules/distro/default.nix
    A pkgs/development/python-modules/node-semver/default.nix
    A pkgs/development/python-modules/pluginbase/default.nix
    A pkgs/development/tools/build-managers/conan/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  Merge pull request #24865 from mucaho/conan

conan: init at 0.21.2


  Commit: 42d7fa2c7160d513c9e043b9f6e1ba6b58b4deaa
      
https://github.com/NixOS/nixpkgs/commit/42d7fa2c7160d513c9e043b9f6e1ba6b58b4deaa
  Author: Andrew Cann <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    M pkgs/applications/altcoins/hivemind.nix

  Log Message:
  -----------
  hivemind: rename unstable package


  Commit: 60b588a5474141de4710113b4ad45b57e285099f
      
https://github.com/NixOS/nixpkgs/commit/60b588a5474141de4710113b4ad45b57e285099f
  Author: Jörg Thalheim <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    M pkgs/applications/altcoins/default.nix
    A pkgs/applications/altcoins/hivemind.nix

  Log Message:
  -----------
  Merge pull request #24867 from canndrew/hivemind

hivemind: init at git-2017-04-13


  Commit: d8e810e049e6211a9af39056900446a4c729261a
      
https://github.com/NixOS/nixpkgs/commit/d8e810e049e6211a9af39056900446a4c729261a
  Author: Jörg Thalheim <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    M lib/licenses.nix
    A pkgs/data/fonts/envypn-font/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #24857 from sphaugh/master

envypn: init at 1.7.1 (+ MirOS license)


  Commit: 9223fde9f39c279e7f9a099b253f2a78625ef95b
      
https://github.com/NixOS/nixpkgs/commit/9223fde9f39c279e7f9a099b253f2a78625ef95b
  Author: Jörg Thalheim <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    M nixos/modules/services/networking/smokeping.nix

  Log Message:
  -----------
  Merge pull request #24843 from mayflower/smokeping_service

smokeping service: restart on-failure


  Commit: 5ca7e8a69ae94d4c122c7fa69d77e749e83dbebc
      
https://github.com/NixOS/nixpkgs/commit/5ca7e8a69ae94d4c122c7fa69d77e749e83dbebc
  Author: Jörg Thalheim <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    M nixos/modules/services/scheduling/fcron.nix

  Log Message:
  -----------
  fcron: do not chmod at all

fcron does handle permissions on its own correctly


  Commit: d3c737a080b20638394139948934557d081a6d0a
      
https://github.com/NixOS/nixpkgs/commit/d3c737a080b20638394139948934557d081a6d0a
  Author: Eelco Dolstra <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    M pkgs/development/compilers/gcc/snapshot/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  gcc-snapshot: 7-20161211 -> 7-20170409


  Commit: 73c8797d169efffe2207b79615d4af6294cd097e
      
https://github.com/NixOS/nixpkgs/commit/73c8797d169efffe2207b79615d4af6294cd097e
  Author: Jörg Thalheim <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    M nixos/maintainers/scripts/gce/create-gce.sh
    M pkgs/tools/admin/google-cloud-sdk/default.nix

  Log Message:
  -----------
  gce/create-gce.sh: rewrite using nix-shell shebang and bash (#24869)

* google-cloud-sdk: 150.0.0 -> 151.0.0

- gce/create-gce.sh: rewrite using nix-shell shebang and bash
- allows to run the script without being the same directory
- nix-shell install google-cloud-sdk
- some shellcheck cleanups and scripting best practice
- gce/create-gce.sh: do not clobber NIX_PATH: this allows NIX_PATH to be 
overwritten to build a different release
- gce/create-gce.sh: remove legacy hydra option


  Commit: 15bb499df939674c992b1c42e915821193116af2
      
https://github.com/NixOS/nixpkgs/commit/15bb499df939674c992b1c42e915821193116af2
  Author: Michael Leandersson <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    M pkgs/applications/editors/kakoune/default.nix

  Log Message:
  -----------
  kakoune: 2017-02-09-> 2017-04-12

fixes #24847
fixes #24738


  Commit: d606717588827d26e7838ecb1580bf7928f4369e
      
https://github.com/NixOS/nixpkgs/commit/d606717588827d26e7838ecb1580bf7928f4369e
  Author: Toni Schmidbauer <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    M pkgs/applications/networking/davmail/default.nix

  Log Message:
  -----------
  davmail: 4.7.2 -> 4.8.0


  Commit: 1dee38f259c28f08a9694923301290fa82f5d81f
      
https://github.com/NixOS/nixpkgs/commit/1dee38f259c28f08a9694923301290fa82f5d81f
  Author: Marco Maggesi <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    M pkgs/os-specific/linux/blcr/default.nix

  Log Message:
  -----------
  BLCR 0.8.5b4 *do* work with Linux 3.10.


  Commit: 20fea7f4491919e93dae9b83e861b4bab881f568
      
https://github.com/NixOS/nixpkgs/commit/20fea7f4491919e93dae9b83e861b4bab881f568
  Author: Jörg Thalheim <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    M pkgs/applications/networking/davmail/default.nix

  Log Message:
  -----------
  davmail: remove unrelated files from $out/bin


  Commit: 9f2ba15647559838775c1205ce92554c0d4f46ae
      
https://github.com/NixOS/nixpkgs/commit/9f2ba15647559838775c1205ce92554c0d4f46ae
  Author: Jörg Thalheim <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    M pkgs/applications/networking/davmail/default.nix

  Log Message:
  -----------
  Merge pull request #24668 from tosmi/davmail

davmail: 4.7.2 -> 4.8.0


  Commit: 478e9cdae579906e2bd4e73289a6221eec46e6b9
      
https://github.com/NixOS/nixpkgs/commit/478e9cdae579906e2bd4e73289a6221eec46e6b9
  Author: Jörg Thalheim <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    A pkgs/applications/science/biology/diamond/default.nix
    A pkgs/applications/science/biology/diamond/diamond-0.8.36-no-warning.patch
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #24840 from matthiasbeyer/pr-23111-fixed

diamond: init at 0.8.36


  Commit: dcbb2bf75149adb2ca33b773a85a54e6fddffb61
      
https://github.com/NixOS/nixpkgs/commit/dcbb2bf75149adb2ca33b773a85a54e6fddffb61
  Author: Christoph-Simon Senjak <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    M pkgs/applications/networking/remote/teamviewer/default.nix

  Log Message:
  -----------
  teamviewer: keep RTlib directory

Added the formerly deleted RTlib directory, included its
patchelf commands. Beforehand the client failed, because
TVGuiDelegate did not find all symbols.

fixes #24862


  Commit: 9e212ebcf85bfb578e81690f0e37ef4c3034dd97
      
https://github.com/NixOS/nixpkgs/commit/9e212ebcf85bfb578e81690f0e37ef4c3034dd97
  Author: Tim Steinbach <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    M pkgs/applications/editors/atom/default.nix

  Log Message:
  -----------
  Merge pull request #24863 from NeQuissimus/atom_1_16_0

atom: 1.15.0 -> 1.16.0


  Commit: 3c29b8e7da20080f320a31f1c4032c9d924846ca
      
https://github.com/NixOS/nixpkgs/commit/3c29b8e7da20080f320a31f1c4032c9d924846ca
  Author: Tim Steinbach <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    M pkgs/development/tools/build-managers/gradle/default.nix

  Log Message:
  -----------
  Merge pull request #24864 from NeQuissimus/gradle_3_5

gradle: 3.4.1 -> 3.5


  Commit: 568c09635a2206e600fff7b2eac8be2929c8c5c4
      
https://github.com/NixOS/nixpkgs/commit/568c09635a2206e600fff7b2eac8be2929c8c5c4
  Author: Tim Steinbach <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    M pkgs/applications/misc/hugo/default.nix
    M pkgs/applications/misc/hugo/deps.nix

  Log Message:
  -----------
  Merge pull request #24859 from sigma/pr/hugo

hugo: 0.18.1 -> 0.20


  Commit: cf7a383b610e182af921188e5b67e45293d25c29
      
https://github.com/NixOS/nixpkgs/commit/cf7a383b610e182af921188e5b67e45293d25c29
  Author: Tim Steinbach <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    M pkgs/applications/networking/browsers/chromium/plugins.nix

  Log Message:
  -----------
  Merge pull request #24846 from ikervagyok/pepperflash

chromium: flashplayer: 25.0.0.127 -> 25.0.0.148


  Commit: 68513361f174a92c7954f8e9a54e59885f44d874
      
https://github.com/NixOS/nixpkgs/commit/68513361f174a92c7954f8e9a54e59885f44d874
  Author: Tim Steinbach <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    M pkgs/applications/altcoins/ethabi.nix

  Log Message:
  -----------
  Merge pull request #24818 from dbrock/ethabi

ethabi: 0.2.1 -> 1.0.4


  Commit: c9ba39116c6e85f06cfba9c435fc437591bbca1c
      
https://github.com/NixOS/nixpkgs/commit/c9ba39116c6e85f06cfba9c435fc437591bbca1c
  Author: Thomas Tuegel <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    A pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch
    M pkgs/desktops/plasma-5/plasma-nm/default.nix

  Log Message:
  -----------
  Merge pull request #24816 from benley/plasma-nm

plasma-nm: Fix cipher discovery by setting path to openvpn


  Commit: 09a9a472ee783b40c2a3dd287bbe9d3c60f8fc58
      
https://github.com/NixOS/nixpkgs/commit/09a9a472ee783b40c2a3dd287bbe9d3c60f8fc58
  Author: Daniel Peebles <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    M lib/trivial.nix
    M nixos/modules/config/fonts/fontconfig-penultimate.nix
    M nixos/modules/config/fonts/fontconfig.nix
    M nixos/modules/services/cluster/kubernetes.nix
    M nixos/modules/services/continuous-integration/hydra/default.nix
    M nixos/modules/services/databases/cassandra.nix
    M nixos/modules/services/databases/mongodb.nix
    M nixos/modules/services/logging/graylog.nix
    M nixos/modules/services/misc/cgminer.nix
    M nixos/modules/services/misc/confd.nix
    M nixos/modules/services/misc/matrix-synapse.nix
    M nixos/modules/services/misc/nix-daemon.nix
    M nixos/modules/services/misc/taskserver/default.nix
    M nixos/modules/services/monitoring/collectd.nix
    M nixos/modules/services/monitoring/grafana.nix
    M nixos/modules/services/network-filesystems/netatalk.nix
    M nixos/modules/services/network-filesystems/samba.nix
    M nixos/modules/services/network-filesystems/tahoe.nix
    M nixos/modules/services/networking/aiccu.nix
    M nixos/modules/services/networking/btsync.nix
    M nixos/modules/services/networking/firefox/sync-server.nix
    M nixos/modules/services/networking/i2pd.nix
    M nixos/modules/services/networking/ircd-hybrid/default.nix
    M nixos/modules/services/networking/mosquitto.nix
    M nixos/modules/services/networking/murmur.nix
    M nixos/modules/services/networking/prosody.nix
    M nixos/modules/services/networking/sslh.nix
    M nixos/modules/services/networking/znc.nix
    M nixos/modules/services/security/oauth2_proxy.nix
    M nixos/modules/services/torrent/transmission.nix
    M nixos/modules/services/web-apps/atlassian/crowd.nix
    M nixos/modules/services/web-apps/quassel-webserver.nix
    M nixos/modules/services/web-apps/tt-rss.nix
    M nixos/modules/services/x11/display-managers/sddm.nix
    M nixos/modules/services/x11/hardware/multitouch.nix
    M pkgs/development/java-modules/build-maven-package.nix
    M pkgs/development/ocaml-modules/mtime/default.nix
    M pkgs/development/ocaml-modules/nocrypto/default.nix
    M pkgs/development/ocaml-modules/notty/default.nix
    M pkgs/development/ocaml-modules/vg/default.nix

  Log Message:
  -----------
  Merge pull request #24830 from mayflower/refactor/boolToString

treewide: use boolToString function


  Commit: 1f32d4b4eb50a78613cc9a3866c4d50d03fbe2b0
      
https://github.com/NixOS/nixpkgs/commit/1f32d4b4eb50a78613cc9a3866c4d50d03fbe2b0
  Author: Tuomas Tynkkynen <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    M pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
    M pkgs/stdenv/linux/make-bootstrap-tools.nix

  Log Message:
  -----------
  make-bootstrap-tools.nix: Fix bzip2

Apparently our native bzip2 builds switched to using dynamic libraries at some 
point.


  Commit: d4fbb4779b88190e5b3a376360eb5fb97dba2f57
      
https://github.com/NixOS/nixpkgs/commit/d4fbb4779b88190e5b3a376360eb5fb97dba2f57
  Author: zimbatm <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    M pkgs/applications/networking/cluster/terraform/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  terraform: 0.9.2 -> 0.9.3


  Commit: 26a4f891e646d281c1c51f5be05c10f0cdd6ec24
      
https://github.com/NixOS/nixpkgs/commit/26a4f891e646d281c1c51f5be05c10f0cdd6ec24
  Author: Tim Steinbach <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    M pkgs/applications/networking/cluster/terraform/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #24874 from zimbatm/terraform-0.9.3

terraform: 0.9.2 -> 0.9.3


  Commit: 798e358a02aab8c9156020d99f7beda1061f1988
      
https://github.com/NixOS/nixpkgs/commit/798e358a02aab8c9156020d99f7beda1061f1988
  Author: Yann Hodique <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    A pkgs/servers/cayley/default.nix
    A pkgs/servers/cayley/deps.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  cayley: init at 0.6.1


  Commit: 78635ce26b84dea646c7b00598c2596477882ce3
      
https://github.com/NixOS/nixpkgs/commit/78635ce26b84dea646c7b00598c2596477882ce3
  Author: Kamil Chmielewski <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    M pkgs/misc/vim-plugins/default.nix

  Log Message:
  -----------
  vim-elixir: 2017-03-29 -> 2017-04-13


  Commit: 4a913ecfd3f105ab6d934a70cda56995999600d0
      
https://github.com/NixOS/nixpkgs/commit/4a913ecfd3f105ab6d934a70cda56995999600d0
  Author: Daiderd Jordan <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    M pkgs/tools/security/pass/default.nix
    A pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch

  Log Message:
  -----------
  Merge pull request #24797 from nixy/pass/coreutils-sb-patch

pass: fix clipboard functionality for darwin


  Commit: 034ea00b98101922fd70507692f87b97fbccf836
      
https://github.com/NixOS/nixpkgs/commit/034ea00b98101922fd70507692f87b97fbccf836
  Author: Robert Helgesson <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  pythonPackages.PyICU: 1.9.5 -> 1.9.6


  Commit: de0f09035377d4ebd6d183168d7e94bff82eecf5
      
https://github.com/NixOS/nixpkgs/commit/de0f09035377d4ebd6d183168d7e94bff82eecf5
  Author: Robert Helgesson <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    M pkgs/applications/misc/josm/default.nix

  Log Message:
  -----------
  josm: 11639 -> 11826


  Commit: d77e29815c3138cc97fad5c1238fe6dfc3411232
      
https://github.com/NixOS/nixpkgs/commit/d77e29815c3138cc97fad5c1238fe6dfc3411232
  Author: Daiderd Jordan <[email protected]>
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
    M pkgs/misc/vim-plugins/default.nix

  Log Message:
  -----------
  Merge pull request #24879 from kamilchm/vim-elixir

vim-elixir: 2017-03-29 -> 2017-04-13


  Commit: 77c8470e0a76607f32b290b263fad5e3ecc0f2d6
      
https://github.com/NixOS/nixpkgs/commit/77c8470e0a76607f32b290b263fad5e3ecc0f2d6
  Author: Benjamin Staffin <[email protected]>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    M pkgs/applications/misc/latte-dock/default.nix

  Log Message:
  -----------
  latte-dock: 0.5.98 -> 0.6.0


  Commit: 6f69681dad1c937614dbbb767f95480ea630d781
      
https://github.com/NixOS/nixpkgs/commit/6f69681dad1c937614dbbb767f95480ea630d781
  Author: David Johnson <[email protected]>
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
    M pkgs/development/compilers/halvm/2.4.0.nix
    M pkgs/development/haskell-modules/generic-builder.nix

  Log Message:
  -----------
  Add hardening, bump hash to HaLVM


  Commit: 3f7af64de13d6cc20ba361be8d96655ffa31e3b7
      
https://github.com/NixOS/nixpkgs/commit/3f7af64de13d6cc20ba361be8d96655ffa31e3b7
  Author: Jörg Thalheim <[email protected]>
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
    A pkgs/servers/cayley/default.nix
    A pkgs/servers/cayley/deps.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #24885 from sigma/pr/cayley

cayley: init at 0.6.1


  Commit: 3085e95a20349f957c793f22547363231fa471a8
      
https://github.com/NixOS/nixpkgs/commit/3085e95a20349f957c793f22547363231fa471a8
  Author: Jörg Thalheim <[email protected]>
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
    M pkgs/applications/misc/latte-dock/default.nix

  Log Message:
  -----------
  Merge pull request #24886 from benley/latte-dock-0.6

latte-dock: 0.5.98 -> 0.6.0


  Commit: 24444513fb5cc0cf1f56c6b3b87bcdd36db8b101
      
https://github.com/NixOS/nixpkgs/commit/24444513fb5cc0cf1f56c6b3b87bcdd36db8b101
  Author: Vladimír Čunát <[email protected]>
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
    M lib/default.nix
    M lib/tests.nix
    M lib/trivial.nix
    M nixos/doc/manual/release-notes/rl-1709.xml
    M nixos/modules/security/acme.nix
    M nixos/modules/services/web-servers/lighttpd/gitweb.nix
    M nixos/modules/system/boot/systemd-lib.nix
    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
    A pkgs/applications/editors/idea/common.nix
    A pkgs/applications/editors/idea/default.nix
    R pkgs/applications/editors/jetbrains/common.nix
    R pkgs/applications/editors/jetbrains/default.nix
    M pkgs/applications/editors/nano/default.nix
    R pkgs/applications/misc/gpsbabel/clang-4.patch
    M pkgs/applications/misc/gpsbabel/default.nix
    M pkgs/applications/networking/browsers/firefox-bin/default.nix
    M pkgs/applications/networking/cluster/terragrunt/default.nix
    M pkgs/applications/networking/cluster/terragrunt/deps.nix
    M pkgs/applications/video/kodi/default.nix
    M pkgs/applications/window-managers/trayer/default.nix
    M pkgs/build-support/build-fhs-userenv/env.nix
    M pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix
    M pkgs/development/libraries/glibc/common.nix
    A pkgs/development/libraries/glibc/fix-i686-memchr.patch
    M pkgs/development/libraries/gmp/6.x.nix
    A pkgs/development/libraries/gnutls/3.5.10.nix
    M pkgs/development/libraries/gnutls/3.5.nix
    M pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
    M pkgs/development/libraries/gtk-mac-integration/default.nix
    M pkgs/development/libraries/libdrm/default.nix
    M pkgs/development/libraries/libressl/2.5.nix
    R pkgs/development/libraries/libsigsegv/aarch64.patch
    M pkgs/development/libraries/libsigsegv/default.nix
    M pkgs/development/libraries/libsndfile/default.nix
    M pkgs/development/libraries/lzo/default.nix
    M pkgs/development/libraries/opal/default.nix
    M pkgs/development/libraries/science/math/openblas/default.nix
    M pkgs/development/libraries/science/math/suitesparse/4.2.nix
    M pkgs/development/libraries/science/math/suitesparse/default.nix
    M pkgs/development/libraries/webkitgtk/2.14.nix
    R pkgs/development/libraries/webkitgtk/PR-152650-2.patch
    R pkgs/development/libraries/webkitgtk/PR-153138.patch
    R pkgs/development/libraries/webkitgtk/PR-157554.patch
    R pkgs/development/libraries/webkitgtk/PR-157574.patch
    R pkgs/development/python-modules/phonenumbers/default.nix
    R pkgs/development/tools/compile-daemon/default.nix
    R pkgs/development/tools/compile-daemon/deps.nix
    M pkgs/development/tools/misc/hydra/default.nix
    M pkgs/development/tools/pypi2nix/default.nix
    M pkgs/development/tools/unity3d/default.nix
    M pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
    A 
pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries
    R pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch
    M pkgs/os-specific/darwin/cctools/port.nix
    R pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch
    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
    M pkgs/os-specific/linux/kernel/linux-grsecurity.nix
    M pkgs/os-specific/linux/kernel/patches.nix
    M pkgs/os-specific/linux/procps-ng/default.nix
    M pkgs/servers/emby/default.nix
    M pkgs/servers/http/nginx/mainline.nix
    M pkgs/servers/matrix-synapse/default.nix
    M pkgs/tools/compression/xz/default.nix
    M pkgs/tools/package-management/nix/default.nix
    M pkgs/tools/text/gawk/default.nix
    M pkgs/tools/text/patchutils/default.nix
    R pkgs/tools/text/patchutils/drop-comments.patch
    M pkgs/top-level/aliases.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/python-packages.nix
    M pkgs/top-level/release-lib.nix
    M pkgs/top-level/release.nix
    M pkgs/top-level/rust-packages.nix

  Log Message:
  -----------
  Merge branch 'staging'


  Commit: da20d0e488ba645e6c9271705209333cfdd703db
      
https://github.com/NixOS/nixpkgs/commit/da20d0e488ba645e6c9271705209333cfdd703db
  Author: Vladimír Čunát <[email protected]>
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
    M nixos/modules/services/networking/murmur.nix

  Log Message:
  -----------
  murmur service: fix typos from #24830


  Commit: 7f09c06c5858f52d1fdfe82e89f92c4864e4f57f
      
https://github.com/NixOS/nixpkgs/commit/7f09c06c5858f52d1fdfe82e89f92c4864e4f57f
  Author: Eelco Dolstra <[email protected]>
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
    M pkgs/development/libraries/usbredir/default.nix

  Log Message:
  -----------
  usbredir: Use dev output


  Commit: 77e71c2f99d0d3216aacd46291ad722d9ceccc19
      
https://github.com/NixOS/nixpkgs/commit/77e71c2f99d0d3216aacd46291ad722d9ceccc19
  Author: Matthias Beyer <[email protected]>
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
    M pkgs/applications/networking/mailreaders/mutt/default.nix

  Log Message:
  -----------
  mutt: 1.8.0 -> 1.8.1

>From the announce email:

    This is a bug fix release.  In particular, it has fixes for setenv,
    sidebar_whitelist, some refresh issues, and a potential segfault.
    Details can be seen in the ChangeLog file.

Signed-off-by: Matthias Beyer <[email protected]>


  Commit: 72605647a40c8099c626884a784693390b442907
      
https://github.com/NixOS/nixpkgs/commit/72605647a40c8099c626884a784693390b442907
  Author: Eelco Dolstra <[email protected]>
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
    M 
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix

  Log Message:
  -----------
  flashplayer: 25.0.0.127 -> 25.0.0.148


  Commit: 6a1f168b1ee6cd01e5eece33d6151bf658f232a0
      
https://github.com/NixOS/nixpkgs/commit/6a1f168b1ee6cd01e5eece33d6151bf658f232a0
  Author: Eelco Dolstra <[email protected]>
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
    M 
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  flashplayer-standalone: 25.0.0.127 -> 25.0.0.148


  Commit: 3124f5ab22cfa48e7681e02afd7e599e72cf636d
      
https://github.com/NixOS/nixpkgs/commit/3124f5ab22cfa48e7681e02afd7e599e72cf636d
  Author: Eelco Dolstra <[email protected]>
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
    M pkgs/applications/networking/mailreaders/mutt/default.nix

  Log Message:
  -----------
  Merge pull request #24892 from matthiasbeyer/update-mutt

mutt: 1.8.0 -> 1.8.1


  Commit: 5b3f807597c2eead700a1b4cac7b83434ff92ddc
      
https://github.com/NixOS/nixpkgs/commit/5b3f807597c2eead700a1b4cac7b83434ff92ddc
  Author: Vladimír Čunát <[email protected]>
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
    M nixos/modules/services/networking/ssh/sshd.nix
    M pkgs/tools/networking/openssh/default.nix

  Log Message:
  -----------
  Merge #24179: openssh: 7.4p1 -> 7.5p1


  Commit: c395568b7a959c8a95a91097fb1e517ced21a46c
      
https://github.com/NixOS/nixpkgs/commit/c395568b7a959c8a95a91097fb1e517ced21a46c
  Author: Tristan Helmich <[email protected]>
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
    M pkgs/tools/networking/openssh/default.nix

  Log Message:
  -----------
  openssh_hpn: use new sources and version (7_5_P1)

Close #23990.


  Commit: 48b5b77bb7a74d631a6ac699564f85de532bdb33
      
https://github.com/NixOS/nixpkgs/commit/48b5b77bb7a74d631a6ac699564f85de532bdb33
  Author: Thomas Tuegel <[email protected]>
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
    M nixos/modules/services/networking/networkmanager.nix

  Log Message:
  -----------
  Merge pull request #24813 from benley/nm-openvpn

nixos: Add nm-openvpn to the networkmanager group


  Commit: 862fc1b46592d974e020979ef03e569c82aece13
      
https://github.com/NixOS/nixpkgs/commit/862fc1b46592d974e020979ef03e569c82aece13
  Author: Peter Hoeg <[email protected]>
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
    A pkgs/applications/networking/instant-messengers/tensor/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  tensor: init at (post) 0.3


  Commit: 31a28a38a10bd46579c0566fe03ca3f60fa33c72
      
https://github.com/NixOS/nixpkgs/commit/31a28a38a10bd46579c0566fe03ca3f60fa33c72
  Author: Ignat Loskutov <[email protected]>
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  pythonPackages.bleach: remove the 'platforms' attribute; update homepage


  Commit: 46403f57b032d657afe48dcdccc2eec23bdd8b9a
      
https://github.com/NixOS/nixpkgs/commit/46403f57b032d657afe48dcdccc2eec23bdd8b9a
  Author: Frederik Rietdijk <[email protected]>
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  Merge pull request #24841 from loskutov/bleech-unix

pythonPackages.bleach: declare unix support


  Commit: 31fef05c7ca0f7e55773b75a1db71c8fc2fe07c0
      
https://github.com/NixOS/nixpkgs/commit/31fef05c7ca0f7e55773b75a1db71c8fc2fe07c0
  Author: Vincent Laporte <[email protected]>
  Date:   2017-04-14 (Fri, 14 Apr 2017)

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

  Log Message:
  -----------
  ocamlPackages.lwt: 2.6.0 -> 2.7.1


  Commit: b6f88093a21efdf3cc24ac716015b4db5e9e3df0
      
https://github.com/NixOS/nixpkgs/commit/b6f88093a21efdf3cc24ac716015b4db5e9e3df0
  Author: Armijn Hemel <[email protected]>
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
    M pkgs/tools/graphics/icoutils/default.nix

  Log Message:
  -----------
  icoutils: update to 0.31.3


  Commit: 9a10e5ae462bcbaeae7e556695b9329eba4cb72a
      
https://github.com/NixOS/nixpkgs/commit/9a10e5ae462bcbaeae7e556695b9329eba4cb72a
  Author: Lancelot SIX <[email protected]>
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
    M pkgs/applications/editors/nano/default.nix

  Log Message:
  -----------
  nano: 2.8.0 -> 2.8.1

See http://lists.gnu.org/archive/html/info-gnu/2017-04/msg00005.html
for release announcement

(cherry picked from commit 474d112b7a942afd9206e0f8a81b6ba9bb9b95bc)


  Commit: eec35cb6bd82cb0eba69c55e83990f3b9f0107dc
      
https://github.com/NixOS/nixpkgs/commit/eec35cb6bd82cb0eba69c55e83990f3b9f0107dc
  Author: John Ericson <[email protected]>
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
    M pkgs/development/compilers/halvm/2.4.0.nix
    M pkgs/development/haskell-modules/generic-builder.nix

  Log Message:
  -----------
  Merge pull request #24889 from formaltech/halvm-bump

Remove hardening at HaLVM 2.4.0


  Commit: 6617c8bd87e185ece1762c22ed4521adebd7c65b
      
https://github.com/NixOS/nixpkgs/commit/6617c8bd87e185ece1762c22ed4521adebd7c65b
  Author: Vladimír Čunát <[email protected]>
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
    M lib/default.nix
    M lib/tests.nix
    M lib/trivial.nix
    M maintainers/scripts/all-tarballs.nix
    M nixos/doc/manual/release-notes/rl-1709.xml
    M nixos/modules/security/acme.nix
    M nixos/modules/services/web-servers/lighttpd/gitweb.nix
    M nixos/modules/system/boot/systemd-lib.nix
    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
    R pkgs/applications/editors/idea/common.nix
    R pkgs/applications/editors/idea/default.nix
    A pkgs/applications/editors/jetbrains/common.nix
    A pkgs/applications/editors/jetbrains/default.nix
    M pkgs/applications/editors/nano/default.nix
    A pkgs/applications/misc/gpsbabel/clang-4.patch
    M pkgs/applications/misc/gpsbabel/default.nix
    M pkgs/applications/networking/browsers/firefox-bin/default.nix
    M pkgs/applications/networking/cluster/terragrunt/default.nix
    M pkgs/applications/networking/cluster/terragrunt/deps.nix
    M pkgs/applications/video/kodi/default.nix
    M pkgs/applications/window-managers/trayer/default.nix
    M pkgs/build-support/build-fhs-userenv/env.nix
    M pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix
    M pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
    M pkgs/development/libraries/gtk-mac-integration/default.nix
    M pkgs/development/libraries/libressl/2.5.nix
    M pkgs/development/libraries/opal/default.nix
    M pkgs/development/libraries/science/math/suitesparse/4.2.nix
    M pkgs/development/libraries/science/math/suitesparse/default.nix
    M pkgs/development/libraries/webkitgtk/2.14.nix
    A pkgs/development/libraries/webkitgtk/PR-152650-2.patch
    A pkgs/development/libraries/webkitgtk/PR-153138.patch
    A pkgs/development/libraries/webkitgtk/PR-157554.patch
    A pkgs/development/libraries/webkitgtk/PR-157574.patch
    A pkgs/development/python-modules/phonenumbers/default.nix
    A pkgs/development/tools/compile-daemon/default.nix
    A pkgs/development/tools/compile-daemon/deps.nix
    M pkgs/development/tools/misc/hydra/default.nix
    M pkgs/development/tools/pypi2nix/default.nix
    M pkgs/development/tools/unity3d/default.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
    M pkgs/os-specific/linux/kernel/linux-grsecurity.nix
    M pkgs/os-specific/linux/kernel/patches.nix
    M pkgs/servers/emby/default.nix
    M pkgs/servers/http/nginx/mainline.nix
    M pkgs/servers/matrix-synapse/default.nix
    M pkgs/tools/package-management/nix/default.nix
    M pkgs/top-level/aliases.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/python-packages.nix
    M pkgs/top-level/release-lib.nix
    M pkgs/top-level/release.nix
    M pkgs/top-level/rust-packages.nix

  Log Message:
  -----------
  A fixed version of commit eb750f9a7b2

For detailed explanation see:
https://github.com/NixOS/nixpkgs/commit/24444513fb5#commitcomment-21767916


  Commit: 4aec96b379d3f1b89128297b0943253d6961cf94
      
https://github.com/NixOS/nixpkgs/commit/4aec96b379d3f1b89128297b0943253d6961cf94
  Author: Vladimír Čunát <[email protected]>
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
    M lib/default.nix
    M lib/tests.nix
    M lib/trivial.nix
    M maintainers/scripts/all-tarballs.nix
    M nixos/doc/manual/release-notes/rl-1709.xml
    M nixos/modules/security/acme.nix
    M nixos/modules/services/web-servers/lighttpd/gitweb.nix
    M nixos/modules/system/boot/systemd-lib.nix
    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
    R pkgs/applications/editors/idea/common.nix
    R pkgs/applications/editors/idea/default.nix
    A pkgs/applications/editors/jetbrains/common.nix
    A pkgs/applications/editors/jetbrains/default.nix
    M pkgs/applications/editors/nano/default.nix
    A pkgs/applications/misc/gpsbabel/clang-4.patch
    M pkgs/applications/misc/gpsbabel/default.nix
    M pkgs/applications/networking/browsers/firefox-bin/default.nix
    M pkgs/applications/networking/cluster/terragrunt/default.nix
    M pkgs/applications/networking/cluster/terragrunt/deps.nix
    M pkgs/applications/video/kodi/default.nix
    M pkgs/applications/window-managers/trayer/default.nix
    M pkgs/build-support/build-fhs-userenv/env.nix
    M pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix
    M pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
    M pkgs/development/libraries/gtk-mac-integration/default.nix
    M pkgs/development/libraries/libressl/2.5.nix
    M pkgs/development/libraries/opal/default.nix
    M pkgs/development/libraries/science/math/suitesparse/4.2.nix
    M pkgs/development/libraries/science/math/suitesparse/default.nix
    M pkgs/development/libraries/webkitgtk/2.14.nix
    A pkgs/development/libraries/webkitgtk/PR-152650-2.patch
    A pkgs/development/libraries/webkitgtk/PR-153138.patch
    A pkgs/development/libraries/webkitgtk/PR-157554.patch
    A pkgs/development/libraries/webkitgtk/PR-157574.patch
    A pkgs/development/python-modules/phonenumbers/default.nix
    A pkgs/development/tools/compile-daemon/default.nix
    A pkgs/development/tools/compile-daemon/deps.nix
    M pkgs/development/tools/misc/hydra/default.nix
    M pkgs/development/tools/pypi2nix/default.nix
    M pkgs/development/tools/unity3d/default.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
    M pkgs/os-specific/linux/kernel/linux-grsecurity.nix
    M pkgs/os-specific/linux/kernel/patches.nix
    M pkgs/servers/emby/default.nix
    M pkgs/servers/http/nginx/mainline.nix
    M pkgs/servers/matrix-synapse/default.nix
    R pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch
    M pkgs/tools/filesystems/bonnie/default.nix
    M pkgs/tools/package-management/nix/default.nix
    M pkgs/top-level/aliases.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/python-packages.nix
    M pkgs/top-level/release-lib.nix
    M pkgs/top-level/release.nix
    M pkgs/top-level/rust-packages.nix

  Log Message:
  -----------
  Merge the two "same" merges

This only takes the state from the second parent.
The purpose is that when this commit depends on the failed one,
simply merging this commit is a safe way to fix the problems.  Details:
https://github.com/NixOS/nixpkgs/commit/24444513fb5#commitcomment-21767916


  Commit: 2090aa4f65e860567af03cb3b7aa042df7168ead
      
https://github.com/NixOS/nixpkgs/commit/2090aa4f65e860567af03cb3b7aa042df7168ead
  Author: Vladimír Čunát <[email protected]>
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
    M lib/default.nix
    M lib/tests.nix
    M lib/trivial.nix
    M nixos/doc/manual/release-notes/rl-1709.xml
    M nixos/modules/security/acme.nix
    M nixos/modules/services/web-servers/lighttpd/gitweb.nix
    M nixos/modules/system/boot/systemd-lib.nix
    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
    R pkgs/applications/editors/idea/common.nix
    R pkgs/applications/editors/idea/default.nix
    A pkgs/applications/editors/jetbrains/common.nix
    A pkgs/applications/editors/jetbrains/default.nix
    A pkgs/applications/misc/gpsbabel/clang-4.patch
    M pkgs/applications/misc/gpsbabel/default.nix
    M pkgs/applications/networking/browsers/firefox-bin/default.nix
    M pkgs/applications/networking/cluster/terragrunt/default.nix
    M pkgs/applications/networking/cluster/terragrunt/deps.nix
    M pkgs/applications/video/kodi/default.nix
    M pkgs/applications/window-managers/trayer/default.nix
    M pkgs/build-support/build-fhs-userenv/env.nix
    M pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix
    M pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
    M pkgs/development/libraries/gtk-mac-integration/default.nix
    M pkgs/development/libraries/libressl/2.5.nix
    M pkgs/development/libraries/opal/default.nix
    M pkgs/development/libraries/science/math/suitesparse/4.2.nix
    M pkgs/development/libraries/science/math/suitesparse/default.nix
    M pkgs/development/libraries/webkitgtk/2.14.nix
    A pkgs/development/libraries/webkitgtk/PR-152650-2.patch
    A pkgs/development/libraries/webkitgtk/PR-153138.patch
    A pkgs/development/libraries/webkitgtk/PR-157554.patch
    A pkgs/development/libraries/webkitgtk/PR-157574.patch
    A pkgs/development/python-modules/phonenumbers/default.nix
    A pkgs/development/tools/compile-daemon/default.nix
    A pkgs/development/tools/compile-daemon/deps.nix
    M pkgs/development/tools/misc/hydra/default.nix
    M pkgs/development/tools/pypi2nix/default.nix
    M pkgs/development/tools/unity3d/default.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
    M pkgs/os-specific/linux/kernel/linux-grsecurity.nix
    M pkgs/os-specific/linux/kernel/patches.nix
    M pkgs/servers/emby/default.nix
    M pkgs/servers/http/nginx/mainline.nix
    M pkgs/servers/matrix-synapse/default.nix
    R pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch
    M pkgs/tools/filesystems/bonnie/default.nix
    M pkgs/tools/package-management/nix/default.nix
    M pkgs/top-level/aliases.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/python-packages.nix
    M pkgs/top-level/release-lib.nix
    M pkgs/top-level/release.nix
    M pkgs/top-level/rust-packages.nix

  Log Message:
  -----------
  Merge: fixup a bad merge

For details see:
https://github.com/NixOS/nixpkgs/commit/24444513fb5#commitcomment-21767916


  Commit: f7a4f146c9fd64966f57040603a897857a14df94
      
https://github.com/NixOS/nixpkgs/commit/f7a4f146c9fd64966f57040603a897857a14df94
  Author: Vladimír Čunát <[email protected]>
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
    M lib/default.nix
    M lib/licenses.nix
    M lib/tests.nix
    M lib/trivial.nix
    M nixos/doc/manual/release-notes/rl-1709.xml
    M nixos/maintainers/scripts/gce/create-gce.sh
    M nixos/modules/config/fonts/fontconfig-penultimate.nix
    M nixos/modules/config/fonts/fontconfig.nix
    M nixos/modules/security/acme.nix
    M nixos/modules/services/cluster/kubernetes.nix
    M nixos/modules/services/continuous-integration/hydra/default.nix
    M nixos/modules/services/databases/cassandra.nix
    M nixos/modules/services/databases/mongodb.nix
    M nixos/modules/services/logging/graylog.nix
    M nixos/modules/services/misc/cgminer.nix
    M nixos/modules/services/misc/confd.nix
    M nixos/modules/services/misc/matrix-synapse.nix
    M nixos/modules/services/misc/nix-daemon.nix
    M nixos/modules/services/misc/taskserver/default.nix
    M nixos/modules/services/monitoring/collectd.nix
    M nixos/modules/services/monitoring/grafana.nix
    M nixos/modules/services/network-filesystems/netatalk.nix
    M nixos/modules/services/network-filesystems/samba.nix
    M nixos/modules/services/network-filesystems/tahoe.nix
    M nixos/modules/services/networking/aiccu.nix
    M nixos/modules/services/networking/btsync.nix
    M nixos/modules/services/networking/firefox/sync-server.nix
    M nixos/modules/services/networking/i2pd.nix
    M nixos/modules/services/networking/ircd-hybrid/default.nix
    M nixos/modules/services/networking/mosquitto.nix
    M nixos/modules/services/networking/murmur.nix
    M nixos/modules/services/networking/networkmanager.nix
    M nixos/modules/services/networking/prosody.nix
    M nixos/modules/services/networking/smokeping.nix
    M nixos/modules/services/networking/ssh/sshd.nix
    M nixos/modules/services/networking/sslh.nix
    M nixos/modules/services/networking/znc.nix
    M nixos/modules/services/scheduling/fcron.nix
    M nixos/modules/services/security/oauth2_proxy.nix
    M nixos/modules/services/torrent/transmission.nix
    M nixos/modules/services/web-apps/atlassian/crowd.nix
    M nixos/modules/services/web-apps/quassel-webserver.nix
    M nixos/modules/services/web-apps/tt-rss.nix
    M nixos/modules/services/web-servers/lighttpd/gitweb.nix
    M nixos/modules/services/x11/display-managers/sddm.nix
    M nixos/modules/services/x11/hardware/multitouch.nix
    M nixos/modules/system/boot/systemd-lib.nix
    M pkgs/applications/altcoins/default.nix
    M pkgs/applications/altcoins/ethabi.nix
    A pkgs/applications/altcoins/hivemind.nix
    M pkgs/applications/editors/atom/default.nix
    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
    R pkgs/applications/editors/idea/common.nix
    R pkgs/applications/editors/idea/default.nix
    A pkgs/applications/editors/jetbrains/common.nix
    A pkgs/applications/editors/jetbrains/default.nix
    M pkgs/applications/editors/kakoune/default.nix
    M pkgs/applications/editors/nano/default.nix
    A pkgs/applications/misc/gpsbabel/clang-4.patch
    M pkgs/applications/misc/gpsbabel/default.nix
    M pkgs/applications/misc/hugo/default.nix
    M pkgs/applications/misc/hugo/deps.nix
    M pkgs/applications/misc/josm/default.nix
    M pkgs/applications/misc/latte-dock/default.nix
    M pkgs/applications/networking/browsers/chromium/plugins.nix
    M pkgs/applications/networking/browsers/firefox-bin/default.nix
    M 
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
    M 
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
    M pkgs/applications/networking/cluster/terraform/default.nix
    M pkgs/applications/networking/cluster/terragrunt/default.nix
    M pkgs/applications/networking/cluster/terragrunt/deps.nix
    M pkgs/applications/networking/davmail/default.nix
    A pkgs/applications/networking/instant-messengers/tensor/default.nix
    M pkgs/applications/networking/mailreaders/mutt/default.nix
    M pkgs/applications/networking/mailreaders/thunderbird/default.nix
    M pkgs/applications/networking/remote/teamviewer/default.nix
    A pkgs/applications/science/biology/diamond/default.nix
    A pkgs/applications/science/biology/diamond/diamond-0.8.36-no-warning.patch
    M pkgs/applications/video/kodi/default.nix
    M pkgs/applications/window-managers/trayer/default.nix
    M pkgs/build-support/build-fhs-userenv/env.nix
    A pkgs/data/fonts/envypn-font/default.nix
    M pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix
    A pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch
    M pkgs/desktops/plasma-5/plasma-nm/default.nix
    M pkgs/development/compilers/gcc/snapshot/default.nix
    M pkgs/development/compilers/halvm/2.4.0.nix
    M pkgs/development/haskell-modules/generic-builder.nix
    M pkgs/development/java-modules/build-maven-package.nix
    A pkgs/development/libraries/NSPlist/default.nix
    A pkgs/development/libraries/PlistCpp/default.nix
    M pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
    M pkgs/development/libraries/gtk-mac-integration/default.nix
    M pkgs/development/libraries/libressl/2.5.nix
    M pkgs/development/libraries/opal/default.nix
    M pkgs/development/libraries/pugixml/default.nix
    R pkgs/development/libraries/pugixml/no-long-long.patch
    M pkgs/development/libraries/science/math/suitesparse/4.2.nix
    M pkgs/development/libraries/science/math/suitesparse/default.nix
    M pkgs/development/libraries/usbredir/default.nix
    M pkgs/development/libraries/webkitgtk/2.14.nix
    A pkgs/development/libraries/webkitgtk/PR-152650-2.patch
    A pkgs/development/libraries/webkitgtk/PR-153138.patch
    A pkgs/development/libraries/webkitgtk/PR-157554.patch
    A pkgs/development/libraries/webkitgtk/PR-157574.patch
    M pkgs/development/ocaml-modules/lwt/default.nix
    M pkgs/development/ocaml-modules/mtime/default.nix
    M pkgs/development/ocaml-modules/nocrypto/default.nix
    M pkgs/development/ocaml-modules/notty/default.nix
    M pkgs/development/ocaml-modules/vg/default.nix
    A pkgs/development/python-modules/distro/default.nix
    A pkgs/development/python-modules/node-semver/default.nix
    A pkgs/development/python-modules/phonenumbers/default.nix
    A pkgs/development/python-modules/pluginbase/default.nix
    A pkgs/development/tools/build-managers/conan/default.nix
    M pkgs/development/tools/build-managers/gradle/default.nix
    A pkgs/development/tools/compile-daemon/default.nix
    A pkgs/development/tools/compile-daemon/deps.nix
    M pkgs/development/tools/misc/hydra/default.nix
    M pkgs/development/tools/pypi2nix/default.nix
    M pkgs/development/tools/unity3d/default.nix
    M pkgs/development/tools/xcbuild/platform.nix
    M pkgs/development/tools/xcbuild/toolchain.nix
    A pkgs/development/tools/xib2nib/default.nix
    M pkgs/misc/vim-plugins/default.nix
    R pkgs/os-specific/darwin/install_name_tool/default.nix
    M pkgs/os-specific/linux/blcr/default.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
    M pkgs/os-specific/linux/kernel/linux-grsecurity.nix
    M pkgs/os-specific/linux/kernel/patches.nix
    A pkgs/servers/cayley/default.nix
    A pkgs/servers/cayley/deps.nix
    M pkgs/servers/emby/default.nix
    M pkgs/servers/http/nginx/mainline.nix
    M pkgs/servers/matrix-synapse/default.nix
    M pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
    M pkgs/stdenv/linux/make-bootstrap-tools.nix
    M pkgs/tools/admin/google-cloud-sdk/default.nix
    R pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch
    M pkgs/tools/filesystems/bonnie/default.nix
    M pkgs/tools/graphics/icoutils/default.nix
    M pkgs/tools/networking/openssh/default.nix
    M pkgs/tools/package-management/nix/default.nix
    M pkgs/tools/security/pass/default.nix
    A pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch
    M pkgs/tools/security/pinentry-mac/default.nix
    M pkgs/top-level/aliases.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/python-packages.nix
    M pkgs/top-level/release-lib.nix
    M pkgs/top-level/release.nix
    M pkgs/top-level/rust-packages.nix

  Log Message:
  -----------
  Merge branch 'master' into staging

This includes a fix for a bad merge.


Compare: https://github.com/NixOS/nixpkgs/compare/878bbaf4e9d4...f7a4f146c9fd
_______________________________________________
nix-commits mailing list
[email protected]
https://mailman.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to