Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: bb6a5b079fe8c88a6e42c92179711b2d0a9a9842
      
https://github.com/NixOS/nixpkgs/commit/bb6a5b079fe8c88a6e42c92179711b2d0a9a9842
  Author: Roger Qiu <[email protected]>
  Date:   2017-04-21 (Fri, 21 Apr 2017)

  Changed paths:
    M nixos/doc/manual/release-notes/rl-1709.xml
    M nixos/modules/services/x11/xserver.nix

  Log Message:
  -----------
  nixos/xserver: Changed xrandrHeads to support corresponding monitor section 
configuration in Xorg


  Commit: 4ac06ea6a13bf082791f1e3293528dc6c1b67841
      
https://github.com/NixOS/nixpkgs/commit/4ac06ea6a13bf082791f1e3293528dc6c1b67841
  Author: Fernando J Pando <[email protected]>
  Date:   2017-04-21 (Fri, 21 Apr 2017)

  Changed paths:
    M nixos/modules/services/continuous-integration/buildbot/master.nix
    M nixos/modules/services/continuous-integration/buildbot/worker.nix
    M nixos/tests/buildbot.nix
    M pkgs/development/tools/build-managers/buildbot/default.nix
    M pkgs/development/tools/build-managers/buildbot/plugins.nix
    M pkgs/development/tools/build-managers/buildbot/worker.nix

  Log Message:
  -----------
  buildbot: 0.9.4 -> 0.9.5

- adds distro dependency
- buildbot nodaemon in service module
- fakerepo for module tests
- service module parameter fixup
- tested on nixos
- tested on darwin


  Commit: 8266c89b55e3ae97ff635a0f9f8aee556ae7b384
      
https://github.com/NixOS/nixpkgs/commit/8266c89b55e3ae97ff635a0f9f8aee556ae7b384
  Author: aszlig <[email protected]>
  Date:   2017-04-24 (Mon, 24 Apr 2017)

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

  Log Message:
  -----------
  nixos/xserver: Fix up/refactor xrandrHeads option

Using invalid module options in the submodule isn't very nice, because
it doesn't give very useful errors in case of type mismatch, also we
don't get descriptions of these options as they're effecively
nonexistent to the module system. Another downside of this is that
merging of these options isn't done correctly as well (eg. for
types.lines).

So we now have proper submodules for each xrandrHead and we also use
corcedTo in the type of xrandrHeads so that we can populate the
submodule's "output" option in case a plain string is defined for a list
item.

Instead of silently skipping multiple primary heads, we now have an
assertion, which displays a message and aborts configuration evaluation
appropriately.

Signed-off-by: aszlig <[email protected]>


  Commit: d7a8876c13f75e7a55e2f3cbc16346406e9abdf8
      
https://github.com/NixOS/nixpkgs/commit/d7a8876c13f75e7a55e2f3cbc16346406e9abdf8
  Author: aszlig <[email protected]>
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
    M nixos/doc/manual/release-notes/rl-1709.xml

  Log Message:
  -----------
  nixos/doc: Improve release notes for xrandrHeads

The xrandrHeads option has been there since a long time, so there is no
need to advertise it as a new feature.

Instead, let's focus on just what has changed, which is that we now
assign one head to be primary.

Signed-off-by: aszlig <[email protected]>


  Commit: 79e712822fcfe797c545e2db5bcef9a07b00b2e5
      
https://github.com/NixOS/nixpkgs/commit/79e712822fcfe797c545e2db5bcef9a07b00b2e5
  Author: aszlig <[email protected]>
  Date:   2017-04-24 (Mon, 24 Apr 2017)

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

  Log Message:
  -----------
  nixos/xserver: Document xrandrHeads.apply

It was asked by @CMCDragonkai to elaborate on that, so let's just do
this by actually providing a code comment.

Signed-off-by: aszlig <[email protected]>


  Commit: 29969a5ec7df53ca82585d5b7c2e472030c04f54
      
