Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 37f0aafc56c3357213833c43edc45c33e71a0f15
      
https://github.com/NixOS/nixpkgs/commit/37f0aafc56c3357213833c43edc45c33e71a0f15
  Author: Eric Sagnes <eric.sag...@gmail.com>
  Date:   2016-09-27 (Tue, 27 Sep 2016)

  Changed paths:
    M pkgs/build-support/release/default.nix

  Log Message:
  -----------
  releaseTools: add channel function


  Commit: bd0811166cdaaa199e40ae6ec433f2c128158c7f
      
https://github.com/NixOS/nixpkgs/commit/bd0811166cdaaa199e40ae6ec433f2c128158c7f
  Author: Frederik Rietdijk <fr...@fridh.nl>
  Date:   2017-06-05 (Mon, 05 Jun 2017)

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

  Log Message:
  -----------
  python.pkgs.django_1_9: remove

Old version, so removing.

https://github.com/NixOS/nixpkgs/issues/25375#issuecomment-298522597


  Commit: 6bcf106b6564f246f7c226b05230ce39ed771374
      
https://github.com/NixOS/nixpkgs/commit/6bcf106b6564f246f7c226b05230ce39ed771374
  Author: Frederik Rietdijk <fr...@fridh.nl>
  Date:   2017-06-05 (Mon, 05 Jun 2017)

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

  Log Message:
  -----------
  python.pkgs.django_1_6: remove

Old version, so removing.

https://github.com/NixOS/nixpkgs/issues/25375#issuecomment-298522597


  Commit: d25c87c36d9e6a265de985f37c7cf611a8184951
      
https://github.com/NixOS/nixpkgs/commit/d25c87c36d9e6a265de985f37c7cf611a8184951
  Author: Frederik Rietdijk <fr...@fridh.nl>
  Date:   2017-06-05 (Mon, 05 Jun 2017)

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

  Log Message:
  -----------
  python.pkgs: do not pin django version

instead, override the package set and set `django = super.django_1_8`.


  Commit: 01e19386f7ed01ef4aef3e142da857def2c8d5be
      
https://github.com/NixOS/nixpkgs/commit/01e19386f7ed01ef4aef3e142da857def2c8d5be
  Author: Frederik Rietdijk <fr...@fridh.nl>
  Date:   2017-06-05 (Mon, 05 Jun 2017)

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

  Log Message:
  -----------
  python.pkgs.django_1_10: will be dropped before 17.09


  Commit: cce12a644c8a4c5d540c6d30bba1fabff60e57db
      
https://github.com/NixOS/nixpkgs/commit/cce12a644c8a4c5d540c6d30bba1fabff60e57db
  Author: Josef Kemetmueller <josef.kemetmuel...@aon.at>
  Date:   2017-06-08 (Thu, 08 Jun 2017)

  Changed paths:
    A pkgs/tools/misc/hdf4/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  hdf4: Init at 4.2.12


  Commit: 7b25d31825efa3a05ad76277c9042f86f918d5ef
      
https://github.com/NixOS/nixpkgs/commit/7b25d31825efa3a05ad76277c9042f86f918d5ef
  Author: Josef Kemetmueller <josef.kemetmuel...@aon.at>
  Date:   2017-06-08 (Thu, 08 Jun 2017)

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

  Log Message:
  -----------
  gdal: Add hdf4 support


  Commit: 7f89293051e96549bd7f1ef0f0a148d459a16766
      
https://github.com/NixOS/nixpkgs/commit/7f89293051e96549bd7f1ef0f0a148d459a16766
  Author: rnhmjoj <michelegueriniro...@me.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    A pkgs/misc/gnash/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  gnash: init at 0.8.11-2017-03-08


  Commit: 9e6bfbb2f92d8e1995365775bee63809631b132c
      
https://github.com/NixOS/nixpkgs/commit/9e6bfbb2f92d8e1995365775bee63809631b132c
  Author: Michał Pałka <michal.pa...@chalmers.se>
  Date:   2017-06-27 (Tue, 27 Jun 2017)

  Changed paths:
    M nixos/modules/virtualisation/xen-dom0.nix
    A pkgs/applications/virtualization/xen/4.8.nix
    M pkgs/applications/virtualization/xen/generic.nix
    M pkgs/applications/virtualization/xen/packages.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  xen_4_8: init at 4.8.1

This commit adds the xen_4_8 package to be used instead of
xen (currently at 4.5.5):
 * Add packages xen_4_8, xen_4_8-slim and xen_4_8-light
 * Add packages qemu_xen_4_8 and qemu_xen_4_8-light to be used
   with xen_4_8-slim and xen_4_8-light respectively.
 * Add systemd to buildInputs of xen (it is required by oxenstored)
 * Adapt xen service to work with the new version of xen
 * Use xen-init-dom0 to initlilise dom0 in xen-store
 * Currently, the virtualisation.xen.stored option is ignored
   if xen 4.8 is used


  Commit: 7b5d72ce048ffc48ba437560247bf069a87b1c73
      
https://github.com/NixOS/nixpkgs/commit/7b5d72ce048ffc48ba437560247bf069a87b1c73
  Author: Michał Pałka <michal.pa...@chalmers.se>
  Date:   2017-06-27 (Tue, 27 Jun 2017)

  Changed paths:
    M pkgs/applications/virtualization/xen/4.8.nix

  Log Message:
  -----------
  xen: patch for XSAs: 216, 217, 218, 219, 220, 221, 222, and 224 (xen 4.8)

This commit contains security patches for xen 4.8. The patches
for XSA-216 applied to the kernel are omitted, as they are part of
80e0cda7ff92233edc94161eae5838a1c423e5e4.

XSA-216 Issue Description:

> The block interface response structure has some discontiguous fields.
> Certain backends populate the structure fields of an otherwise
> uninitialized instance of this structure on their stacks, leaking
> data through the (internal or trailing) padding field.

More: https://xenbits.xen.org/xsa/advisory-216.html

XSA-217 Issue Description:

> Domains controlling other domains are permitted to map pages owned by
> the domain being controlled.  If the controlling domain unmaps such a
> page without flushing the TLB, and if soon after the domain being
> controlled transfers this page to another PV domain (via
> GNTTABOP_transfer or, indirectly, XENMEM_exchange), and that third
> domain uses the page as a page table, the controlling domain will have
> write access to a live page table until the applicable TLB entry is
> flushed or evicted.  Note that the domain being controlled is
> necessarily HVM, while the controlling domain is PV.

More: https://xenbits.xen.org/xsa/advisory-217.html

XSA-218 Issue Description:

> We have discovered two bugs in the code unmapping grant references.
>
> * When a grant had been mapped twice by a backend domain, and then
> unmapped by two concurrent unmap calls, the frontend may be informed
> that the page had no further mappings when the first call completed rather
> than when the second call completed.
>
> * A race triggerable by an unprivileged guest could cause a grant
> maptrack entry for grants to be "freed" twice.  The ultimate effect of
> this would be for maptrack entries for a single domain to be re-used.

More: https://xenbits.xen.org/xsa/advisory-218.html

XSA-219 Issue Description:

> When using shadow paging, writes to guest pagetables must be trapped and
> emulated, so the shadows can be suitably adjusted as well.
>
> When emulating the write, Xen maps the guests pagetable(s) to make the final
> adjustment and leave the guest's view of its state consistent.
>
> However, when mapping the frame, Xen drops the page reference before
> performing the write.  This is a race window where the underlying frame can
> change ownership.
>
> One possible attack scenario is for the frame to change ownership and to be
> inserted into a PV guest's pagetables.  At that point, the emulated write will
> be an unaudited modification to the PV pagetables whose value is under guest
> control.

More: https://xenbits.xen.org/xsa/advisory-219.html

XSA-220 Issue Description:

> Memory Protection Extensions (MPX) and Protection Key (PKU) are features in
> newer processors, whose state is intended to be per-thread and context
> switched along with all other XSAVE state.
>
> Xen's vCPU context switch code would save and restore the state only
> if the guest had set the relevant XSTATE enable bits.  However,
> surprisingly, the use of these features is not dependent (PKU) or may
> not be dependent (MPX) on having the relevant XSTATE bits enabled.
>
> VMs which use MPX or PKU, and context switch the state manually rather
> than via XSAVE, will have the state leak between vCPUs (possibly,
> between vCPUs in different guests).  This in turn corrupts state in
> the destination vCPU, and hence may lead to weakened protections
>
> Experimentally, MPX appears not to make any interaction with BND*
> state if BNDCFGS.EN is set but XCR0.BND{CSR,REGS} are clear.  However,
> the SDM is not clear in this case; therefore MPX is included in this
> advisory as a precaution.

More: https://xenbits.xen.org/xsa/advisory-220.html

XSA-221 Issue Description:

> When polling event channels, in general arbitrary port numbers can be
> specified.  Specifically, there is no requirement that a polled event
> channel ports has ever been created.  When the code was generalised
> from an earlier implementation, introducing some intermediate
> pointers, a check should have been made that these intermediate
> pointers are non-NULL.  However, that check was omitted.

More: https://xenbits.xen.org/xsa/advisory-221.html

XSA-222 Issue Description:

> Certain actions require removing pages from a guest's P2M
> (Physical-to-Machine) mapping.  When large pages are in use to map
> guest pages in the 2nd-stage page tables, such a removal operation may
> incur a memory allocation (to replace a large mapping with individual
> smaller ones).  If this allocation fails, these errors are ignored by
> the callers, which would then continue and (for example) free the
> referenced page for reuse.  This leaves the guest with a mapping to a
> page it shouldn't have access to.
>
> The allocation involved comes from a separate pool of memory created
> when the domain is created; under normal operating conditions it never
> fails, but a malicious guest may be able to engineer situations where
> this pool is exhausted.

More: https://xenbits.xen.org/xsa/advisory-222.html

XSA-224 Issue Description:

> We have discovered a number of bugs in the code mapping and unmapping
> grant references.
>
> * If a grant is mapped with both the GNTMAP_device_map and
> GNTMAP_host_map flags, but unmapped only with host_map, the device_map
> portion remains but the page reference counts are lowered as though it
> had been removed. This bug can be leveraged cause a page's reference
> counts and type counts to fall to zero while retaining writeable
> mappings to the page.
>
> * Under some specific conditions, if a grant is mapped with both the
> GNTMAP_device_map and GNTMAP_host_map flags, the operation may not
> grab sufficient type counts.  When the grant is then unmapped, the
> type count will be erroneously reduced.  This bug can be leveraged
> cause a page's reference counts and type counts to fall to zero while
> retaining writeable mappings to the page.
>
> * When a grant reference is given to an MMIO region (as opposed to a
> normal guest page), if the grant is mapped with only the
> GNTMAP_device_map flag set, a mapping is created at host_addr anyway.
> This does *not* cause reference counts to change, but there will be no
> record of this mapping, so it will not be considered when reporting
> whether the grant is still in use.

More: https://xenbits.xen.org/xsa/advisory-224.html


  Commit: 179936d75c7b8aa34cdf40b49c959b0b156e5ee1
      
https://github.com/NixOS/nixpkgs/commit/179936d75c7b8aa34cdf40b49c959b0b156e5ee1
  Author: Will Dietz <w...@wdtz.org>
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
    M pkgs/servers/mail/mailman/default.nix

  Log Message:
  -----------
  mailman: Fix attempts to chmod g+s during installation


  Commit: d339dc762c73564cfbd20ab6c9be803e9c12e1e0
      
https://github.com/NixOS/nixpkgs/commit/d339dc762c73564cfbd20ab6c9be803e9c12e1e0
  Author: Will Dietz <w...@wdtz.org>
  Date:   2017-06-28 (Wed, 28 Jun 2017)

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

  Log Message:
  -----------
  mailutils: Fix attempts to set unsupported ownership and perms


  Commit: 7492873014f64ab52bb945f8335364830530dc8b
      
https://github.com/NixOS/nixpkgs/commit/7492873014f64ab52bb945f8335364830530dc8b
  Author: Will Dietz <w...@wdtz.org>
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
    M pkgs/tools/system/mcron/default.nix

  Log Message:
  -----------
  mcron: Fix attempt to set +s during install


  Commit: 59bf263a593748bf5bb0510c5c638ef9c7c91045
      
https://github.com/NixOS/nixpkgs/commit/59bf263a593748bf5bb0510c5c638ef9c7c91045
  Author: Will Dietz <w...@wdtz.org>
  Date:   2017-06-28 (Wed, 28 Jun 2017)

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

  Log Message:
  -----------
  netselect: Fix attempt to use unsupported permissions on files in store


  Commit: 15253a8dde07bfaaeb9980bdbd9b7cc65913b08e
      
https://github.com/NixOS/nixpkgs/commit/15253a8dde07bfaaeb9980bdbd9b7cc65913b08e
  Author: Will Dietz <w...@wdtz.org>
  Date:   2017-06-28 (Wed, 28 Jun 2017)

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

  Log Message:
  -----------
  wcslib: fix attempts to use unsupported permissions during install


  Commit: 09d85c49c47c10f200ad377fa9940e613e016292
      
https://github.com/NixOS/nixpkgs/commit/09d85c49c47c10f200ad377fa9940e613e016292
  Author: Will Dietz <w...@wdtz.org>
  Date:   2017-06-28 (Wed, 28 Jun 2017)

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

  Log Message:
  -----------
  kbdlight: Fix installation permissions

Looks like NixOS creates a security wrapper for this already, FWIW.


  Commit: 0d871bd108b4c10ddfa9a6ab845d0088c3bbde3d
      
https://github.com/NixOS/nixpkgs/commit/0d871bd108b4c10ddfa9a6ab845d0088c3bbde3d
  Author: Will Dietz <w...@wdtz.org>
  Date:   2017-06-28 (Wed, 28 Jun 2017)

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

  Log Message:
  -----------
  libutempter: Fixup unsupported permissions here as well


  Commit: ed0ac2fece5baf028d44281f3f24a2815d47e6ac
      
https://github.com/NixOS/nixpkgs/commit/ed0ac2fece5baf028d44281f3f24a2815d47e6ac
  Author: Will Dietz <w...@wdtz.org>
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
    M pkgs/servers/news/leafnode/default.nix

  Log Message:
  -----------
  leafnode: patch around setting special bits


  Commit: 707145a955ad0e771154cc45479038282c87dc41
      
https://github.com/NixOS/nixpkgs/commit/707145a955ad0e771154cc45479038282c87dc41
  Author: Will Dietz <w...@wdtz.org>
  Date:   2017-06-28 (Wed, 28 Jun 2017)

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

  Log Message:
  -----------
  firejail: don't try to set setuid bit


  Commit: 8e5759e7d255f30253d7097c11da2f7e8e800fc7
      
https://github.com/NixOS/nixpkgs/commit/8e5759e7d255f30253d7097c11da2f7e8e800fc7
  Author: Will Dietz <w...@wdtz.org>
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
    M pkgs/tools/filesystems/irods/default.nix

  Log Message:
  -----------
  irods: Don't ask cmake to grant setuid permissions


  Commit: bcaceabc3c5076b36ab451e6f23a9d9c1df940c1
      
https://github.com/NixOS/nixpkgs/commit/bcaceabc3c5076b36ab451e6f23a9d9c1df940c1
  Author: Will Dietz <w...@wdtz.org>
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
    M pkgs/tools/misc/ddccontrol/default.nix

  Log Message:
  -----------
  ddccontrol: Don't try to set special perms on ddcpci


  Commit: 8439131b5adc32f28fa0c5b2c0279def4ad67513
      
https://github.com/NixOS/nixpkgs/commit/8439131b5adc32f28fa0c5b2c0279def4ad67513
  Author: Johannes Frankenau <johan...@frankenau.net>
  Date:   2017-06-29 (Thu, 29 Jun 2017)

  Changed paths:
    M pkgs/tools/misc/plowshare/default.nix

  Log Message:
  -----------
  plowshare: 1.1.0 -> 2.1.6


  Commit: e795cd9b187fc5fcce8da580545e5954a77a7408
      
https://github.com/NixOS/nixpkgs/commit/e795cd9b187fc5fcce8da580545e5954a77a7408
  Author: Lancelot SIX <l...@lancelotsix.com>
  Date:   2017-06-29 (Thu, 29 Jun 2017)

  Changed paths:
    M pkgs/tools/misc/screen/default.nix

  Log Message:
  -----------
  screen: 4.5.1 -> 4.6.0

See http://lists.gnu.org/archive/html/info-gnu/2017-06/msg00015.html
for release information


  Commit: 25d47046beaab1eeea142846efa7bdedfc873e9c
      
https://github.com/NixOS/nixpkgs/commit/25d47046beaab1eeea142846efa7bdedfc873e9c
  Author: Johannes Frankenau <johan...@frankenau.net>
  Date:   2017-06-29 (Thu, 29 Jun 2017)

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

  Log Message:
  -----------
  neomutt: 20170602 -> 20170609


  Commit: c5ff68b3c28effb17e686d9d8d2bac1ec6577a1b
      
https://github.com/NixOS/nixpkgs/commit/c5ff68b3c28effb17e686d9d8d2bac1ec6577a1b
  Author: romildo <malaqu...@gmail.com>
  Date:   2017-06-29 (Thu, 29 Jun 2017)

  Changed paths:
    M nixos/modules/services/x11/desktop-managers/lumina.nix
    M pkgs/desktops/lumina/default.nix

  Log Message:
  -----------
  lumina: 1.2.0-p1 -> 1.3.0

- Update to version 1.3.0

- Remove dependency on `oxygen-icons5`, as Lumina desktop now distributes
it’s own "material-design-[light/dark]" icon themes and uses them as the
default icon sets.


  Commit: 99b8d5ebe67a5aeb97c4a4202441d91c7d469e12
      
https://github.com/NixOS/nixpkgs/commit/99b8d5ebe67a5aeb97c4a4202441d91c7d469e12
  Author: Volth <vo...@webmaster.ms>
  Date:   2017-06-29 (Thu, 29 Jun 2017)

  Changed paths:
    M nixos/modules/module-list.nix
    A nixos/modules/services/web-servers/lighttpd/collectd.nix

  Log Message:
  -----------
  lighttpd: add collectd submodule


  Commit: 67340baa9b1093d7551b13e774911076a666f020
      
https://github.com/NixOS/nixpkgs/commit/67340baa9b1093d7551b13e774911076a666f020
  Author: Volth <vo...@webmaster.ms>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M nixos/modules/misc/ids.nix
    M nixos/modules/services/monitoring/collectd.nix

  Log Message:
  -----------
  collectd service: minor refactoring

* removed pid-file support, it is needless to run collectd as systemd service
* removed static user id, as all the files reowned on the service start
* added ambient capabilities for ping and smart (hdd health) functions


  Commit: 4540eaf578dab5415e1cdbb99739534ee1fcf4ac
      
https://github.com/NixOS/nixpkgs/commit/4540eaf578dab5415e1cdbb99739534ee1fcf4ac
  Author: Robin Stumm <serverkor...@gmail.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M nixos/modules/programs/browserpass.nix
    M pkgs/tools/security/browserpass/default.nix

  Log Message:
  -----------
  browserpass: 2017-04-11 -> 1.0.5


  Commit: a1212c77849f11c7334647936a2621c558fd8b28
      
https://github.com/NixOS/nixpkgs/commit/a1212c77849f11c7334647936a2621c558fd8b28
  Author: Volth <vo...@webmaster.ms>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M nixos/modules/services/monitoring/collectd.nix

  Log Message:
  -----------
  collectd service: removed insecure AmbientCapabilities


  Commit: 2260d2dd241429b9007aee5ae59eb826ecd45423
      
https://github.com/NixOS/nixpkgs/commit/2260d2dd241429b9007aee5ae59eb826ecd45423
  Author: romildo <malaqu...@gmail.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

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

  Log Message:
  -----------
  catch: 1.9.5 -> 1.9.6


  Commit: ea052b6f6ba58142b7f939ffb9daf8461ae894fc
      
https://github.com/NixOS/nixpkgs/commit/ea052b6f6ba58142b7f939ffb9daf8461ae894fc
  Author: Vincent Laporte <vincent.lapo...@gmail.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

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

  Log Message:
  -----------
  ocamlPackages.js_of_ocaml: 2.8.3 -> 2.8.4


  Commit: e521b75b9ed9a7962d0928d6bd3dfc47226e3239
      
https://github.com/NixOS/nixpkgs/commit/e521b75b9ed9a7962d0928d6bd3dfc47226e3239
  Author: romildo <malaqu...@gmail.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M pkgs/applications/video/mkvtoolnix/default.nix

  Log Message:
  -----------
  mkvtoolnix: 12.0.0 -> 13.0.0


  Commit: f97766566a339d390de56fd3a646d10b91006d3f
      
https://github.com/NixOS/nixpkgs/commit/f97766566a339d390de56fd3a646d10b91006d3f
  Author: Vincent Laporte <vincent.lapo...@gmail.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

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

  Log Message:
  -----------
  ocamlPackages.javalib: 2.3 -> 2.3.3

ocamlPackages.sawja: 1.5 -> 1.5.2


  Commit: 89c5413b58a9c62d9491a7c850ef76d838039e6c
      
https://github.com/NixOS/nixpkgs/commit/89c5413b58a9c62d9491a7c850ef76d838039e6c
  Author: Tim Steinbach <t...@nequissimus.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M pkgs/tools/admin/google-cloud-sdk/default.nix

  Log Message:
  -----------
  google-cloud-sdk: 159.0.0 -> 161.0.0


  Commit: 9d551d021f6cfaa56a2d24075aca198288969443
      
https://github.com/NixOS/nixpkgs/commit/9d551d021f6cfaa56a2d24075aca198288969443
  Author: Joachim F <joach...@users.noreply.github.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

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

  Log Message:
  -----------
  Merge pull request #26991 from romildo/upd.catch

catch: 1.9.5 -> 1.9.6


  Commit: 8604630d9234cc54eef3a0dbaf10247f528cffa5
      