https://github.com/NixOS/nixpkgs/commit/29969a5ec7df53ca82585d5b7c2e472030c04f54
  Author: Chris Hodapp <[email protected]>
  Date:   2017-05-01 (Mon, 01 May 2017)

  Changed paths:
    M pkgs/applications/editors/rstudio/default.nix
    M pkgs/development/r-modules/README.md
    A pkgs/development/r-modules/wrapper-rstudio.nix
    M pkgs/development/r-modules/wrapper.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  rstudio: Fix recompilation issue with custom package set

This attempts to fix the issue described at
https://github.com/NixOS/nixpkgs/pull/22219#issuecomment-291801133.
Any change to the custom packages passed to RStudio causes this to
completely rebuild RStudio, which is completely unnecessary and also a
bit of a hindrance as it's a fairly slow build.

This rolls back most of that old PR, and instead implements something
more like rWrapper.  Existing configurations with the old useRPackages
will break.


  Commit: 5a78bed2bb5b3499d7d160cda2f1413ede0809f7
      
https://github.com/NixOS/nixpkgs/commit/5a78bed2bb5b3499d7d160cda2f1413ede0809f7
  Author: Utku Demir <[email protected]>
  Date:   2017-05-02 (Tue, 02 May 2017)

  Changed paths:
    M pkgs/build-support/emacs/wrapper.nix

  Log Message:
  -----------
  Fix documentation of emacsWithPackages