https://github.com/NixOS/nixpkgs/commit/8604630d9234cc54eef3a0dbaf10247f528cffa5
  Author: Joachim F <joach...@users.noreply.github.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M pkgs/development/libraries/libutempter/default.nix
    M pkgs/development/libraries/wcslib/default.nix
    M pkgs/os-specific/linux/firejail/default.nix
    M pkgs/os-specific/linux/kbdlight/default.nix
    M pkgs/servers/mail/mailman/default.nix
    M pkgs/servers/news/leafnode/default.nix
    M pkgs/tools/filesystems/irods/default.nix
    M pkgs/tools/misc/ddccontrol/default.nix
    M pkgs/tools/networking/mailutils/default.nix
    M pkgs/tools/networking/netselect/default.nix
    M pkgs/tools/system/mcron/default.nix

  Log Message:
  -----------
  Merge pull request #26939 from dtzWill/fix/perms-fallout-misc-2

Fixup various setuid/setgid permission problems, part 2


  Commit: 171c088754dbbc2bfd37ea6e826904f8c945158a
      
https://github.com/NixOS/nixpkgs/commit/171c088754dbbc2bfd37ea6e826904f8c945158a
  Author: Tim Steinbach <t...@nequissimus.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M pkgs/servers/dns/bind/default.nix

  Log Message:
  -----------
  bind: 9.10.5-P2 -> 9.11.1-P2


  Commit: 36f52e5ea0a17b7d71d5b43dd904c08398f48114
      
https://github.com/NixOS/nixpkgs/commit/36f52e5ea0a17b7d71d5b43dd904c08398f48114
  Author: Tim Steinbach <t...@nequissimus.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M pkgs/shells/oh-my-zsh/default.nix

  Log Message:
  -----------
  oh-my-zsh: 2017-05-03 -> 2017-06-22


  Commit: 5eb08b5c68667e3d10b6e767d9327ae54bca8ef1
      
https://github.com/NixOS/nixpkgs/commit/5eb08b5c68667e3d10b6e767d9327ae54bca8ef1
  Author: Tim Steinbach <t...@nequissimus.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M pkgs/servers/nosql/redis/default.nix

  Log Message:
  -----------
  redis: 3.2.8 -> 3.2.9


  Commit: 85d584a3ba4c6099a03a532cdc0fa47e640ced5e
      
https://github.com/NixOS/nixpkgs/commit/85d584a3ba4c6099a03a532cdc0fa47e640ced5e
  Author: Tim Steinbach <nequissi...@users.noreply.github.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M pkgs/tools/misc/screen/default.nix

  Log Message:
  -----------
  Merge pull request #26952 from lsix/update_screen

screen: 4.5.1 -> 4.6.0


  Commit: 33a5e7fed27f6f5d3aa817921bc2c2bd3a827d90
      
https://github.com/NixOS/nixpkgs/commit/33a5e7fed27f6f5d3aa817921bc2c2bd3a827d90
  Author: Peter Simons <sim...@cryp.to>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M pkgs/servers/dns/bind/default.nix

  Log Message:
  -----------
  Merge pull request #26995 from NeQuissimus/bind_9_11_1_p2

bind: 9.10.5-P2 -> 9.11.1-P2


  Commit: 3c29fbe72a5a7f0fa1eef1472d9603688dad3341
      
https://github.com/NixOS/nixpkgs/commit/3c29fbe72a5a7f0fa1eef1472d9603688dad3341
  Author: Joachim F <joach...@users.noreply.github.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M pkgs/applications/video/mkvtoolnix/default.nix

  Log Message:
  -----------
  Merge pull request #26993 from romildo/upd.mkvtoolnix

mkvtoolnix: 12.0.0 -> 13.0.0


  Commit: 5fd4ae36e2b19d4c1c97284817a8767017b82cb1
      
https://github.com/NixOS/nixpkgs/commit/5fd4ae36e2b19d4c1c97284817a8767017b82cb1
  Author: Graham Christensen <gra...@grahamc.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M nixos/release-combined.nix

  Log Message:
  -----------
  nixos release-combined: only build zfsroot tests on x86_64-linux


  Commit: a8ba50db3ed2fa3c60159921e11182216f7c07a3
      
https://github.com/NixOS/nixpkgs/commit/a8ba50db3ed2fa3c60159921e11182216f7c07a3
  Author: Joachim F <joach...@users.noreply.github.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M nixos/modules/virtualisation/xen-dom0.nix
    A pkgs/applications/virtualization/xen/4.8.nix
    M pkgs/applications/virtualization/xen/generic.nix
    M pkgs/applications/virtualization/xen/packages.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #26492 from michalpalka/new-xen

xen_4_8: init at 4.8.1


  Commit: c043bf955f6ee9f19d990c62d9e233776239bc69
      
https://github.com/NixOS/nixpkgs/commit/c043bf955f6ee9f19d990c62d9e233776239bc69
  Author: Joachim F <joach...@users.noreply.github.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    A pkgs/misc/gnash/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #26620 from rnhmjoj/gnash

gnash: init at 0.8.11-2017-03-08 [WIP]


  Commit: 7f4f08ecae203ad8ea4ec3b4e977501626a3aab8
      
https://github.com/NixOS/nixpkgs/commit/7f4f08ecae203ad8ea4ec3b4e977501626a3aab8
  Author: Daiderd Jordan <daid...@gmail.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M pkgs/servers/nosql/redis/default.nix

  Log Message:
  -----------
  Merge pull request #26997 from NeQuissimus/redis_3_2_9

redis: 3.2.8 -> 3.2.9


  Commit: 74b3a8f5ae01ae83c384b71cd39384e82a51da61
      
https://github.com/NixOS/nixpkgs/commit/74b3a8f5ae01ae83c384b71cd39384e82a51da61
  Author: Joachim F <joach...@users.noreply.github.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M nixos/modules/programs/browserpass.nix
    M pkgs/tools/security/browserpass/default.nix

  Log Message:
  -----------
  Merge pull request #26541 from dermetfan/browserpass

browserpass: 2017-04-11 -> 1.0.5


  Commit: f6e1d929a0a917e02428a921784315563a94b2a3
      
https://github.com/NixOS/nixpkgs/commit/f6e1d929a0a917e02428a921784315563a94b2a3
  Author: Vincent Laporte <vincent.lapo...@gmail.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    A pkgs/development/ocaml-modules/ocplib-json-typed/default.nix
    M pkgs/top-level/ocaml-packages.nix

  Log Message:
  -----------
  ocamlPackages.ocplib-json-typed: init at 0.5


  Commit: e184b197ec1e92e2e9eba3d12f4a5d5fe6b03f7b
      
https://github.com/NixOS/nixpkgs/commit/e184b197ec1e92e2e9eba3d12f4a5d5fe6b03f7b
  Author: Peter Simons <sim...@cryp.to>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M pkgs/shells/oh-my-zsh/default.nix

  Log Message:
  -----------
  Merge pull request #26996 from NeQuissimus/oh-my-zsh_2017_06_22

oh-my-zsh: 2017-05-03 -> 2017-06-22


  Commit: dcbf2fd315c2a6db9e0a5a3cfb5ca512501c8843
      
https://github.com/NixOS/nixpkgs/commit/dcbf2fd315c2a6db9e0a5a3cfb5ca512501c8843
  Author: Jörg Thalheim <mi...@users.noreply.github.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M pkgs/tools/misc/plowshare/default.nix

  Log Message:
  -----------
  Merge pull request #26955 from jfrankenau/plowshare-2.1.6

plowshare: 1.1.0 -> 2.1.6


  Commit: e02064093218e71da56f73392250cfa85e2babd1
      
https://github.com/NixOS/nixpkgs/commit/e02064093218e71da56f73392250cfa85e2babd1
  Author: Jörg Thalheim <mi...@users.noreply.github.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M pkgs/tools/admin/google-cloud-sdk/default.nix

  Log Message:
  -----------
  Merge pull request #26994 from NeQuissimus/gcloud_sdk_161

google-cloud-sdk: 159.0.0 -> 161.0.0


  Commit: 2f1c67746c9239320e0bb55882c5d1ef2535392c
      
https://github.com/NixOS/nixpkgs/commit/2f1c67746c9239320e0bb55882c5d1ef2535392c
  Author: Volth <vo...@webmaster.ms>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M pkgs/tools/system/collectd/default.nix

  Log Message:
  -----------
  collectd: fix configureFlags and place jars to $out/share/java


  Commit: 3dd29b2453d1065ae468c2637a24d415c6cd0695
      