After [this 
change](https://github.com/NixOS/nixpkgs/commit/901a778c7744b25013168dde1a2a548ad531fd78),
 it should be `overrideScope` instead of `override`.


  Commit: 037074920997a3f552c73823cf4d11bda826ad67
      
https://github.com/NixOS/nixpkgs/commit/037074920997a3f552c73823cf4d11bda826ad67
  Author: Volth <[email protected]>
  Date:   2017-05-02 (Tue, 02 May 2017)

  Changed paths:
    M pkgs/applications/networking/browsers/google-chrome/default.nix

  Log Message:
  -----------
  google-chrome: remove dependency on gcc


  Commit: c13e3289161d91afed3308c1c4400e6f4dc980dd
      
https://github.com/NixOS/nixpkgs/commit/c13e3289161d91afed3308c1c4400e6f4dc980dd
  Author: Tim Steinbach <[email protected]>
  Date:   2017-05-02 (Tue, 02 May 2017)

  Changed paths:
    M pkgs/development/tools/ammonite/default.nix
    M pkgs/top-level/aliases.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  ammonite: 0.8.3 -> 0.8.4

Also rename package and add alias for the old name.


  Commit: e026fb485221d8a6e05ec52008766ccf4e7c5589
      
https://github.com/NixOS/nixpkgs/commit/e026fb485221d8a6e05ec52008766ccf4e7c5589
  Author: Robert Tröger <[email protected]>
  Date:   2017-05-02 (Tue, 02 May 2017)

  Changed paths:
    M pkgs/applications/kde/kgpg.nix

  Log Message:
  -----------
  kgpg: Added gnupg1 as runtime dependency (#25356)


  Commit: 287e67046254984718aee61aa28c7fc8027bbc9a
      
https://github.com/NixOS/nixpkgs/commit/287e67046254984718aee61aa28c7fc8027bbc9a
  Author: Peter Simons <[email protected]>
  Date:   2017-05-02 (Tue, 02 May 2017)

  Changed paths:
    M pkgs/applications/editors/rstudio/default.nix
    M pkgs/development/r-modules/README.md
    A pkgs/development/r-modules/wrapper-rstudio.nix
    M pkgs/development/r-modules/wrapper.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #25390 from Hodapp87/rstudio_fix

rstudio: Fix recompilation issue with custom package set


  Commit: e9b1522dd3a8ce404914794d09a96119ec40cc90
      
https://github.com/NixOS/nixpkgs/commit/e9b1522dd3a8ce404914794d09a96119ec40cc90
  Author: Thomas Tuegel <[email protected]>
  Date:   2017-05-02 (Tue, 02 May 2017)

  Changed paths:
    M pkgs/build-support/emacs/wrapper.nix

  Log Message:
  -----------
  Merge pull request #25413 from utdemir/patch-1

Fix documentation of emacsWithPackages


  Commit: fe3c12406480f96d235875819ad1d36cf89293f3
      
https://github.com/NixOS/nixpkgs/commit/fe3c12406480f96d235875819ad1d36cf89293f3
  Author: Rok Garbas <[email protected]>
  Date:   2017-05-02 (Tue, 02 May 2017)

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

  Log Message:
  -----------
  neovim: 0.1.7 -> 0.2.0


  Commit: 33960efb136ad00717d8ce34876a3891780f3a32
      
https://github.com/NixOS/nixpkgs/commit/33960efb136ad00717d8ce34876a3891780f3a32
  Author: Rok Garbas <[email protected]>
  Date:   2017-05-02 (Tue, 02 May 2017)

  Changed paths:
    M pkgs/applications/editors/neovim/qt.nix

  Log Message:
  -----------
  neovim-qt: 0.2.6 -> 0.2.7


  Commit: ec7f6208311f839b5b36de8d80b922b758ffd50d
      
https://github.com/NixOS/nixpkgs/commit/ec7f6208311f839b5b36de8d80b922b758ffd50d
  Author: Rok Garbas <[email protected]>
  Date:   2017-05-02 (Tue, 02 May 2017)

  Changed paths:
    M pkgs/applications/editors/neovim/neovim-remote.nix

  Log Message:
  -----------
  neovim-remote: 1.4.0 -> 1.6.0


  Commit: 9f18af599164356f5a027da823f4ca67cc0e0329
      
https://github.com/NixOS/nixpkgs/commit/9f18af599164356f5a027da823f4ca67cc0e0329
  Author: jammerful <[email protected]>
  Date:   2017-05-02 (Tue, 02 May 2017)

  Changed paths:
    M nixos/modules/module-list.nix
    A nixos/modules/services/security/shibboleth-sp.nix

  Log Message:
  -----------
  Add Shibboleth Service Provider Module


  Commit: 436ece25b62353e5aa426242c2c796e94582071e
      
https://github.com/NixOS/nixpkgs/commit/436ece25b62353e5aa426242c2c796e94582071e
  Author: Daniel Peebles <[email protected]>
  Date:   2017-05-02 (Tue, 02 May 2017)

  Changed paths:
    M nixos/modules/module-list.nix
    A nixos/modules/services/security/shibboleth-sp.nix

  Log Message:
  -----------
  Merge pull request #25422 from jammerful/shibservice

Add Shibboleth Service Provider Module


  Commit: 75197be585960274fdbcf059e69af86191d3a41c
      
https://github.com/NixOS/nixpkgs/commit/75197be585960274fdbcf059e69af86191d3a41c
  Author: Changlin Li <[email protected]>
  Date:   2017-05-02 (Tue, 02 May 2017)

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

  Log Message:
  -----------
  bfg repo cleaner: add top-level aliase (#25420)

Makes it easier to find and install this package.


  Commit: 7be790299058fb63f085183dc3395a18d253a33d
      
https://github.com/NixOS/nixpkgs/commit/7be790299058fb63f085183dc3395a18d253a33d
  Author: Jörg Thalheim <[email protected]>
  Date:   2017-05-02 (Tue, 02 May 2017)

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

  Log Message:
  -----------
  zfsUnstable: mark as incompatible with 4.11 (since rc3)


  Commit: b48be4616dbfea5ceb89f1b53ee8272196c410e2
      
https://github.com/NixOS/nixpkgs/commit/b48be4616dbfea5ceb89f1b53ee8272196c410e2
  Author: Jörg Thalheim <[email protected]>
  Date:   2017-05-02 (Tue, 02 May 2017)

  Changed paths:
    M pkgs/applications/networking/browsers/google-chrome/default.nix

  Log Message:
  -----------
  Merge pull request #25419 from volth/google-chrome-remove-gcc-dependency

google-chrome: remove dependency on gcc


  Commit: a74632f6c20fe97863d0b0e94c82daf6a315acd6
      
https://github.com/NixOS/nixpkgs/commit/a74632f6c20fe97863d0b0e94c82daf6a315acd6
  Author: Tim Steinbach <[email protected]>
  Date:   2017-05-02 (Tue, 02 May 2017)

  Changed paths:
    M pkgs/development/tools/ammonite/default.nix
    M pkgs/top-level/aliases.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #25440 from NeQuissimus/ammonite_0_8_4

ammonite: 0.8.3 -> 0.8.4


  Commit: b88296818de1f96745d529317c6047f651bade5b
      
https://github.com/NixOS/nixpkgs/commit/b88296818de1f96745d529317c6047f651bade5b
  Author: John Wiegley <[email protected]>
  Date:   2017-05-02 (Tue, 02 May 2017)

  Changed paths:
    M pkgs/development/libraries/libidn2/fix-error-darwin.patch

  Log Message:
  -----------
  libidn2: Correct a broken darwin patch


  Commit: 5217969f691e21dc62c6ed16eb6bb6a51afed0ee
      
https://github.com/NixOS/nixpkgs/commit/5217969f691e21dc62c6ed16eb6bb6a51afed0ee
  Author: Daiderd Jordan <[email protected]>
  Date:   2017-05-02 (Tue, 02 May 2017)

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

  Log Message:
  -----------
  python-stevedore: 1.7.0 -> 1.21.0


  Commit: aac48708c1a9d5443d11e206fe38b0ebbd4cb930
      
https://github.com/NixOS/nixpkgs/commit/aac48708c1a9d5443d11e206fe38b0ebbd4cb930
  Author: Matthew Bauer <[email protected]>
  Date:   2017-05-02 (Tue, 02 May 2017)

  Changed paths:
    M pkgs/tools/text/xml/jing-trang/default.nix

  Log Message:
  -----------
  jing-trang: supports all unix

This is needed to build the manual on macOS.


  Commit: cc4e2505e4d5539feb628822883e48dc4c42289f
      
https://github.com/NixOS/nixpkgs/commit/cc4e2505e4d5539feb628822883e48dc4c42289f
  Author: Ioannis Koutras <[email protected]>
  Date:   2017-05-02 (Tue, 02 May 2017)

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

  Log Message:
  -----------
  efivar: 31 -> 30

According to the release page, version 31 of efivar is still considered
as a pre-release and the sha256sum has changed at least once. This commit
switches to the last, stable release.


  Commit: 1234825656bfed1d617d03a32a1a91a97850570b
      
https://github.com/NixOS/nixpkgs/commit/1234825656bfed1d617d03a32a1a91a97850570b
  Author: Matthew Bauer <[email protected]>
  Date:   2017-05-02 (Tue, 02 May 2017)

  Changed paths:
    M pkgs/tools/text/xsv/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  xsv: fix "has invalid meta attribute"

Without this there's an eval error, when running nix-env -f '<nixpkgs>'
--query --available --json.

  derivation ‘xsv-0.11.0’ has invalid meta attribute ‘override’
  derivation ‘xsv-0.11.0’ has invalid meta attribute ‘overrideDerivation’

[Bjørn: extend commit message.]


  Commit: beff1984f4c84435c706244871b65bf1833fbee8
      
https://github.com/NixOS/nixpkgs/commit/beff1984f4c84435c706244871b65bf1833fbee8
  Author: Michael Raskin <[email protected]>
  Date:   2017-05-02 (Tue, 02 May 2017)

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

  Log Message:
  -----------
  qtinstaller: build submodule-style


  Commit: 516f909acbe0a22d39daf71c3808accc3014202f
      
https://github.com/NixOS/nixpkgs/commit/516f909acbe0a22d39daf71c3808accc3014202f
  Author: Daiderd Jordan <[email protected]>
  Date:   2017-05-02 (Tue, 02 May 2017)

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

  Log Message:
  -----------
  gdal: fix darwin build


  Commit: 9dca737d6269759745c9e68ea462446cde4d9be9
      
https://github.com/NixOS/nixpkgs/commit/9dca737d6269759745c9e68ea462446cde4d9be9
  Author: aszlig <[email protected]>
  Date:   2017-05-02 (Tue, 02 May 2017)

  Changed paths:
    M nixos/doc/manual/release-notes/rl-1709.xml
    M nixos/modules/services/x11/xserver.nix

  Log Message:
  -----------
  Merge pull request #15353 (improve xrandrHeads)

When you have a setup consisting of multiple monitors, the default is
that the first monitor detected by xrandr is set to the primary monitor.

However this may not be the monitor you need to be set as primary. In
fact this monitor set to primary may in fact be disconnected.

This has happened for the original submitter of the pull request and it
affected these programs:

 * XMonad: Gets confused with Super + {w,e,r}
 * SDDM: Puts the login screen on the wrong monitor, and does not
   currently duplicate the login screen on all monitors
 * XMobar: Puts the XMobar on the wrong monitor, as it only puts the
     taskbar on the primary monitor

These changes should fix that not only by setting a primary monitor in
xrandrHeads but also make it possible to make a different monitor the
primary one.

The changes are also backwards-compatible.


  Commit: 572fd3de58f39b17029de857b7023d50be0cc6fb
      
https://github.com/NixOS/nixpkgs/commit/572fd3de58f39b17029de857b7023d50be0cc6fb
  Author: Thomas Tuegel <[email protected]>
  Date:   2017-05-02 (Tue, 02 May 2017)

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

  Log Message:
  -----------
  dropbox: 24.4.17 -> 25.4.28


  Commit: ded7953478eff74d213b39136f269eb8d5eab8c9
      
https://github.com/NixOS/nixpkgs/commit/ded7953478eff74d213b39136f269eb8d5eab8c9
  Author: Aneesh Agrawal <[email protected]>
  Date:   2017-05-02 (Tue, 02 May 2017)

  Changed paths:
    M pkgs/applications/misc/urh/default.nix
    M pkgs/applications/networking/feedreaders/rawdog/default.nix
    M pkgs/applications/networking/irc/qweechat/default.nix
    M pkgs/development/python-modules/pyroute2/default.nix
    M pkgs/servers/radicale/default.nix
    M pkgs/tools/networking/fakeroute/default.nix
    M pkgs/tools/security/encryptr/default.nix
    M pkgs/tools/text/grin/default.nix

  Log Message:
  -----------
  treewide: meta.platform -> meta.platforms


  Commit: 3d27a84a1ce6516e1b6bc331e96689e7c132af67
      
https://github.com/NixOS/nixpkgs/commit/3d27a84a1ce6516e1b6bc331e96689e7c132af67
  Author: Victor Calvert <[email protected]>
  Date:   2017-05-03 (Wed, 03 May 2017)

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

  Log Message:
  -----------
  tomb: 2.2 -> 2.4 (#25465)


  Commit: bc4e30a12b1eb3cdf94e4b921978af71e31cef23
      
https://github.com/NixOS/nixpkgs/commit/bc4e30a12b1eb3cdf94e4b921978af71e31cef23
  Author: Aneesh Agrawal <[email protected]>
  Date:   2017-05-02 (Tue, 02 May 2017)

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

  Log Message:
  -----------
  mosh: 1.2.6 -> 1.3.0

Release announcement is available at
http://mailman.mit.edu/pipermail/mosh-users/2017-March/000341.html.


  Commit: c42f9a81ef885c336aa6a195c4989b3098bc5459
      
https://github.com/NixOS/nixpkgs/commit/c42f9a81ef885c336aa6a195c4989b3098bc5459
  Author: Michael Raskin <[email protected]>
  Date:   2017-05-03 (Wed, 03 May 2017)

  Changed paths:
    M pkgs/applications/misc/urh/default.nix
    M pkgs/applications/networking/feedreaders/rawdog/default.nix
    M pkgs/applications/networking/irc/qweechat/default.nix
    M pkgs/development/python-modules/pyroute2/default.nix
    M pkgs/servers/radicale/default.nix
    M pkgs/tools/networking/fakeroute/default.nix
    M pkgs/tools/security/encryptr/default.nix
    M pkgs/tools/text/grin/default.nix

  Log Message:
  -----------
  Merge pull request #25466 from aneeshusa/fix-meta-platforms-treewide

treewide: meta.platform -> meta.platforms


  Commit: d8c1977bb55a8db63e25b2ede84e25796f88d6b1
      
https://github.com/NixOS/nixpkgs/commit/d8c1977bb55a8db63e25b2ede84e25796f88d6b1
  Author: jammerful <[email protected]>
  Date:   2017-05-02 (Tue, 02 May 2017)

  Changed paths:
    M nixos/modules/services/security/shibboleth-sp.nix

  Log Message:
  -----------
  shibboleth-sp module: Set Config File Path for FastCGI Units

Without this environment variable both shibauthorizer and
shibresponder default to ${pkgs.shibboleth-sp}etc/shibboleth/shibboleth2.xml


  Commit: a91813023b0db49e34d636d6ecd3ff78962f0390
      
https://github.com/NixOS/nixpkgs/commit/a91813023b0db49e34d636d6ecd3ff78962f0390
  Author: Daniel Peebles <[email protected]>
  Date:   2017-05-02 (Tue, 02 May 2017)

  Changed paths:
    M nixos/modules/services/security/shibboleth-sp.nix

  Log Message:
  -----------
  Merge pull request #25467 from jammerful/shibservice

shibboleth-sp module: Set Config File Path for FastCGI Units


  Commit: c5a5ac1ef78badf35a0526829d4b8058448de94e
      
https://github.com/NixOS/nixpkgs/commit/c5a5ac1ef78badf35a0526829d4b8058448de94e
  Author: Pascal Wittmann <[email protected]>
  Date:   2017-05-03 (Wed, 03 May 2017)

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

  Log Message:
  -----------
  Merge pull request #25471 from aneeshusa/update-mosh-to-1.3.0

mosh: 1.2.6 -> 1.3.0


  Commit: 9e48fc3268fcaf7a7cde724eaf38d246abad9b5d
      
https://github.com/NixOS/nixpkgs/commit/9e48fc3268fcaf7a7cde724eaf38d246abad9b5d
  Author: Frederik Rietdijk <[email protected]>
  Date:   2017-05-03 (Wed, 03 May 2017)

  Changed paths:
    M nixos/modules/services/continuous-integration/buildbot/master.nix
    M nixos/modules/services/continuous-integration/buildbot/worker.nix
    M nixos/tests/buildbot.nix
    M pkgs/development/tools/build-managers/buildbot/default.nix
    M pkgs/development/tools/build-managers/buildbot/plugins.nix
    M pkgs/development/tools/build-managers/buildbot/worker.nix

  Log Message:
  -----------
  Merge pull request #24131 from nand0p/buildbot-0.9.5

buildbot: 0.9.4 -> 0.9.5


  Commit: 8d52769ef28fdf7816248af7047f422eed98b32c
      
https://github.com/NixOS/nixpkgs/commit/8d52769ef28fdf7816248af7047f422eed98b32c
  Author: Frederik Rietdijk <[email protected]>
  Date:   2017-05-03 (Wed, 03 May 2017)

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

  Log Message:
  -----------
  Merge pull request #25459 from LnL7/darwin-gdal

gdal: fix darwin build


  Commit: a7b206bb89ab1dc5b36b184768ec24ba02e9188a
      
https://github.com/NixOS/nixpkgs/commit/a7b206bb89ab1dc5b36b184768ec24ba02e9188a
  Author: Frederik Rietdijk <[email protected]>
  Date:   2017-05-03 (Wed, 03 May 2017)

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

  Log Message:
  -----------
  pythonPackages.certifi: move to separate file


  Commit: 6d1408153c516827c737c5f0f27e511f31f0118b
      
https://github.com/NixOS/nixpkgs/commit/6d1408153c516827c737c5f0f27e511f31f0118b
  Author: Frederik Rietdijk <[email protected]>
  Date:   2017-05-03 (Wed, 03 May 2017)

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

  Log Message:
  -----------
  pythonPackages.setuptoolsTrial: do not depend on old pytest


  Commit: d317e834c10599cb0d48de8cc8d22adefee6a19e
      
https://github.com/NixOS/nixpkgs/commit/d317e834c10599cb0d48de8cc8d22adefee6a19e
  Author: Frederik Rietdijk <[email protected]>
  Date:   2017-05-03 (Wed, 03 May 2017)

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

  Log Message:
  -----------
  pythonPackages.pytestcov: never propagate pytest

Because we have multiple versions of pytest and we do not want to end up
with multiple in one closure.


  Commit: 97630b21c9242aeb777116eda5f407cb33443473
      
https://github.com/NixOS/nixpkgs/commit/97630b21c9242aeb777116eda5f407cb33443473
  Author: Frederik Rietdijk <[email protected]>
  Date:   2017-05-03 (Wed, 03 May 2017)

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

  Log Message:
  -----------
  pythonPackages.pydot: fix build


  Commit: 8017bc934e5ecc44356737f1765e7e118f1afd53
      
https://github.com/NixOS/nixpkgs/commit/8017bc934e5ecc44356737f1765e7e118f1afd53
  Author: Frederik Rietdijk <[email protected]>
  Date:   2017-05-03 (Wed, 03 May 2017)

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

  Log Message:
  -----------
  Merge pull request #25453 from LnL7/python-stevedore

python-stevedore: 1.7.0 -> 1.21.0


  Commit: 3dfa709706db3fcfb69c6907d2a29dca269caa0a
      
https://github.com/NixOS/nixpkgs/commit/3dfa709706db3fcfb69c6907d2a29dca269caa0a
  Author: Frederik Rietdijk <[email protected]>
  Date:   2017-05-03 (Wed, 03 May 2017)

  Changed paths:
    M pkgs/development/python-modules/line_profiler/default.nix

  Log Message:
  -----------
  pythonPackages.line_profiler: fix build


  Commit: 82e99edf3195ff6184b06a3bbeb0b98e074af603
      
https://github.com/NixOS/nixpkgs/commit/82e99edf3195ff6184b06a3bbeb0b98e074af603
  Author: Frederik Rietdijk <[email protected]>
  Date:   2017-05-03 (Wed, 03 May 2017)

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

  Log Message:
  -----------
  pythonpackages.pywinrm: broken


  Commit: a6175a477cee80ae0dafeecc10fef2f200644de4
      
https://github.com/NixOS/nixpkgs/commit/a6175a477cee80ae0dafeecc10fef2f200644de4
  Author: Frederik Rietdijk <[email protected]>
  Date:   2017-05-03 (Wed, 03 May 2017)

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

  Log Message:
  -----------
  pythonPackages.pivy: disable on 3.x


  Commit: cebce78be926f936ac3bd3a9f813c961b5d2d4a4
      
https://github.com/NixOS/nixpkgs/commit/cebce78be926f936ac3bd3a9f813c961b5d2d4a4
  Author: Cray Elliott <[email protected]>
  Date:   2017-05-03 (Wed, 03 May 2017)

  Changed paths:
    M pkgs/os-specific/linux/mwprocapture/default.nix
    A pkgs/os-specific/linux/mwprocapture/linux_4_11_include_fix.patch

  Log Message:
  -----------
  mwprocapture: fix compile on linux 4.11


  Commit: 52b1995250c5dd7443c69818d469ef7db0299ffd
      
https://github.com/NixOS/nixpkgs/commit/52b1995250c5dd7443c69818d469ef7db0299ffd
  Author: Frederik Rietdijk <[email protected]>
  Date:   2017-05-03 (Wed, 03 May 2017)

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

  Log Message:
  -----------
  pythonPackages.os-testr: mark as broken


  Commit: 664ff4069cb87aa4ab94f0e885ed1dab127bee15
      
https://github.com/NixOS/nixpkgs/commit/664ff4069cb87aa4ab94f0e885ed1dab127bee15
  Author: Frederik Rietdijk <[email protected]>
  Date:   2017-05-03 (Wed, 03 May 2017)

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

  Log Message:
  -----------
  pythonPackages.magic-wormhole: fix build

- fixes build
- use buildPythonPackage and pass in individual packages

As mentioned in https://github.com/NixOS/nixpkgs/pull/20722 this
packages is both an application and a library.

If a package is both then we use buildPythonPackage and put it in
python-packages.nix. That way we can guarantee we use the correct
version of dependencies when using it as a library. Unfortunately, it
does mean the name of the package is prefixed with `pythonX.X-`.


  Commit: c520e79842c91b432ffc8535cbecc90878392bea
      
https://github.com/NixOS/nixpkgs/commit/c520e79842c91b432ffc8535cbecc90878392bea
  Author: Frederik Rietdijk <[email protected]>
  Date:   2017-05-03 (Wed, 03 May 2017)

  Changed paths:
    M nixos/doc/manual/release-notes/rl-1709.xml
    M nixos/modules/module-list.nix
    M nixos/modules/services/continuous-integration/buildbot/master.nix
    M nixos/modules/services/continuous-integration/buildbot/worker.nix
    A nixos/modules/services/security/shibboleth-sp.nix
    M nixos/modules/services/x11/xserver.nix
    M nixos/tests/buildbot.nix
    M pkgs/applications/editors/neovim/default.nix
    M pkgs/applications/editors/neovim/neovim-remote.nix
    M pkgs/applications/editors/neovim/qt.nix
    M pkgs/applications/editors/rstudio/default.nix
    M pkgs/applications/kde/kgpg.nix
    M pkgs/applications/misc/urh/default.nix
    M pkgs/applications/networking/browsers/google-chrome/default.nix
    M pkgs/applications/networking/dropbox/default.nix
    M pkgs/applications/networking/feedreaders/rawdog/default.nix
    M pkgs/applications/networking/irc/qweechat/default.nix
    M pkgs/build-support/emacs/wrapper.nix
    M pkgs/development/libraries/gdal/default.nix
    M pkgs/development/libraries/libidn2/fix-error-darwin.patch
    M pkgs/development/libraries/qtinstaller/default.nix
    A pkgs/development/python-modules/certifi/default.nix
    M pkgs/development/python-modules/line_profiler/default.nix
    M pkgs/development/python-modules/magic-wormhole/default.nix
    A pkgs/development/python-modules/pydot/default.nix
    M pkgs/development/python-modules/pyroute2/default.nix
    A pkgs/development/python-modules/stevedore/default.nix
    M pkgs/development/r-modules/README.md
    A pkgs/development/r-modules/wrapper-rstudio.nix
    M pkgs/development/r-modules/wrapper.nix
    M pkgs/development/tools/ammonite/default.nix
    M pkgs/development/tools/build-managers/buildbot/default.nix
    M pkgs/development/tools/build-managers/buildbot/plugins.nix
    M pkgs/development/tools/build-managers/buildbot/worker.nix
    M pkgs/os-specific/linux/mwprocapture/default.nix
    A pkgs/os-specific/linux/mwprocapture/linux_4_11_include_fix.patch
    M pkgs/os-specific/linux/tomb/default.nix
    M pkgs/os-specific/linux/zfs/default.nix
    M pkgs/servers/radicale/default.nix
    M pkgs/tools/networking/fakeroute/default.nix
    M pkgs/tools/networking/mosh/default.nix
    M pkgs/tools/security/encryptr/default.nix
    M pkgs/tools/system/efivar/default.nix
    M pkgs/tools/text/grin/default.nix
    M pkgs/tools/text/xml/jing-trang/default.nix
    M pkgs/tools/text/xsv/default.nix
    M pkgs/top-level/aliases.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into HEAD


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

Reply via email to