https://github.com/NixOS/nixpkgs/commit/3dd29b2453d1065ae468c2637a24d415c6cd0695
  Author: zimbatm <zimb...@zimbatm.com>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

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

  Log Message:
  -----------
  ipfs: 0.4.9 -> 0.4.10 (#27001)


  Commit: 20d31d7f49513121dfb2484cccb4b246f050e682
      
https://github.com/NixOS/nixpkgs/commit/20d31d7f49513121dfb2484cccb4b246f050e682
  Author: Cray Elliott <m...@archlinux.us>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M pkgs/applications/video/obs-studio/default.nix

  Log Message:
  -----------
  obs-studio: 19.0.2 -> 19.0.3


  Commit: dd4c1e2b019a31ee7362f0d9a042f13e1038f008
      
https://github.com/NixOS/nixpkgs/commit/dd4c1e2b019a31ee7362f0d9a042f13e1038f008
  Author: Maximilian Bosch <maximil...@mbosch.me>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    M pkgs/applications/window-managers/i3/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  i3: add `configFile` to enable cutom configuration locations

i3 loads its configuration from `~/.config/i3`, but in nix-based systems
you might want to build the config in `~/.nix-profile` using a nix
derivation, so `i3` needs to know where to look for the configuration
file.


  Commit: 0dd204ebfe5500714ab82ba80ae6182a2fcc4ebf
      
https://github.com/NixOS/nixpkgs/commit/0dd204ebfe5500714ab82ba80ae6182a2fcc4ebf
  Author: Johannes Frankenau <johan...@frankenau.net>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    M nixos/modules/services/audio/mpd.nix

  Log Message:
  -----------
  mpd service: Create playlist directory


  Commit: 36021ddaaf6d1cefefe0647a55f0889d1ba0fadd
      
https://github.com/NixOS/nixpkgs/commit/36021ddaaf6d1cefefe0647a55f0889d1ba0fadd
  Author: Johannes Frankenau <johan...@frankenau.net>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    M pkgs/applications/window-managers/i3/lock.nix

  Log Message:
  -----------
  i3lock: 2.8 -> 2.9.1


  Commit: 7d8adcab3832cafdbd2f27ab70a27953a0a484b6
      
https://github.com/NixOS/nixpkgs/commit/7d8adcab3832cafdbd2f27ab70a27953a0a484b6
  Author: Peter Simons <sim...@cryp.to>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    M pkgs/development/haskell-modules/configuration-hackage2nix.yaml

  Log Message:
  -----------
  LTS Haskell 8.21


  Commit: be23568daac69331f1f78b9c20b780f575ed2acd
      
https://github.com/NixOS/nixpkgs/commit/be23568daac69331f1f78b9c20b780f575ed2acd
  Author: RFish ⚓ <ronancherru...@gmail.com>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    M pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
    M pkgs/development/haskell-modules/configuration-hackage2nix.yaml

  Log Message:
  -----------
  hackage2nix: use older version of apply-refact with ghc-8.0.x

Version 0.4 of apply-refact doesn't compile with GHC 8.0.x. This patch
updates configurations-ghc-8.0.x to use apply-refact version 0.3.0.1.

Closes https://github.com/NixOS/nixpkgs/pull/26896.
Fixes https://github.com/NixOS/nixpkgs/issues/26895.


  Commit: 641bd6e0ca00460a1243831b42f1d06bab2d67b1
      
https://github.com/NixOS/nixpkgs/commit/641bd6e0ca00460a1243831b42f1d06bab2d67b1
  Author: Peter Simons <sim...@cryp.to>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    M pkgs/development/haskell-modules/hackage-packages.nix

  Log Message:
  -----------
  hackage-packages.nix: automatic Haskell package set update

This update was generated by hackage2nix v2.2.1-13-g5c18fb5 from Hackage 
revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/b275173e921ad083e3cbd9a448b03df9748ec7b1.


  Commit: 2e78ca284e8e10ead2108a22e07b6801c71fd070
      
https://github.com/NixOS/nixpkgs/commit/2e78ca284e8e10ead2108a22e07b6801c71fd070
  Author: Pascal Wittmann <m...@pascal-wittmann.de>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    M pkgs/applications/networking/instant-messengers/mcabber/default.nix

  Log Message:
  -----------
  mcabber: 1.0.5 -> 1.1.0


  Commit: fa92dd8cfc52ffa0c70e394abe2e7e8409372cb3
      
https://github.com/NixOS/nixpkgs/commit/fa92dd8cfc52ffa0c70e394abe2e7e8409372cb3
  Author: Pascal Wittmann <m...@pascal-wittmann.de>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

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

  Log Message:
  -----------
  nzbget: 18.1 -> 19.0


  Commit: cdf0c53ac77b7accf4fc9bda2914d405cce17aae
      
https://github.com/NixOS/nixpkgs/commit/cdf0c53ac77b7accf4fc9bda2914d405cce17aae
  Author: Pascal Wittmann <m...@pascal-wittmann.de>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    M pkgs/development/tools/misc/yodl/default.nix

  Log Message:
  -----------
  yodl: 3.08.02 -> 4.01.00


  Commit: 1420b20f08666e79efbe81c0c0728f869b643812
      
https://github.com/NixOS/nixpkgs/commit/1420b20f08666e79efbe81c0c0728f869b643812
  Author: Pascal Wittmann <m...@pascal-wittmann.de>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    M pkgs/servers/radicale/default.nix

  Log Message:
  -----------
  radicale: 1.1.2 -> 1.1.4


  Commit: e071756043bab71432b800af0dd55805b80b0b76
      
https://github.com/NixOS/nixpkgs/commit/e071756043bab71432b800af0dd55805b80b0b76
  Author: Pascal Wittmann <m...@pascal-wittmann.de>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    M pkgs/development/tools/analysis/spin/default.nix

  Log Message:
  -----------
  spin: 6.4.5 -> 6.4.6


  Commit: c4d59d886d3cfa4be8c908e77c1ce0fe23ed1312
      
https://github.com/NixOS/nixpkgs/commit/c4d59d886d3cfa4be8c908e77c1ce0fe23ed1312
  Author: tjikini <ildrenc...@gmail.com>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    M pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix

  Log Message:
  -----------
  emacs-all-the-icons-fonts: 2.50 -> 2.6.4


  Commit: 9c05499de972ba3d990002cbdf2530d3b273a836
      
https://github.com/NixOS/nixpkgs/commit/9c05499de972ba3d990002cbdf2530d3b273a836
  Author: Frederik Rietdijk <freddyrietd...@fridh.nl>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    M pkgs/development/libraries/gdal/default.nix
    A pkgs/tools/misc/hdf4/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #26039 from knedlsepp/add-gdal-hdf4-support

gdal: Add hdf4 support


  Commit: 81e46dbb29c0218e057df151e6377bf59b98db13
      
https://github.com/NixOS/nixpkgs/commit/81e46dbb29c0218e057df151e6377bf59b98db13
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    M pkgs/tools/typesetting/tex/texlive/default.nix

  Log Message:
  -----------
  texlive: wrap scripts by older perl

Fixes #26890.


  Commit: 1551975e64fca2c6975b87cf0b05431a123df6f0
      
https://github.com/NixOS/nixpkgs/commit/1551975e64fca2c6975b87cf0b05431a123df6f0
  Author: Vincent Laporte <vincent.lapo...@gmail.com>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    A pkgs/development/ocaml-modules/ocp-ocamlres/default.nix
    M pkgs/top-level/ocaml-packages.nix

  Log Message:
  -----------
  ocamlPackages.ocp-ocamlres: init at 0.3

A tool ocp-ocamlres to embed files and directories inside OCaml executables,
with a companion library ocplib-ocamlres to manipulate them at run-time.

Homepage: https://www.typerex.org/ocp-ocamlres.html


  Commit: 8dddd2b67204c13331beba2299a47eb3a49b1682
      
https://github.com/NixOS/nixpkgs/commit/8dddd2b67204c13331beba2299a47eb3a49b1682
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    M pkgs/tools/typesetting/tex/texlive/combine.nix

  Log Message:
  -----------
  texlive.combine: fix perl scripts without a shebang

Fixes #24343.  These parts of upstream texlive are really ugly.
Also improve variable quoting in the code around.


  Commit: 6acb707f350b74fc9f278ab2e77a64563ddd0ad2
      
https://github.com/NixOS/nixpkgs/commit/6acb707f350b74fc9f278ab2e77a64563ddd0ad2
  Author: Gabriel Ebner <geb...@gebner.org>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

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

  Log Message:
  -----------
  Merge pull request #26956 from jfrankenau/neomutt-20170609

neomutt: 20170602 -> 20170609


  Commit: 1add3519dffca4fa40e539904c3c9522582167f7
      
https://github.com/NixOS/nixpkgs/commit/1add3519dffca4fa40e539904c3c9522582167f7
  Author: Johannes Frankenau <johan...@frankenau.net>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    M pkgs/applications/audio/ncmpcpp/default.nix

  Log Message:
  -----------
  ncmpcpp: 0.7.7 -> 0.8


  Commit: d7ce6a83b123e62a9bb7ec9f86efd1a629a345e1
      
https://github.com/NixOS/nixpkgs/commit/d7ce6a83b123e62a9bb7ec9f86efd1a629a345e1
  Author: Joachim Fasting <joach...@fastmail.fm>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    M pkgs/tools/security/tor/default.nix

  Log Message:
  -----------
  tor: 0.3.0.8 -> 0.3.0.9

See https://blog.torproject.org/blog/tor-0309-released-security-update-clients


  Commit: 07aca910d57f148ee991c47f3801eb8a3a841959
      
https://github.com/NixOS/nixpkgs/commit/07aca910d57f148ee991c47f3801eb8a3a841959
  Author: Joachim F <joach...@users.noreply.github.com>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    M pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix

  Log Message:
  -----------
  Merge pull request #27008 from tjikini/emacs-all-the-icons-fonts

emacs-all-the-icons-fonts: 2.50 -> 2.6.4


  Commit: 4e548d2717ed9ba0aa005d00922bf4dbaeee9a8e
      
https://github.com/NixOS/nixpkgs/commit/4e548d2717ed9ba0aa005d00922bf4dbaeee9a8e
  Author: Joachim F <joach...@users.noreply.github.com>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    M nixos/modules/services/x11/desktop-managers/lumina.nix
    M pkgs/desktops/lumina/default.nix

  Log Message:
  -----------
  Merge pull request #26964 from romildo/upd.lumina

lumina: 1.2.0-p1 -> 1.3.0


  Commit: 8fd3645e1b806cf89d705208e45acd8d7a215a82
      
https://github.com/NixOS/nixpkgs/commit/8fd3645e1b806cf89d705208e45acd8d7a215a82
  Author: Vincent Laporte <vincent.lapo...@gmail.com>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

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

  Log Message:
  -----------
  ocamlPackages.jsonm: 1.0.0 -> 1.0.1


  Commit: 352d487101eded14fd4f592f4d4909017187f0d6
      
https://github.com/NixOS/nixpkgs/commit/352d487101eded14fd4f592f4d4909017187f0d6
  Author: Vincent Laporte <vincent.lapo...@gmail.com>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

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

  Log Message:
  -----------
  ocamlPackages.conduit: 0.8.3 -> 0.10.0


  Commit: fe9147a042f83b7700da92f0680cfb7438997ac3
      
https://github.com/NixOS/nixpkgs/commit/fe9147a042f83b7700da92f0680cfb7438997ac3
  Author: Vincent Laporte <vincent.lapo...@gmail.com>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    A pkgs/development/ocaml-modules/conduit/0.10.0.nix
    M pkgs/development/ocaml-modules/conduit/default.nix
    M pkgs/top-level/ocaml-packages.nix

  Log Message:
  -----------
  ocamlPackages.conduit: 0.10.0 -> 0.15.4

Keeping the old version under attribute conduit_p4.


  Commit: 6875115b8e0ab94a00bc3c6f4c37857effcf6055
      
https://github.com/NixOS/nixpkgs/commit/6875115b8e0ab94a00bc3c6f4c37857effcf6055
  Author: Vincent Laporte <vincent.lapo...@gmail.com>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    A pkgs/development/ocaml-modules/cohttp/0.19.3.nix
    M pkgs/development/ocaml-modules/cohttp/default.nix
    M pkgs/top-level/ocaml-packages.nix

  Log Message:
  -----------
  ocamlPackages.cohttp: 0.19.3 -> 0.22.0

Keeping the old version under attribute cohttp_p4


  Commit: 4338ddd0f95fef1dffb1342651d49a4a0b60a8dc
      
https://github.com/NixOS/nixpkgs/commit/4338ddd0f95fef1dffb1342651d49a4a0b60a8dc
  Author: Vincent Laporte <vincent.lapo...@gmail.com>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

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

  Log Message:
  -----------
  ocamlPackages.mstruct: init at 1.3.3

Mstruct is a thin mutable layer on top of cstruct

Homepage: https://github.com/mirage/ocaml-mstruct


  Commit: 982af09d2c87d186539f1fd500996277c6b85472
      
https://github.com/NixOS/nixpkgs/commit/982af09d2c87d186539f1fd500996277c6b85472
  Author: Vincent Laporte <vincent.lapo...@gmail.com>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    M pkgs/development/interpreters/perl/default.nix

  Log Message:
  -----------
  perl522: fix build on Darwin

The sw_vers patch only applies to version 5.24


  Commit: 6eb2d7d44b4cd68af3afd3549dc68c740927de69
      
https://github.com/NixOS/nixpkgs/commit/6eb2d7d44b4cd68af3afd3549dc68c740927de69
  Author: Vincent Laporte <vincent.lapo...@gmail.com>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

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

  Log Message:
  -----------
  ocamlPackages.decompress: init at 0.6

decompress is a pure OCaml implementation of Zlib.

Homepage: https://github.com/mirage/decompress


  Commit: 6a0f4f69e1c89fd812e5b37bc25438b1b6ba6160
      
https://github.com/NixOS/nixpkgs/commit/6a0f4f69e1c89fd812e5b37bc25438b1b6ba6160
  Author: Vincent Laporte <vincent.lapo...@gmail.com>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

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

  Log Message:
  -----------
  ocamlPackages.git: init at 1.11.0

Git format and protocol in pure OCaml

Homepage: https://github.com/mirage/ocaml-git


  Commit: 6f86a1bd09116a6ad5a07ba040f6d9ddc5caa21e
      
https://github.com/NixOS/nixpkgs/commit/6f86a1bd09116a6ad5a07ba040f6d9ddc5caa21e
  Author: zimbatm <zimb...@zimbatm.com>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

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

  Log Message:
  -----------
  Terraform 0.9.10 (#27003)

* terraform: remove old 0.9.x versions

* terraform: 0.9.9 -> 0.9.10


  Commit: f075c0c9fa76cf334e32ca9e8d41ec9827f621af
      
https://github.com/NixOS/nixpkgs/commit/f075c0c9fa76cf334e32ca9e8d41ec9827f621af
  Author: makefu <git...@syntax-fehler.de>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    A pkgs/tools/security/gen-oath-safe/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  gen-oath-safe: init at 2017-01-23


  Commit: a20dbcb88b7aa125e6da481405395083784e1c00
      
https://github.com/NixOS/nixpkgs/commit/a20dbcb88b7aa125e6da481405395083784e1c00
  Author: Frederik Rietdijk <freddyrietd...@fridh.nl>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    A pkgs/tools/security/gen-oath-safe/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #27002 from makefu/pkgs/gen-oath-safe/init

gen-oath-safe: init at 2017-01-23


  Commit: ee260ce12a4dfae08fb0ff4c0cdafe55f3d38c4c
      
https://github.com/NixOS/nixpkgs/commit/ee260ce12a4dfae08fb0ff4c0cdafe55f3d38c4c
  Author: Ivan Jager <a...@mrph.org>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    M pkgs/tools/misc/megacli/default.nix

  Log Message:
  -----------
  megacli: Fix missing libncurses.so.5


  Commit: 36b1d11188dd935a1a24e53df9eb454273562225
      
https://github.com/NixOS/nixpkgs/commit/36b1d11188dd935a1a24e53df9eb454273562225
  Author: Jörg Thalheim <jo...@thalheim.io>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    M pkgs/development/tools/misc/ccache/default.nix
    A pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch

  Log Message:
  -----------
  ccache: 3.2.5 -> 3.3.4


  Commit: dad7df959c5c122b0c969ffa48cc848fbe3bd771
      
https://github.com/NixOS/nixpkgs/commit/dad7df959c5c122b0c969ffa48cc848fbe3bd771
  Author: romildo <malaqu...@gmail.com>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    M pkgs/development/qtcreator/default.nix

  Log Message:
  -----------
  qtcreator: 4.3.0 -> 4.3.1


  Commit: be4fc9ec1fb5a407f9a7a028c9a7ee235bb80601
      
https://github.com/NixOS/nixpkgs/commit/be4fc9ec1fb5a407f9a7a028c9a7ee235bb80601
  Author: Benno Fünfstück <benno.fuenfstu...@gmail.com>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    M pkgs/applications/window-managers/i3/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #26983 from Ma27/i3/allow-custom-configuration

i3: add `configFile` to enable cutom configuration locations


  Commit: 13c8c847f42a5b0328ff0305351151cc0d65ab6e
      
https://github.com/NixOS/nixpkgs/commit/13c8c847f42a5b0328ff0305351151cc0d65ab6e
  Author: Benno Fünfstück <benno.fuenfstu...@gmail.com>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    M pkgs/applications/window-managers/i3/lock.nix

  Log Message:
  -----------
  Merge pull request #27007 from jfrankenau/update-i3lock

i3lock: 2.8 -> 2.9.1


  Commit: 712d26d437597ed199ef591f3712106f11e846a9
      
https://github.com/NixOS/nixpkgs/commit/712d26d437597ed199ef591f3712106f11e846a9
  Author: Jörg Thalheim <jo...@thalheim.io>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    M pkgs/tools/system/runit/default.nix

  Log Message:
  -----------
  runit: disable uid check during install


  Commit: b1ae3131114d470a18884b45e753b866f0a079ec
      
https://github.com/NixOS/nixpkgs/commit/b1ae3131114d470a18884b45e753b866f0a079ec
  Author: Jörg Thalheim <mi...@users.noreply.github.com>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    M pkgs/tools/system/collectd/default.nix

  Log Message:
  -----------
  Merge pull request #26998 from volth/collectd-configure-flags

collectd: fix configureFlags and jar location


  Commit: 6e36e7f209e9177a4f73cb7576ebb546607fe052
      
https://github.com/NixOS/nixpkgs/commit/6e36e7f209e9177a4f73cb7576ebb546607fe052
  Author: Joachim Fasting <joach...@fastmail.fm>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    R pkgs/development/tools/misc/gede/build.patch
    M pkgs/development/tools/misc/gede/default.nix

  Log Message:
  -----------
  gede: replace build.patch with inline sed call

The patch file is much larger than the logical change made.


  Commit: 4f320d30a420071c5e79314a4fba682862eaa335
      
https://github.com/NixOS/nixpkgs/commit/4f320d30a420071c5e79314a4fba682862eaa335
  Author: Joachim Fasting <joach...@fastmail.fm>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    M pkgs/development/tools/misc/gede/default.nix

  Log Message:
  -----------
  gede: fix sandboxed build

build.py relies on /usr/bin/env; invoke python directly instead to
sidestep the issue.


  Commit: 0040dbaf692ec18f1323db6abe577cf5983a6971
      
https://github.com/NixOS/nixpkgs/commit/0040dbaf692ec18f1323db6abe577cf5983a6971
  Author: Joachim Fasting <joach...@fastmail.fm>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    M pkgs/development/tools/misc/gede/default.nix

  Log Message:
  -----------
  gede: add ctags and gdb to path via wrapper


  Commit: 80c2c586711609eb791063fca384d54699b97a0e
      
https://github.com/NixOS/nixpkgs/commit/80c2c586711609eb791063fca384d54699b97a0e
  Author: Joachim Fasting <joach...@fastmail.fm>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    M pkgs/development/tools/misc/gede/default.nix

  Log Message:
  -----------
  gede: 2.0.3 -> 2.0.4


  Commit: f442294719f8074177de4ceb14d62e36081451d6
      
https://github.com/NixOS/nixpkgs/commit/f442294719f8074177de4ceb14d62e36081451d6
  Author: Emmanuel Rosa <goaway1...@gmail.com>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    M pkgs/applications/office/libreoffice/default.nix

  Log Message:
  -----------
  libreoffice: remove spadmin wrapper

This change removes the spadmin wrapper because the utility was removed from 
LibreOffice in release 4.3. See 
https://wiki.documentfoundation.org/ReleaseNotes/4.3#CUPS.2C_fax_machines_and_spadmin
 which states:

 > The graphical utility spadmin is now removed in favor of these new features 
 > and the operating system's standard printer administration tools. (Caolán 
 > McNamara)

 Closes #26671


  Commit: 26f47d1431353ccea06636525f206cd8c5ea3782
      
https://github.com/NixOS/nixpkgs/commit/26f47d1431353ccea06636525f206cd8c5ea3782
  Author: Michael Raskin <7c6f4...@mail.ru>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    M pkgs/applications/office/libreoffice/default.nix

  Log Message:
  -----------
  Merge pull request #27023 from emmanuelrosa/spadmin

libreoffice: remove spadmin wrapper


  Commit: b16ed16c997248af5be5080134566fd3d741c939
      
https://github.com/NixOS/nixpkgs/commit/b16ed16c997248af5be5080134566fd3d741c939
  Author: Benno Fünfstück <benno.fuenfstu...@gmail.com>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

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

  Log Message:
  -----------
  python-pwntools: 3.1 -> 3.7 (including dependencies)


  Commit: c440bacea3fab588e8e01309511e1e469ba8afa2
      
https://github.com/NixOS/nixpkgs/commit/c440bacea3fab588e8e01309511e1e469ba8afa2
  Author: dywedir <dywe...@protonmail.ch>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

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

  Log Message:
  -----------
  exiftool: 10.48 -> 10.55


  Commit: 0878ca7ab4c9da80ba18357cfd29596dc0500973
      
https://github.com/NixOS/nixpkgs/commit/0878ca7ab4c9da80ba18357cfd29596dc0500973
  Author: Emmanuel Rosa <goaway1...@gmail.com>
  Date:   2017-07-01 (Sat, 01 Jul 2017)

  Changed paths:
    M pkgs/misc/cups/drivers/splix/default.nix

  Log Message:
  -----------
  splix: enable JBIG

Enables JBIG given that according to OpenPrinting.org, the patents have expired.
See https://www.openprinting.org/driver/splix/license/

Closes #25929


  Commit: b1d79f0ef39faffee5ade67e806c22c048d4aa77
      
https://github.com/NixOS/nixpkgs/commit/b1d79f0ef39faffee5ade67e806c22c048d4aa77
  Author: Bart Brouns <b...@magnetophon.nl>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

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

  Log Message:
  -----------
  ranger: fix absolute paths in scope.sh


  Commit: d2d62e43a0daa48af529c8c2b3e486acccdf93de
      
https://github.com/NixOS/nixpkgs/commit/d2d62e43a0daa48af529c8c2b3e486acccdf93de
  Author: Jörg Thalheim <mi...@users.noreply.github.com>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

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

  Log Message:
  -----------
  Merge pull request #27028 from magnetophon/ranger

ranger: fix absolute paths in scope.sh


  Commit: 5c45f341f168c722277bf0bf5330caff8b1bf7cd
      
https://github.com/NixOS/nixpkgs/commit/5c45f341f168c722277bf0bf5330caff8b1bf7cd
  Author: Jörg Thalheim <jo...@thalheim.io>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

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

  Log Message:
  -----------
  pythonPackages.intervaltree: fix evaluation


  Commit: 756e69bf97c5170408b9511d57c04f4c772c458d
      
https://github.com/NixOS/nixpkgs/commit/756e69bf97c5170408b9511d57c04f4c772c458d
  Author: volth <vo...@webmaster.ms>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

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

  Log Message:
  -----------
  syncthing: don't import from pkgs (#27029)


  Commit: cf07fc6b160cffc0360674c69be2ff3c5a282e95
      
https://github.com/NixOS/nixpkgs/commit/cf07fc6b160cffc0360674c69be2ff3c5a282e95
  Author: Silvan Mosberger <infini...@icloud.com>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
    M nixos/modules/system/boot/luksroot.nix

  Log Message:
  -----------
  luksroot: fix typo


  Commit: b1ebe7a72c9aa0da8884a946e362bbd965ba82aa
      
https://github.com/NixOS/nixpkgs/commit/b1ebe7a72c9aa0da8884a946e362bbd965ba82aa
  Author: Peter Simons <sim...@cryp.to>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
    M pkgs/development/r-modules/bioc-annotation-packages.nix
    M pkgs/development/r-modules/bioc-experiment-packages.nix
    M pkgs/development/r-modules/bioc-packages.nix
    M pkgs/development/r-modules/cran-packages.nix
    M pkgs/development/r-modules/default.nix

  Log Message:
  -----------
  r-modules: update package set


  Commit: 288b40830431721e302d0efa7988295032fad7a8
      
https://github.com/NixOS/nixpkgs/commit/288b40830431721e302d0efa7988295032fad7a8
  Author: zraexy <zra...@gmail.com>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
    M pkgs/applications/misc/redshift-plasma-applet/default.nix

  Log Message:
  -----------
  redshift-plasma-applet: 1.0.17 -> 1.0.18


  Commit: fd488c4a2ad10dee98e8ce8b86a73184fba80abd
      
https://github.com/NixOS/nixpkgs/commit/fd488c4a2ad10dee98e8ce8b86a73184fba80abd
  Author: mimadrid <mimad...@ucm.es>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

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

  Log Message:
  -----------
  vifm: 0.8.2 -> 0.9


  Commit: 8d55617a5dd8f39794f38c3b61ba596c2c65c3ef
      
https://github.com/NixOS/nixpkgs/commit/8d55617a5dd8f39794f38c3b61ba596c2c65c3ef
  Author: Frederik Rietdijk <freddyrietd...@fridh.nl>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
    M pkgs/development/qtcreator/default.nix

  Log Message:
  -----------
  Merge pull request #27021 from romildo/upd.qtcreator

qtcreator: 4.3.0 -> 4.3.1


  Commit: a6ea1a1b25aba1139a47a19c436bd746d255ca46
      
https://github.com/NixOS/nixpkgs/commit/a6ea1a1b25aba1139a47a19c436bd746d255ca46
  Author: Frederik Rietdijk <freddyrietd...@fridh.nl>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
    M pkgs/applications/misc/redshift-plasma-applet/default.nix

  Log Message:
  -----------
  Merge pull request #27035 from zraexy/redshift-plasma-applet

redshift-plasma-applet: 1.0.17 -> 1.0.18


  Commit: fb1ed9d17b54989d736d81a7cf898aa44815f59f
      
https://github.com/NixOS/nixpkgs/commit/fb1ed9d17b54989d736d81a7cf898aa44815f59f
  Author: Frederik Rietdijk <freddyrietd...@fridh.nl>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
    M pkgs/tools/misc/megacli/default.nix

  Log Message:
  -----------
  Merge pull request #27032 from aij/fix-megacli

megacli: Fix missing libncurses.so.5


  Commit: 6b5150d29dada2f8366e0e1c1220dd8736f51aea
      
https://github.com/NixOS/nixpkgs/commit/6b5150d29dada2f8366e0e1c1220dd8736f51aea
  Author: Frederik Rietdijk <freddyrietd...@fridh.nl>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
    M nixos/modules/system/boot/luksroot.nix

  Log Message:
  -----------
  Merge pull request #27030 from Infinisil/luks-typo

luksroot: fix typo


  Commit: 9143cc6bc0e714198048fedca0f70807db0a9e42
      
https://github.com/NixOS/nixpkgs/commit/9143cc6bc0e714198048fedca0f70807db0a9e42
  Author: Frederik Rietdijk <freddyrietd...@fridh.nl>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
    M pkgs/misc/cups/drivers/splix/default.nix

  Log Message:
  -----------
  Merge pull request #27027 from emmanuelrosa/splix-jbig

splix: enable JBIG


  Commit: e7c38c14b1bc98ed439b6d93654c5826338390c3
      
https://github.com/NixOS/nixpkgs/commit/e7c38c14b1bc98ed439b6d93654c5826338390c3
  Author: Peter Simons <sim...@cryp.to>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

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

  Log Message:
  -----------
  cabal2nix: disable test suite in 32 bit builds to fix the build

Works around https://github.com/NixOS/cabal2nix/issues/272.


  Commit: afb27bd4ebcd96ad9fbb01be124af9c863c63ada
      
https://github.com/NixOS/nixpkgs/commit/afb27bd4ebcd96ad9fbb01be124af9c863c63ada
  Author: zraexy <zra...@gmail.com>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
    M pkgs/applications/video/streamlink/default.nix

  Log Message:
  -----------
  streamlink: 0.6.0 -> 0.7.0


  Commit: 97e8422541d2acbf083e9efde6f0a42ffde2e18b
      
https://github.com/NixOS/nixpkgs/commit/97e8422541d2acbf083e9efde6f0a42ffde2e18b
  Author: Tristan Helmich <tristan.helm...@gmail.com>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
    M nixos/modules/module-list.nix
    A nixos/modules/services/logging/heartbeat.nix

  Log Message:
  -----------
  heartbeat service: init


  Commit: d88f83de6b90e7d96b357287d252e5f746d57433
      
https://github.com/NixOS/nixpkgs/commit/d88f83de6b90e7d96b357287d252e5f746d57433
  Author: Joachim F <joach...@users.noreply.github.com>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
    M pkgs/build-support/release/default.nix

  Log Message:
  -----------
  Merge pull request #17681 from ericsagnes/feat/releaseTools.channel

releaseTools: add channel function


  Commit: 09aa1ca9351b6fd1c8d64079c7439d2f44a2f2b3
      
https://github.com/NixOS/nixpkgs/commit/09aa1ca9351b6fd1c8d64079c7439d2f44a2f2b3
  Author: Frederik Rietdijk <freddyrietd...@fridh.nl>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
    M pkgs/applications/video/streamlink/default.nix

  Log Message:
  -----------
  Merge pull request #27036 from zraexy/streamlink

streamlink: 0.6.0 -> 0.7.0


  Commit: a5a98f98a05ed73d45e52b9409b8a494d9ce072a
      
https://github.com/NixOS/nixpkgs/commit/a5a98f98a05ed73d45e52b9409b8a494d9ce072a
  Author: Frederik Rietdijk <fr...@fridh.nl>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

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

  Log Message:
  -----------
  krename: fix build


  Commit: 8197e4dffada57690b2de86cf50251273d4f7f7c
      
https://github.com/NixOS/nixpkgs/commit/8197e4dffada57690b2de86cf50251273d4f7f7c
  Author: dywedir <dywe...@protonmail.ch>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
    M pkgs/tools/text/xsv/default.nix

  Log Message:
  -----------
  xsv: 0.11.0 -> 0.12.1


  Commit: 70e169460acdac22481a65a4e440b1967e4abdd0
      
https://github.com/NixOS/nixpkgs/commit/70e169460acdac22481a65a4e440b1967e4abdd0
  Author: Lancelot SIX <l...@lancelotsix.com>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

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

  Log Message:
  -----------
  pythonPackages: mark disabled and broken packages


  Commit: d15e20f9c9f974003b34e8a45689c1de99a9deec
      
https://github.com/NixOS/nixpkgs/commit/d15e20f9c9f974003b34e8a45689c1de99a9deec
  Author: Frederik Rietdijk <freddyrietd...@fridh.nl>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

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

  Log Message:
  -----------
  Merge pull request #26397 from FRidh/django

python.pkgs.django cleanup


  Commit: c0086b8996b3e948a6b392b55763f07123e48fcc
      
https://github.com/NixOS/nixpkgs/commit/c0086b8996b3e948a6b392b55763f07123e48fcc
  Author: Joachim F <joach...@users.noreply.github.com>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
    M nixos/modules/module-list.nix
    A nixos/modules/services/logging/heartbeat.nix

  Log Message:
  -----------
  Merge pull request #27019 from fadenb/heartbeat_service

heartbeat service: init


  Commit: e20364a93788b4a8e0a7951cd6ac3d3a5088f4ed
      
https://github.com/NixOS/nixpkgs/commit/e20364a93788b4a8e0a7951cd6ac3d3a5088f4ed
  Author: Joachim F <joach...@users.noreply.github.com>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
    M nixos/modules/misc/ids.nix
    M nixos/modules/services/monitoring/collectd.nix

  Log Message:
  -----------
  Merge pull request #26980 from volth/collectd-service-minor-refactoring

collectd service: minor refactoring


  Commit: c2576ac2d37882709be41227202a1dc691b22192
      
https://github.com/NixOS/nixpkgs/commit/c2576ac2d37882709be41227202a1dc691b22192
  Author: Joachim F <joach...@users.noreply.github.com>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
    M nixos/modules/module-list.nix
    A nixos/modules/services/web-servers/lighttpd/collectd.nix

  Log Message:
  -----------
  Merge pull request #26978 from volth/lighttpd-collectd-submodule

lighttpd: add collectd submodule


  Commit: 2dc599083c5a766fff61885ec2c98521510b02ae
      
https://github.com/NixOS/nixpkgs/commit/2dc599083c5a766fff61885ec2c98521510b02ae
  Author: Pascal Wittmann <m...@pascal-wittmann.de>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
    M pkgs/tools/misc/fsql/default.nix

  Log Message:
  -----------
  fsql: 0.2.1 -> 0.3.1


  Commit: b300472568f296495b411a7f9d55e14d613b2aa9
      
https://github.com/NixOS/nixpkgs/commit/b300472568f296495b411a7f9d55e14d613b2aa9
  Author: Sebastian Jordan <sebastian.jordan.m...@googlemail.com>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
    A pkgs/applications/graphics/guetzli/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  guetzli: init at  1.0.1 (#26595)

* guetzli: init at  1.0.1
* guetzli: move pkgconfig from buildInputs to nativeBuildInputs
* guetzli: use fetchFromGitHub instead of fetchgit


  Commit: b084b93faa725ccbf86634965e443d1e667a066f
      
https://github.com/NixOS/nixpkgs/commit/b084b93faa725ccbf86634965e443d1e667a066f
  Author: Michael Raskin <7c6f4...@mail.ru>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

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

  Log Message:
  -----------
  Merge pull request #27034 from mimadrid/update/vifm-0.9

vifm: 0.8.2 -> 0.9


  Commit: 6f3696784d3321430c5851706b8d7d058e24e513
      
https://github.com/NixOS/nixpkgs/commit/6f3696784d3321430c5851706b8d7d058e24e513
  Author: Vincent Laporte <vincent.lapo...@gmail.com>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

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

  Log Message:
  -----------
  ocamlPackages.lablgl: mark as broken on Darwin


  Commit: ed12c7a9b9b1545e07d25fdf062600d8b2d58c4e
      
https://github.com/NixOS/nixpkgs/commit/ed12c7a9b9b1545e07d25fdf062600d8b2d58c4e
  Author: Vincent Laporte <vincent.lapo...@gmail.com>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
    A pkgs/development/ocaml-modules/git-http/default.nix
    M pkgs/top-level/ocaml-packages.nix

  Log Message:
  -----------
  ocamlPackages.git-http: init at 1.11.0

Client implementation of the “Smart” HTTP Git protocol in pure OCaml.


  Commit: e8c0e8a04bf0772bd7a4a92557ce90106854c383
      
https://github.com/NixOS/nixpkgs/commit/e8c0e8a04bf0772bd7a4a92557ce90106854c383
  Author: Vincent Laporte <vincent.lapo...@gmail.com>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
    A pkgs/development/ocaml-modules/git-unix/default.nix
    M pkgs/top-level/ocaml-packages.nix

  Log Message:
  -----------
  ocamlPackages.git-unix: init at 1.11.0

Unix backend for the Git protocol(s)


  Commit: d3a29b393a45b63815d0e3374ec0cf9f54200ef9
      
https://github.com/NixOS/nixpkgs/commit/d3a29b393a45b63815d0e3374ec0cf9f54200ef9
  Author: Vincent Laporte <vincent.lapo...@gmail.com>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

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

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


  Commit: ca15a36d0ec2b8a3597efd5bc1a1694f9aa2ce7d
      
https://github.com/NixOS/nixpkgs/commit/ca15a36d0ec2b8a3597efd5bc1a1694f9aa2ce7d
  Author: Vincent Laporte <vincent.lapo...@gmail.com>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

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

  Log Message:
  -----------
  ocamlPackages.lwt_react: init at 1.0.1


  Commit: a72c1e4e1c1f9974f9dec18cfa8f7359a4a47685
      
https://github.com/NixOS/nixpkgs/commit/a72c1e4e1c1f9974f9dec18cfa8f7359a4a47685
  Author: Eric Litak <eli...@gmail.com>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
    M pkgs/games/factorio/default.nix

  Log Message:
  -----------
  factorio: 0.15.16 -> 0.15.26


  Commit: 8ad273d4f06004f31c2dc7e5eff87a9343376c47
      
https://github.com/NixOS/nixpkgs/commit/8ad273d4f06004f31c2dc7e5eff87a9343376c47
  Author: Vincent Laporte <vincent.lapo...@gmail.com>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

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

  Log Message:
  -----------
  ocamlPackages.lambda-term: 1.10 -> 1.11


  Commit: e4ca35a4f6a6d0429cc344d163baa7c215596a61
      
https://github.com/NixOS/nixpkgs/commit/e4ca35a4f6a6d0429cc344d163baa7c215596a61
  Author: Joachim F <joach...@users.noreply.github.com>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
    M nixos/modules/services/audio/mpd.nix

  Log Message:
  -----------
  Merge pull request #26990 from jfrankenau/mpd-create-playlistDir

mpd service: Create playlist directory


  Commit: dbe61c96ae778f21cb9111198d68eab3088cd27c
      
https://github.com/NixOS/nixpkgs/commit/dbe61c96ae778f21cb9111198d68eab3088cd27c
  Author: Vincent Laporte <vincent.lapo...@gmail.com>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
    M pkgs/development/ocaml-modules/eliom/default.nix
    M pkgs/development/ocaml-modules/lambda-term/1.6.nix
    M pkgs/development/ocaml-modules/ocsigen-server/default.nix
    M pkgs/development/tools/ocaml/js_of_ocaml/default.nix
    M pkgs/top-level/ocaml-packages.nix

  Log Message:
  -----------
  ocamlPackages: make lwt-3.0.0 the default


  Commit: 3beb47ff2a6abe579d01dd24948eeedc0cebbb0a
      
https://github.com/NixOS/nixpkgs/commit/3beb47ff2a6abe579d01dd24948eeedc0cebbb0a
  Author: Vincent Laporte <vincent.lapo...@gmail.com>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

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

  Log Message:
  -----------
  ocamlPackages.inotify: init at 2.3

This package contains bindings for Linux's filesystem monitoring interface, 
inotify.

Homepage: https://github.com/whitequark/ocaml-inotify


  Commit: fa1153980ccee106f8c3a6dabbf2c240e412cf4d
      
https://github.com/NixOS/nixpkgs/commit/fa1153980ccee106f8c3a6dabbf2c240e412cf4d
  Author: Joachim F <joach...@users.noreply.github.com>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
    M pkgs/games/factorio/default.nix

  Log Message:
  -----------
  Merge pull request #27047 from elitak/factorio-version

factorio: 0.15.16 -> 0.15.26


  Commit: 79df6e80681ac4364d9dc7a6833ce8bbd93dd516
      
https://github.com/NixOS/nixpkgs/commit/79df6e80681ac4364d9dc7a6833ce8bbd93dd516
  Author: Joachim F <joach...@users.noreply.github.com>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
    M pkgs/tools/text/xsv/default.nix

  Log Message:
  -----------
  Merge pull request #27037 from dywedir/xsv

xsv: 0.11.0 -> 0.12.1


  Commit: a0f9386d53e8a5ff97fe02ebc308c91b718d5a22
      
https://github.com/NixOS/nixpkgs/commit/a0f9386d53e8a5ff97fe02ebc308c91b718d5a22
  Author: Nadrieril <nadrie...@gmail.com>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
    M pkgs/tools/misc/fzf/default.nix

  Log Message:
  -----------
  fzf: Include fzf shell scripts in output


  Commit: b87993e2fbbc8d6bc4d3c9b7544b471fbaf59c4a
      
https://github.com/NixOS/nixpkgs/commit/b87993e2fbbc8d6bc4d3c9b7544b471fbaf59c4a
  Author: Tristan Helmich <tristan.helm...@gmail.com>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
    M pkgs/servers/emby/default.nix

  Log Message:
  -----------
  emby: 3.2.20.0 -> 3.2.22.0


  Commit: 6cd8de8ba60ba5280bab8e6ebca4a15a2e1fec1e
      
https://github.com/NixOS/nixpkgs/commit/6cd8de8ba60ba5280bab8e6ebca4a15a2e1fec1e
  Author: romildo <malaqu...@gmail.com>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

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

  Log Message:
  -----------
  offlineimap: 7.1.0 -> 7.1.1


  Commit: c5e314dabe45142d4790cdc9169438ba6e133ec5
      
https://github.com/NixOS/nixpkgs/commit/c5e314dabe45142d4790cdc9169438ba6e133ec5
  Author: Joachim F <joach...@users.noreply.github.com>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
    M pkgs/servers/emby/default.nix

  Log Message:
  -----------
  Merge pull request #27059 from fadenb/emby_3.2.22.0

emby: 3.2.20.0 -> 3.2.22.0


  Commit: 4c1ecbb669cffe32f424f2e15157712cfdb12a8e
      
https://github.com/NixOS/nixpkgs/commit/4c1ecbb669cffe32f424f2e15157712cfdb12a8e
  Author: Clemens Lutz <lutz...@cml.li>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
    M pkgs/applications/video/makemkv/default.nix

  Log Message:
  -----------
  makemkv: 1.10.5 -> 1.10.6


  Commit: 05a1a2a2d3733415593d6e0525404cc937545165
      
https://github.com/NixOS/nixpkgs/commit/05a1a2a2d3733415593d6e0525404cc937545165
  Author: es_github <es_git...@keiko.sh.s>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

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

  Log Message:
  -----------
  Openslp: Fix patch references.

The previous sources for these files have gone away, making this derivation
unbuildable from scratch. We change the URLs to point at locations that will
still serve those patches.
This involves updating one of the hashes, also; I couldn't find an address
that will serve the patch with the original hash, but I expect these only
differ in irrelevant metadata.


  Commit: 5d989f4d93b2dfd6bea3320aca423901af2a0527
      
https://github.com/NixOS/nixpkgs/commit/5d989f4d93b2dfd6bea3320aca423901af2a0527
  Author: es_github <es_git...@keiko.sh.s>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M pkgs/os-specific/linux/kmod-debian-aliases/default.nix

  Log Message:
  -----------
  kmod-debian-aliases: Fix source tarball URL.

The original URL for this package was pointed at a location that wasn't
longterm-stable, and has by now been removed by Debian.
This commit fixes the URL to point at a debian snapshot entry, which should
stick around for the long run.

Hash is unchanged, so this is safe.


  Commit: cb9fe8ceadbf9149f506574095ef3645d6b36909
      
https://github.com/NixOS/nixpkgs/commit/cb9fe8ceadbf9149f506574095ef3645d6b36909
  Author: Sebastian Hagen <sh_c_...@memespace.net>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M pkgs/servers/sql/mariadb/default.nix

  Log Message:
  -----------
  Mariadb: Fix URL for source tarball.

mariadb.org appears to have changed their URL schemes, and the tarball URL used
by this derivation no longer works, which makes this unbuildable from scratch.

This change updates that URL to a mariadb.org location that will still serve
this tarball.

Hash is unchanged.


  Commit: 674e46d643a46eda2079b7cc387f3f34da796831
      
https://github.com/NixOS/nixpkgs/commit/674e46d643a46eda2079b7cc387f3f34da796831
  Author: es_github <es_git...@keiko.sh.s>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M pkgs/tools/archivers/p7zip/default.nix

  Log Message:
  -----------
  p7zip: Update CVE-2016-9296 patch URL.

The debian source for this patch file has gone away, rendering this derivation
unbuildable from scratch.
This change updates the URL to a src.fedoraproject.org location that is still
serving a p7zip patch. This file is not the same bytewise, so I'm also updating
the hash; I didn't manage to find a location still serving a file with the
original hash, and my best guess is that this one is functionally equivalent.


  Commit: 64f922bf18d584151394ce9c7e9fd6fd39f8c30b
      
https://github.com/NixOS/nixpkgs/commit/64f922bf18d584151394ce9c7e9fd6fd39f8c30b
  Author: Jörg Thalheim <mi...@users.noreply.github.com>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M pkgs/applications/video/makemkv/default.nix

  Log Message:
  -----------
  Merge pull request #27064 from LutzCle/master

makemkv: 1.10.5 -> 1.10.6


  Commit: 6cad339a0eb0d052c8f5e4a88ce89c49792feee5
      
https://github.com/NixOS/nixpkgs/commit/6cad339a0eb0d052c8f5e4a88ce89c49792feee5
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M pkgs/tools/archivers/p7zip/default.nix

  Log Message:
  -----------
  p7zip: add commit ID to the patch

We still do mirror the patch (I think), as `nix-build -Q -A p7zip.patches`
downloaded it on my machine.  I verified that only the diff headers differ;
it's still better to have another working download and Fedora's URLs are
less likely to disappear than Debian's.
/cc #27075.


  Commit: e33ddf0fec30beee523a00ec93215611744cd670
      
https://github.com/NixOS/nixpkgs/commit/e33ddf0fec30beee523a00ec93215611744cd670
  Author: Jörg Thalheim <mi...@users.noreply.github.com>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

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

  Log Message:
  -----------
  Merge pull request #27077 from sh01/shpr_fixurls_openslp

Openslp: Fix patch references.


  Commit: 1f0de2dce26b6bcfd5f9d49365b15dbcab4ae723
      
https://github.com/NixOS/nixpkgs/commit/1f0de2dce26b6bcfd5f9d49365b15dbcab4ae723
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M pkgs/tools/archivers/p7zip/default.nix

  Log Message:
  -----------
  Merge #27075: p7zip: Update CVE-2016-9296 patch URL


  Commit: 02ce6963045ed2a1ed41538419a3954ead23fa51
      
https://github.com/NixOS/nixpkgs/commit/02ce6963045ed2a1ed41538419a3954ead23fa51
  Author: Jörg Thalheim <mi...@users.noreply.github.com>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M pkgs/os-specific/linux/kmod-debian-aliases/default.nix

  Log Message:
  -----------
  Merge pull request #27074 from sh01/shpr_fixurls_kmod_debian

kmod-debian-aliases: Fix source tarball URL.


  Commit: d97cdfc591baf790ce5a9836e1503dfb0eb152e6
      
https://github.com/NixOS/nixpkgs/commit/d97cdfc591baf790ce5a9836e1503dfb0eb152e6
  Author: aszlig <asz...@redmoonstudios.org>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M nixos/modules/services/x11/xserver.nix

  Log Message:
  -----------
  nixos/xserver: Document the layouts sed expression

This was brought up by @0xABAB in #26984 by the following comment:

https://github.com/NixOS/nixpkgs/pull/26984#discussion_r125146405

Signed-off-by: aszlig <asz...@redmoonstudios.org>


  Commit: 69da1807f02daa776472893741c2f82eca8e838d
      
https://github.com/NixOS/nixpkgs/commit/69da1807f02daa776472893741c2f82eca8e838d
  Author: aszlig <asz...@redmoonstudios.org>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M nixos/modules/services/x11/xserver.nix

  Log Message:
  -----------
  nixos/xserver: Allow more than one keyboard layout

Regression introduced by 44c64fef16ed566786c8db276085b484c9d233f3.

The services.xserver.layout option allows to specify more than one
layout separated by comma, which the commit above didn't take into
account.

This is very similar to @lheckemann's pull request (#26984) but differs
in the following ways:

  * Print out the full list available layouts (as suggested by @0xABAB
    in [1]).
  * Loop over $layout using the default IFS (and thus no need for
    escaping ${cfg.layout}), because the layouts won't contain white
    spaces.
  * Re-do the error message, which now uses multiple echos instead of a
    heredoc, so the line is wrapped according to the viewers terminal
    width.

I've tested this with several good and bad layouts and also against the
keymap NixOS VM subtests.

[1]: https://github.com/NixOS/nixpkgs/pull/26984#discussion_r125146700

Signed-off-by: aszlig <asz...@redmoonstudios.org>
Fixes: #26961
Closes: #26984


  Commit: cc83f351188610a06ce2539f42bc3c6cb5902ad2
      
https://github.com/NixOS/nixpkgs/commit/cc83f351188610a06ce2539f42bc3c6cb5902ad2
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M pkgs/servers/sql/mariadb/default.nix

  Log Message:
  -----------
  Merge #27076: mariadb: fix URL for source tarball

Not even all their mirrors serve our version, unfortunately.


  Commit: fa2c22ea97d604dfc9cc3dcf9115eecc6bd021d9
      
https://github.com/NixOS/nixpkgs/commit/fa2c22ea97d604dfc9cc3dcf9115eecc6bd021d9
  Author: Samuel W. Flint <swfl...@flintfam.org>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M lib/maintainers.nix
    A pkgs/tools/misc/x11idle/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  x11idle: init at unstable-2017-07-01 (#27062)

* Add myself to the maintainers list

* Define the derivation for x11idle


  Commit: 40c6f7e1084e41cc0ae6d31ef05e7ac64b74b69c
      
https://github.com/NixOS/nixpkgs/commit/40c6f7e1084e41cc0ae6d31ef05e7ac64b74b69c
  Author: Jörg Thalheim <mi...@users.noreply.github.com>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M pkgs/tools/misc/fzf/default.nix

  Log Message:
  -----------
  Merge pull request #27058 from Nadrieril/fzf-shell-scripts

fzf: Include fzf shell scripts in output


  Commit: 7ec7aa0bb1ab2c5e66a34803461ac0f929eca729
      
https://github.com/NixOS/nixpkgs/commit/7ec7aa0bb1ab2c5e66a34803461ac0f929eca729
  Author: Emmanuel Rosa <emmanuelr...@users.noreply.github.com>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M pkgs/misc/cups/drivers/splix/default.nix

  Log Message:
  -----------
  Revert "splix: enable JBIG" (#27054)

This reverts commit 0878ca7ab4c9da80ba18357cfd29596dc0500973.

My change to enable JBIG for splix did not work correctly. I was unable to get 
to the bottom of it because the build never completed. Given that it's also 
timing out in Hydra (see https://hydra.nixos.org/eval/1372226) I think it's 
best to simply back it out.


  Commit: 0b1c8793fc20944b68562d9a73a5ce391f1603e0
      
https://github.com/NixOS/nixpkgs/commit/0b1c8793fc20944b68562d9a73a5ce391f1603e0
  Author: Emanuele Peruffo <emanuele.peru...@gmail.com>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    A pkgs/desktops/gnome-3/extensions/caffeine/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  gnomeExtensions.caffeine: init at revision unstable-2017-06-21 (#26901)

Caffeine extension for Gnome 3


  Commit: d1a89ae9d702a4b91b6d661af256552e330bb995
      
https://github.com/NixOS/nixpkgs/commit/d1a89ae9d702a4b91b6d661af256552e330bb995
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M lib/maintainers.nix
    M nixos/modules/misc/ids.nix
    M nixos/modules/module-list.nix
    M nixos/modules/programs/browserpass.nix
    M nixos/modules/services/audio/mpd.nix
    A nixos/modules/services/logging/heartbeat.nix
    M nixos/modules/services/monitoring/collectd.nix
    A nixos/modules/services/web-servers/lighttpd/collectd.nix
    M nixos/modules/services/x11/desktop-managers/lumina.nix
    M nixos/modules/services/x11/xserver.nix
    M nixos/modules/system/boot/luksroot.nix
    M nixos/modules/virtualisation/xen-dom0.nix
    M nixos/release-combined.nix
    M pkgs/applications/audio/ncmpcpp/default.nix
    A pkgs/applications/graphics/guetzli/default.nix
    M pkgs/applications/misc/krename/default.nix
    M pkgs/applications/misc/ranger/default.nix
    M pkgs/applications/misc/redshift-plasma-applet/default.nix
    M pkgs/applications/misc/vifm/default.nix
    M pkgs/applications/networking/cluster/terraform/default.nix
    M pkgs/applications/networking/instant-messengers/mcabber/default.nix
    M pkgs/applications/networking/ipfs/default.nix
    M pkgs/applications/networking/mailreaders/neomutt/default.nix
    M pkgs/applications/networking/syncthing/default.nix
    M pkgs/applications/office/libreoffice/default.nix
    M pkgs/applications/video/makemkv/default.nix
    M pkgs/applications/video/mkvtoolnix/default.nix
    M pkgs/applications/video/obs-studio/default.nix
    M pkgs/applications/video/streamlink/default.nix
    A pkgs/applications/virtualization/xen/4.8.nix
    M pkgs/applications/virtualization/xen/generic.nix
    M pkgs/applications/virtualization/xen/packages.nix
    M pkgs/applications/window-managers/i3/default.nix
    M pkgs/applications/window-managers/i3/lock.nix
    M pkgs/build-support/release/default.nix
    M pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix
    A pkgs/desktops/gnome-3/extensions/caffeine/default.nix
    M pkgs/desktops/lumina/default.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/hackage-packages.nix
    M pkgs/development/interpreters/perl/default.nix
    M pkgs/development/libraries/catch/default.nix
    M pkgs/development/libraries/gdal/default.nix
    M pkgs/development/libraries/libutempter/default.nix
    M pkgs/development/libraries/openslp/default.nix
    M pkgs/development/libraries/wcslib/default.nix
    A pkgs/development/ocaml-modules/cohttp/0.19.3.nix
    M pkgs/development/ocaml-modules/cohttp/default.nix
    A pkgs/development/ocaml-modules/conduit/0.10.0.nix
    M pkgs/development/ocaml-modules/conduit/default.nix
    A pkgs/development/ocaml-modules/decompress/default.nix
    M pkgs/development/ocaml-modules/eliom/default.nix
    A pkgs/development/ocaml-modules/git-http/default.nix
    A pkgs/development/ocaml-modules/git-unix/default.nix
    A pkgs/development/ocaml-modules/git/default.nix
    A pkgs/development/ocaml-modules/inotify/default.nix
    M pkgs/development/ocaml-modules/javalib/default.nix
    M pkgs/development/ocaml-modules/jsonm/default.nix
    M pkgs/development/ocaml-modules/lablgl/default.nix
    M pkgs/development/ocaml-modules/lambda-term/1.6.nix
    M pkgs/development/ocaml-modules/lambda-term/default.nix
    M pkgs/development/ocaml-modules/lwt/default.nix
    A pkgs/development/ocaml-modules/lwt_react/default.nix
    A pkgs/development/ocaml-modules/mstruct/default.nix
    A pkgs/development/ocaml-modules/ocp-ocamlres/default.nix
    A pkgs/development/ocaml-modules/ocplib-json-typed/default.nix
    M pkgs/development/ocaml-modules/ocsigen-server/default.nix
    M pkgs/development/ocaml-modules/sawja/default.nix
    M pkgs/development/qtcreator/default.nix
    M pkgs/development/r-modules/bioc-annotation-packages.nix
    M pkgs/development/r-modules/bioc-experiment-packages.nix
    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/tools/analysis/spin/default.nix
    M pkgs/development/tools/misc/ccache/default.nix
    A pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch
    R pkgs/development/tools/misc/gede/build.patch
    M pkgs/development/tools/misc/gede/default.nix
    M pkgs/development/tools/misc/yodl/default.nix
    M pkgs/development/tools/ocaml/js_of_ocaml/default.nix
    M pkgs/development/tools/ocaml/utop/default.nix
    M pkgs/games/factorio/default.nix
    A pkgs/misc/gnash/default.nix
    M pkgs/os-specific/linux/firejail/default.nix
    M pkgs/os-specific/linux/kbdlight/default.nix
    M pkgs/os-specific/linux/kmod-debian-aliases/default.nix
    M pkgs/servers/dns/bind/default.nix
    M pkgs/servers/emby/default.nix
    M pkgs/servers/mail/mailman/default.nix
    M pkgs/servers/news/leafnode/default.nix
    M pkgs/servers/nosql/redis/default.nix
    M pkgs/servers/radicale/default.nix
    M pkgs/servers/sql/mariadb/default.nix
    M pkgs/shells/oh-my-zsh/default.nix
    M pkgs/tools/admin/google-cloud-sdk/default.nix
    M pkgs/tools/archivers/p7zip/default.nix
    M pkgs/tools/filesystems/irods/default.nix
    M pkgs/tools/misc/ddccontrol/default.nix
    M pkgs/tools/misc/fsql/default.nix
    M pkgs/tools/misc/fzf/default.nix
    A pkgs/tools/misc/hdf4/default.nix
    M pkgs/tools/misc/megacli/default.nix
    M pkgs/tools/misc/plowshare/default.nix
    M pkgs/tools/misc/screen/default.nix
    A pkgs/tools/misc/x11idle/default.nix
    M pkgs/tools/networking/mailutils/default.nix
    M pkgs/tools/networking/netselect/default.nix
    M pkgs/tools/networking/nzbget/default.nix
    M pkgs/tools/networking/offlineimap/default.nix
    M pkgs/tools/security/browserpass/default.nix
    A pkgs/tools/security/gen-oath-safe/default.nix
    M pkgs/tools/security/tor/default.nix
    M pkgs/tools/system/collectd/default.nix
    M pkgs/tools/system/mcron/default.nix
    M pkgs/tools/system/runit/default.nix
    M pkgs/tools/text/xsv/default.nix
    M pkgs/tools/typesetting/tex/texlive/combine.nix
    M pkgs/tools/typesetting/tex/texlive/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/ocaml-packages.nix
    M pkgs/top-level/perl-packages.nix
    M pkgs/top-level/python-packages.nix

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


Compare: https://github.com/NixOS/nixpkgs/compare/343ad1697d69...d1a89ae9d702
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to