[Nix-commits] [NixOS/nixpkgs] caa476: nixos/prometheus: add services.prometheus.configTe...

2016-12-20 Thread Benjamin Staffin
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: caa476b35760f095d3ed4faa910939a136d73356
  
https://github.com/NixOS/nixpkgs/commit/caa476b35760f095d3ed4faa910939a136d73356
  Author: Bjørn Forsman 
  Date:   2016-12-21 (Wed, 21 Dec 2016)

  Changed paths:
M nixos/modules/services/monitoring/prometheus/default.nix

  Log Message:
  ---
  nixos/prometheus: add services.prometheus.configText option

The structured options are incomplete compared to upstream and I think
it will be a maintenance burden to try to keep up. Instead, provide an
option for the raw config file contents (prometheus.yml).


  Commit: c1ecf36b9320481837b688e32ee4bd6cfcf315f9
  
https://github.com/NixOS/nixpkgs/commit/c1ecf36b9320481837b688e32ee4bd6cfcf315f9
  Author: Benjamin Staffin 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
M nixos/modules/services/monitoring/prometheus/default.nix

  Log Message:
  ---
  Merge pull request #21323 from bjornfor/prometheus

nixos/prometheus: add services.prometheus.configText option


Compare: https://github.com/NixOS/nixpkgs/compare/04a9e07bbd18...c1ecf36b9320___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 1b7984: ocamlPackages.containers: 0.20 -> 0.22

2016-12-20 Thread Ricardo M. Correia
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 1b79847e75847686d04f135aaf6dac8cf797d080
  
https://github.com/NixOS/nixpkgs/commit/1b79847e75847686d04f135aaf6dac8cf797d080
  Author: Vincent Laporte 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

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

  Log Message:
  ---
  ocamlPackages.containers: 0.20 -> 0.22


  Commit: 04a9e07bbd18c83047dd2dbe405367aac4d6e057
  
https://github.com/NixOS/nixpkgs/commit/04a9e07bbd18c83047dd2dbe405367aac4d6e057
  Author: Ricardo M. Correia 
  Date:   2016-12-21 (Wed, 21 Dec 2016)

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

  Log Message:
  ---
  Merge pull request #21295 from vbgl/containers-0.22

ocamlPackages.containers: 0.20 -> 0.22


Compare: https://github.com/NixOS/nixpkgs/compare/48fa032aae01...04a9e07bbd18___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs]

2016-12-20 Thread bjornfor
  Branch: refs/heads/prometheus
  Home:   https://github.com/NixOS/nixpkgs
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 577b61: nixos/prometheus: add services.prometheus.configTe...

2016-12-20 Thread Bjørn Forsman
  Branch: refs/heads/prometheus
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 577b61b866caf2c6d7e66e1decb6ccd2c68075be
  
https://github.com/NixOS/nixpkgs/commit/577b61b866caf2c6d7e66e1decb6ccd2c68075be
  Author: Bjørn Forsman 
  Date:   2016-12-21 (Wed, 21 Dec 2016)

  Changed paths:
M nixos/modules/services/monitoring/prometheus/default.nix

  Log Message:
  ---
  nixos/prometheus: add services.prometheus.configText option

The structured options are incomplete compared with upstream and I think
it will be a maintenance burden to try to keep up. Provide an option for
the raw config file contents (prometheus.yml).


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 8021c1: meld: 3.16.2 -> 3.16.4

2016-12-20 Thread Frederik Rietdijk
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 8021c1f429a1d5465bf6fef7b48ae0176552e777
  
https://github.com/NixOS/nixpkgs/commit/8021c1f429a1d5465bf6fef7b48ae0176552e777
  Author: mimadrid 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
M pkgs/applications/version-management/meld/default.nix

  Log Message:
  ---
  meld: 3.16.2 -> 3.16.4


  Commit: 48fa032aae019298a96fc2f42a1b65bcd33f0ea6
  
https://github.com/NixOS/nixpkgs/commit/48fa032aae019298a96fc2f42a1b65bcd33f0ea6
  Author: Frederik Rietdijk 
  Date:   2016-12-21 (Wed, 21 Dec 2016)

  Changed paths:
M pkgs/applications/version-management/meld/default.nix

  Log Message:
  ---
  Merge pull request #21322 from mimadrid/update/meld-3.16.4

meld: 3.16.2 -> 3.16.4


Compare: https://github.com/NixOS/nixpkgs/compare/3fb785b0ad69...48fa032aae01___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 3fb785: nixos: unbreak prometheus test

2016-12-20 Thread Bjørn Forsman
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 3fb785b0ad6902d765601e489e5f695411d2752f
  
https://github.com/NixOS/nixpkgs/commit/3fb785b0ad6902d765601e489e5f695411d2752f
  Author: Bjørn Forsman 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
M nixos/tests/prometheus.nix

  Log Message:
  ---
  nixos: unbreak prometheus test

target_groups was renamed to static_configs in d459916504
("prometheus service: rename values to match prometheus 1.0 naming.").
Catch up.


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-dev] Python package works with PYTHONHOME but not with PYTHONPATH

2016-12-20 Thread Nikolay Amiantov
tl;dr: Why can a Python package behave differently when imported using
PYTHONPATH and PYTHONHOME? Specifically, work with *HOME but not with *PATH.

Hi all,

While packaging Gnome15[1] I stumbled across a strange problem. I've
cleaned up gnome2.gnome_python package to use the default build
system[2]. After that `import gconf` stopped working in the application.

It turned out that the package has been patched to move gconf.so to
site-packages instead of a gtk-2.0 subdirectory, and I have removed this
patch. While investigating why was it needed in the first place I
noticed that on an Arch machine the package is laid out the upstream
way[3] but it works. On a whim I've tried to import the same package in
a wrapped Python and lo and behold -- it worked.

To reproduce this behaviour:
1. Check out my gnome15 branch[4];
2. Run `nix-shell -A gnome15`;
3. Run python2; try `import gconf`; notice it fails;
4. Run $PYTHON; try `import gconf`; notice it works.

The difference is that python2 is a regular Python using $PYTHONPATH
that is automatically set in the build environment, and $PYTHON is a
wrapped Python using $PYTHONHOME (python.buildEnv)[5].

Why does it have different behaviour? Currently Python applications
wrapped with our magical sed expression behave similarly to PYTHONPATH
(i.e. can't import this package). I hope to fix this but I'm not sure
what's going on.

1: https://gnome15.org/
2:
https://github.com/abbradar/nixpkgs/commit/04da99f3a83d59d70d0965a72d761856b823554e
3: https://www.archlinux.org/packages/extra/i686/python2-gconf/files/
4: https://github.com/abbradar/nixpkgs/commits/gnome15
5:
https://github.com/abbradar/nixpkgs/commit/becf31fc204d023639edbbce0feb6076c4810d6c

-- 
Nikolay.
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] [NixOS/nixpkgs] 06cfff: parted: re-enable checks

2016-12-20 Thread Aristid Breitkreuz
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 06cfff71dd104d06470375619ebc364a6fc61caa
  
https://github.com/NixOS/nixpkgs/commit/06cfff71dd104d06470375619ebc364a6fc61caa
  Author: Aristid Breitkreuz 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

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

  Log Message:
  ---
  parted: re-enable checks


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] b2e80a: samba4: 4.3.11 -> 4.3.13

2016-12-20 Thread Nikolay Amiantov
  Branch: refs/heads/release-16.09
  Home:   https://github.com/NixOS/nixpkgs
  Commit: b2e80a53cab7890024036f373a78ab8a560b4285
  
https://github.com/NixOS/nixpkgs/commit/b2e80a53cab7890024036f373a78ab8a560b4285
  Author: Nikolay Amiantov 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
A pkgs/servers/samba/4.x-fix-libkrb5.patch
M pkgs/servers/samba/4.x.nix

  Log Message:
  ---
  samba4: 4.3.11 -> 4.3.13


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] a60500: cyrus_sasl: 2.1.26 -> 2.5.10

2016-12-20 Thread Nikolay Amiantov
  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: a60500ce7028a1888aa2e367cf69c53dd93e01b6
  
https://github.com/NixOS/nixpkgs/commit/a60500ce7028a1888aa2e367cf69c53dd93e01b6
  Author: Nikolay Amiantov 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
M pkgs/development/libraries/cyrus-sasl/default.nix

  Log Message:
  ---
  cyrus_sasl: 2.1.26 -> 2.5.10


  Commit: f84344ed41ec43319d08a396b42c7a35d9154544
  
https://github.com/NixOS/nixpkgs/commit/f84344ed41ec43319d08a396b42c7a35d9154544
  Author: Nikolay Amiantov 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
M pkgs/development/libraries/kerberos/krb5.nix
R pkgs/development/libraries/kerberos/path_char_fix.patch

  Log Message:
  ---
  libkrb5: 1.14.3 -> 1.15


  Commit: b0a1028a1a18932aced53f36f0a80a3a213f91e4
  
https://github.com/NixOS/nixpkgs/commit/b0a1028a1a18932aced53f36f0a80a3a213f91e4
  Author: Nikolay Amiantov 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
M pkgs/servers/samba/4.x.nix

  Log Message:
  ---
  samba4: 4.4.6 -> 4.5.3


Compare: https://github.com/NixOS/nixpkgs/compare/8a5fb68b0cdd...b0a1028a1a18___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 5ed1ae: python/pypillowfight: Disable tests entirely

2016-12-20 Thread aszlig
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 5ed1aee3af6ce80c63e534fc26d7ee611d4ca50d
  
https://github.com/NixOS/nixpkgs/commit/5ed1aee3af6ce80c63e534fc26d7ee611d4ca50d
  Author: aszlig 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

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

  Log Message:
  ---
  python/pypillowfight: Disable tests entirely

This is getting entirely different results on i686-linux:

https://hydra.nixos.org/build/45122757/nixlog/6/raw

According to @jflesch the reference system these tests are built for is
Debian GNU/Linux (possibly only x86_64-linux I guess):

https://github.com/jflesch/libpillowfight/issues/2#issuecomment-268259174

So let's disable them until they're more deterministic and less
platform/distro-specific.

Signed-off-by: aszlig 


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] cbe8ff: minecraft-server: 1.11 -> 1.11.1

2016-12-20 Thread Tim Steinbach
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: cbe8ff1a7280aa40c5811e30a6808f57d63416d1
  
https://github.com/NixOS/nixpkgs/commit/cbe8ff1a7280aa40c5811e30a6808f57d63416d1
  Author: Tim Steinbach 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
M pkgs/games/minecraft-server/default.nix

  Log Message:
  ---
  minecraft-server: 1.11 -> 1.11.1


  Commit: d7e342d185fd7c3f1f7d09d104764f1a66470818
  
https://github.com/NixOS/nixpkgs/commit/d7e342d185fd7c3f1f7d09d104764f1a66470818
  Author: Tim Steinbach 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
M pkgs/games/minecraft-server/default.nix

  Log Message:
  ---
  Merge pull request #21312 from NeQuissimus/mc-server_1_11_1

minecraft-server: 1.11 -> 1.11.1


Compare: https://github.com/NixOS/nixpkgs/compare/edd5babb31ef...d7e342d185fd___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 8a5fb6: mariadb: use latest boost

2016-12-20 Thread Aristid Breitkreuz
  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 8a5fb68b0cdd235f7cd930a25075c96fd356976c
  
https://github.com/NixOS/nixpkgs/commit/8a5fb68b0cdd235f7cd930a25075c96fd356976c
  Author: Aristid Breitkreuz 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

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

  Log Message:
  ---
  mariadb: use latest boost


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 76c4b5: cmake: 3.6.2 -> 3.7.1

2016-12-20 Thread Aristid Breitkreuz
  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 76c4b5fcca06441e00e1d27d44f3a601915f8d66
  
https://github.com/NixOS/nixpkgs/commit/76c4b5fcca06441e00e1d27d44f3a601915f8d66
  Author: Aristid Breitkreuz 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

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

  Log Message:
  ---
  cmake: 3.6.2 -> 3.7.1


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 6758d1: multipath-tools: ensure gzip does not capture time...

2016-12-20 Thread Eelco Dolstra
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 6758d157d23dfb548d43c896a6f9092039684517
  
https://github.com/NixOS/nixpkgs/commit/6758d157d23dfb548d43c896a6f9092039684517
  Author: Joachim Fasting 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

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

  Log Message:
  ---
  multipath-tools: ensure gzip does not capture timestamp

gzip is originally called as 'gzip -9 -c'

This is a port of
https://github.com/NixOS/nixpkgs/pull/2281/commits/a8e7ddd1dfaae4b3ce97fdefe4614a3e31c04501

Note that it does not seem to make a difference to `nix-build --check`.


  Commit: 8246a845b43035b8715c7c2bf4a7341805eee00e
  
https://github.com/NixOS/nixpkgs/commit/8246a845b43035b8715c7c2bf4a7341805eee00e
  Author: Joachim Fasting 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

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

  Log Message:
  ---
  zerotierone: gzip -9 -> gzip -9n

Note that it does not seem to make a difference to `nix-build --check`.


  Commit: a34eae0ecb939f3ec8e04b5f98830a3deec06065
  
https://github.com/NixOS/nixpkgs/commit/a34eae0ecb939f3ec8e04b5f98830a3deec06065
  Author: Joachim Fasting 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

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

  Log Message:
  ---
  stun: gzip -9 -> gzip -9n

Note that it does not seem to make a difference to `nix-build --check`.


  Commit: edd5babb31efec337b756abd5d5de0b7ade89dc2
  
https://github.com/NixOS/nixpkgs/commit/edd5babb31efec337b756abd5d5de0b7ade89dc2
  Author: Eelco Dolstra 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
M pkgs/os-specific/linux/multipath-tools/default.nix
M pkgs/tools/networking/stun/default.nix
M pkgs/tools/networking/zerotierone/default.nix

  Log Message:
  ---
  Merge pull request #21306 from joachifm/gzip-9n

Remove uses of gzip that might capture build time


Compare: https://github.com/NixOS/nixpkgs/compare/df48cb7aa298...edd5babb31ef___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 168fe9: make-system-tarball: create reproducible tarballs

2016-12-20 Thread Eelco Dolstra
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 168fe999e71efa89326ce1df75e0df249e454ab2
  
https://github.com/NixOS/nixpkgs/commit/168fe999e71efa89326ce1df75e0df249e454ab2
  Author: Joachim Fasting 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
M nixos/lib/make-system-tarball.sh

  Log Message:
  ---
  make-system-tarball: create reproducible tarballs

Ensure that archive members are added in sorted order with a fixed
mtime.  This allows `nix-build --check` to succeed (when building a
tarball of a simple system configuration).

We also remove env-vars which doesn't appear to do much apart from
capture a bunch of store paths we probably don't want.

This is an alternative to
https://github.com/NixOS/nixpkgs/pull/2281/commits/4b78a5b5fb8584347999832b3c67d1276488140b


  Commit: df48cb7aa29888deafdca0a80bde438acbad1abf
  
https://github.com/NixOS/nixpkgs/commit/df48cb7aa29888deafdca0a80bde438acbad1abf
  Author: Eelco Dolstra 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
M nixos/lib/make-system-tarball.sh

  Log Message:
  ---
  Merge pull request #21305 from joachifm/deterministic-tarball-v2

make-system-tarball: create reproducible tarballs


Compare: https://github.com/NixOS/nixpkgs/compare/b9d3898995f2...df48cb7aa298___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] b9d389: qt57: 5.7.0 -> 5.7.1

2016-12-20 Thread Thomas Tuegel
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: b9d3898995f2a86f0b11c84d3b68bb12bb08d090
  
https://github.com/NixOS/nixpkgs/commit/b9d3898995f2a86f0b11c84d3b68bb12bb08d090
  Author: Thomas Tuegel 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
M pkgs/development/libraries/qt-5/5.7/fetch.sh
M pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
M pkgs/development/libraries/qt-5/5.7/srcs.nix

  Log Message:
  ---
  qt57: 5.7.0 -> 5.7.1


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 99352b: dropbox: 15.4.22 -> 16.4.29

2016-12-20 Thread Thomas Tuegel
  Branch: refs/heads/release-16.09
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 99352b05e3dd2bea9dbf2175da2ac2115b7a2202
  
https://github.com/NixOS/nixpkgs/commit/99352b05e3dd2bea9dbf2175da2ac2115b7a2202
  Author: Peter Hoeg 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

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

  Log Message:
  ---
  dropbox: 15.4.22 -> 16.4.29


  Commit: 97b3de92a64b47656e0a4de2aed97e00b3f5b2a8
  
https://github.com/NixOS/nixpkgs/commit/97b3de92a64b47656e0a4de2aed97e00b3f5b2a8
  Author: Thomas Tuegel 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

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

  Log Message:
  ---
  Merge pull request #21291 from peterhoeg/u/db_stable

dropbox: 15.4.22 -> 16.4.29


Compare: https://github.com/NixOS/nixpkgs/compare/2a97e149e50e...97b3de92a64b___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] eb9fd3: syncthing: 0.14.13 -> 0.14.15

2016-12-20 Thread Aristid Breitkreuz
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: eb9fd3c00d82a13cd36d9b5a0264b73de9f640bd
  
https://github.com/NixOS/nixpkgs/commit/eb9fd3c00d82a13cd36d9b5a0264b73de9f640bd
  Author: Ioannis Koutras 
  Date:   2016-12-18 (Sun, 18 Dec 2016)

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

  Log Message:
  ---
  syncthing: 0.14.13 -> 0.14.15


  Commit: 6d75b913fda7676997d0ed3eda83bf33942de712
  
https://github.com/NixOS/nixpkgs/commit/6d75b913fda7676997d0ed3eda83bf33942de712
  Author: Aristid Breitkreuz 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

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

  Log Message:
  ---
  Merge pull request #21255 from jokogr/u/syncthing-0.14.15

syncthing: 0.14.13 -> 0.14.15


Compare: https://github.com/NixOS/nixpkgs/compare/978c26a465fb...6d75b913fda7___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] ec4d73: boost: default version 1.62.0

2016-12-20 Thread Aristid Breitkreuz
  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: ec4d73573ae944611346bef8d769994b3bc1ec41
  
https://github.com/NixOS/nixpkgs/commit/ec4d73573ae944611346bef8d769994b3bc1ec41
  Author: Aristid Breitkreuz 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

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

  Log Message:
  ---
  boost: default version 1.62.0


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 08b013: dropbox: 15.4.22 -> 16.4.29

2016-12-20 Thread Aristid Breitkreuz
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 08b01310c69e26b8415d25b5cb82dd01962e6250
  
https://github.com/NixOS/nixpkgs/commit/08b01310c69e26b8415d25b5cb82dd01962e6250
  Author: Peter Hoeg 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

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

  Log Message:
  ---
  dropbox: 15.4.22 -> 16.4.29


  Commit: 978c26a465fb56e44566da4c584fb1a3ad45f55d
  
https://github.com/NixOS/nixpkgs/commit/978c26a465fb56e44566da4c584fb1a3ad45f55d
  Author: Aristid Breitkreuz 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

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

  Log Message:
  ---
  Merge pull request #21290 from peterhoeg/u/db

dropbox: 15.4.22 -> 16.4.29


Compare: https://github.com/NixOS/nixpkgs/compare/5a8147479e79...978c26a465fb___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 405873: flask: 0.10.1 -> 0.11.1

2016-12-20 Thread Aristid Breitkreuz
  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 4058735122db43991db1c3cea4ce9795cff52bee
  
https://github.com/NixOS/nixpkgs/commit/4058735122db43991db1c3cea4ce9795cff52bee
  Author: Alexey Shmalko 
  Date:   2016-11-21 (Mon, 21 Nov 2016)

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

  Log Message:
  ---
  flask: 0.10.1 -> 0.11.1


  Commit: 0c9e7151ac4bcf2fe1c8d2a505e16dc2dd7a3bc8
  
https://github.com/NixOS/nixpkgs/commit/0c9e7151ac4bcf2fe1c8d2a505e16dc2dd7a3bc8
  Author: Alex Ivanov 
  Date:   2016-12-11 (Sun, 11 Dec 2016)

  Changed paths:
A pkgs/development/libraries/qtstyleplugins/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  qtstyleplugins: init at 2016-12-01


  Commit: 9aa6c95d5a5e2221459c0153e2628ec09d69f9ac
  
https://github.com/NixOS/nixpkgs/commit/9aa6c95d5a5e2221459c0153e2628ec09d69f9ac
  Author: Kamil Chmielewski 
  Date:   2016-12-15 (Thu, 15 Dec 2016)

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

  Log Message:
  ---
  vagrant: 1.8.7 -> 1.9.1


  Commit: 06fbf5cb77bf577ad837042b0106de0a57b5107f
  
https://github.com/NixOS/nixpkgs/commit/06fbf5cb77bf577ad837042b0106de0a57b5107f
  Author: Gábor Lehel 
  Date:   2016-12-16 (Fri, 16 Dec 2016)

  Changed paths:
M pkgs/applications/networking/browsers/vivaldi/default.nix

  Log Message:
  ---
  vivaldi: 1.5.658.44-1 -> 1.6.689.34-1


  Commit: 8f3e3d2576427b12fc632f1bdcf8548a3d3306c7
  
https://github.com/NixOS/nixpkgs/commit/8f3e3d2576427b12fc632f1bdcf8548a3d3306c7
  Author: Bruno Bzeznik 
  Date:   2016-12-16 (Fri, 16 Dec 2016)

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

  Log Message:
  ---
  ior: init at 3.0.1


  Commit: 9cc0eff1cf218f737f9ce5a05f099f734a2f7bcc
  
https://github.com/NixOS/nixpkgs/commit/9cc0eff1cf218f737f9ce5a05f099f734a2f7bcc
  Author: Gábor Lehel 
  Date:   2016-12-17 (Sat, 17 Dec 2016)

  Changed paths:
M pkgs/applications/networking/browsers/vivaldi/default.nix

  Log Message:
  ---
  vivaldi: add libxcb to buildInputs, seems to be required now


  Commit: 32becd8ddff3686377cd128278e5e796aa47687e
  
https://github.com/NixOS/nixpkgs/commit/32becd8ddff3686377cd128278e5e796aa47687e
  Author: mimadrid 
  Date:   2016-12-17 (Sat, 17 Dec 2016)

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

  Log Message:
  ---
  poppler: 0.49.0 -> 0.50.0


  Commit: 0063c8acb4a5de8d90c0cbadf54ce337bd921e76
  
https://github.com/NixOS/nixpkgs/commit/0063c8acb4a5de8d90c0cbadf54ce337bd921e76
  Author: Nikolay Amiantov 
  Date:   2016-12-17 (Sat, 17 Dec 2016)

  Changed paths:
M pkgs/tools/archivers/p7zip/default.nix
A pkgs/tools/archivers/p7zip/setup-hook.sh

  Log Message:
  ---
  p7zip: add setup hook


  Commit: 60903f7320cdfc517a23ce80a0c21a31d4a2eee9
  
https://github.com/NixOS/nixpkgs/commit/60903f7320cdfc517a23ce80a0c21a31d4a2eee9
  Author: Nikolay Amiantov 
  Date:   2016-12-17 (Sat, 17 Dec 2016)

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

  Log Message:
  ---
  gzdoom: 2015-05-07 -> 2.2.0


  Commit: 1cc9d9ef2ce80dee5c8f2ef9f8ae20ae76337d73
  
https://github.com/NixOS/nixpkgs/commit/1cc9d9ef2ce80dee5c8f2ef9f8ae20ae76337d73
  Author: Nikolay Amiantov 
  Date:   2016-12-17 (Sat, 17 Dec 2016)

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

  Log Message:
  ---
  zdoom: 2.7.1 -> 2.8.1


  Commit: dca2e720bc2882edfa6589abe2fea0392e200519
  
https://github.com/NixOS/nixpkgs/commit/dca2e720bc2882edfa6589abe2fea0392e200519
  Author: Nikolay Amiantov 
  Date:   2016-12-17 (Sat, 17 Dec 2016)

  Changed paths:
M pkgs/games/zandronum/default.nix
A pkgs/games/zandronum/fmod.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  zandronum: bundle fmod, fix libraries


  Commit: 18d42e1aa526cb9a28b1f4e4907665abf050c039
  
https://github.com/NixOS/nixpkgs/commit/18d42e1aa526cb9a28b1f4e4907665abf050c039
  Author: Nikolay Amiantov 
  Date:   2016-12-17 (Sat, 17 Dec 2016)

  Changed paths:
R pkgs/development/libraries/fmod/4.24.16.nix
R pkgs/development/libraries/fmod/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  fmod: remove


  Commit: f75f0ac1f4ba1e9d2de141ae113f1818191ca0de
  
https://github.com/NixOS/nixpkgs/commit/f75f0ac1f4ba1e9d2de141ae113f1818191ca0de
  Author: mimadrid 
  Date:   2016-12-17 (Sat, 17 Dec 2016)

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

  Log Message:
  ---
  teamviewer: 11.0.57095 -> 12.0.71510


  Commit: cf82ab73e2fbb6f335d9710a883351aa4d086aee
  
https://github.com/NixOS/nixpkgs/commit/cf82ab73e2fbb6f335d9710a883351aa4d086aee
  Author: Joachim F 
  Date:   2016-12-17 (Sat, 17 Dec 2016)

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

[Nix-commits] [NixOS/nixpkgs] 5a8147: make-initrd: create reproducible initrds

2016-12-20 Thread Joachim Fasting
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 5a8147479e794d5932273d01790c3602b8abeedc
  
https://github.com/NixOS/nixpkgs/commit/5a8147479e794d5932273d01790c3602b8abeedc
  Author: Joachim Fasting 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
R pkgs/build-support/kernel/cpio-clean.pl
M pkgs/build-support/kernel/make-initrd.nix
M pkgs/build-support/kernel/make-initrd.sh

  Log Message:
  ---
  make-initrd: create reproducible initrds

To achieve reproducible results, `cpio` archive members are added in
sorted order and inodes renumbered.

The `cpio-clean.pl` script is made obsolete by setting mtimes via
`touch` & using `cpio --reproducible`.  Suggested by @dezgeg in
https://github.com/NixOS/nixpkgs/pull/21273#issuecomment-268116605.

Note that using `--reproducible` means that initial ramdisk creation now
requires at least `cpio` version 2.12 (released in 2015).


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 49e319: Revert "xhyve: update and fix to use our Hyperviso...

2016-12-20 Thread Daiderd Jordan
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 49e3190efa3e307f48d3d3ebfefb421bc5956a6b
  
https://github.com/NixOS/nixpkgs/commit/49e3190efa3e307f48d3d3ebfefb421bc5956a6b
  Author: Daiderd Jordan 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
M pkgs/applications/virtualization/xhyve/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Revert "xhyve: update and fix to use our Hypervisor framework"

This reverts commit f3b65f67d98a2e67c739d4b76b3340eda1dd06f4.


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 6b4a41: libfaketime: make the build reproducible

2016-12-20 Thread Alexander Kjeldaas
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 6b4a41a360efe14e6cb632d024467b19e991813c
  
https://github.com/NixOS/nixpkgs/commit/6b4a41a360efe14e6cb632d024467b19e991813c
  Author: Alexander Kjeldaas 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
M pkgs/development/libraries/libfaketime/default.nix
A pkgs/development/libraries/libfaketime/no-date-in-gzip-man-page.patch

  Log Message:
  ---
  libfaketime: make the build reproducible

A rebased version of 
https://github.com/NixOS/nixpkgs/pull/2281/commits/cb8bd05a0172db9c02ba0067b21bbc0ce17cc522
Note: we no longer apply the spurious lrt patch.

This allows `nix-build --check -A libfaketime` to succeed.


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] fb2a7c: Revert "apple-sdk: 10.9 -> 10.11"

2016-12-20 Thread Daiderd Jordan
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: fb2a7cd705a6f706872463e6cec481503414bd75
  
https://github.com/NixOS/nixpkgs/commit/fb2a7cd705a6f706872463e6cec481503414bd75
  Author: Daiderd Jordan 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
M pkgs/os-specific/darwin/apple-sdk/default.nix
M pkgs/os-specific/darwin/apple-sdk/frameworks.nix

  Log Message:
  ---
  Revert "apple-sdk: 10.9 -> 10.11"

This reverts commit 377cef8d16c47df74d2653432d9bba968236c8a0.


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 8a0843: qemu-kvm: Mark the version for tests

2016-12-20 Thread Eelco Dolstra
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 8a0843c3c4929d38b9a79f61449fc63c6a27e4a0
  
https://github.com/NixOS/nixpkgs/commit/8a0843c3c4929d38b9a79f61449fc63c6a27e4a0
  Author: Eelco Dolstra 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
M pkgs/applications/virtualization/qemu/default.nix

  Log Message:
  ---
  qemu-kvm: Mark the version for tests

(cherry picked from commit d58a4ec1ba77e390c53c09ba6198b78f8568d495)


  Commit: aad5d1f9a7b933442c646f1f1d69b5d9df0ffbcf
  
https://github.com/NixOS/nixpkgs/commit/aad5d1f9a7b933442c646f1f1d69b5d9df0ffbcf
  Author: Eelco Dolstra 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
M nixos/lib/testing.nix
M nixos/modules/testing/test-instrumentation.nix
M nixos/modules/virtualisation/qemu-vm.nix

  Log Message:
  ---
  virtualisation.qemu.program: Remove

This option is defined in qemu-vm.nix, but that module is not always
imported.

http://hydra.nixos.org/build/44817443
(cherry picked from commit 03c55005dfd6fbcd5cf8e00128a3bb6336b3bc0f)


  Commit: f173da375da9642fb5dd7047e8d4a2e5a9ac5db4
  
https://github.com/NixOS/nixpkgs/commit/f173da375da9642fb5dd7047e8d4a2e5a9ac5db4
  Author: Eelco Dolstra 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
M nixos/lib/build-vms.nix
M nixos/lib/testing.nix
M nixos/modules/virtualisation/qemu-vm.nix

  Log Message:
  ---
  Use only one build of qemu in VM tests

Previously we were using two or three (qemu_kvm, qemu_test, and
qemu_test with a different dbus when minimal.nix is included).

(cherry picked from commit 8bfa4ce82ea7d23a1d4c6073bcc044e6bf9c4dbe)


  Commit: a02bb00156086b45e68c1112008db506734f8649
  
https://github.com/NixOS/nixpkgs/commit/a02bb00156086b45e68c1112008db506734f8649
  Author: Eelco Dolstra 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
M nixos/modules/virtualisation/qemu-vm.nix

  Log Message:
  ---
  Enable virtualisation.writableStore by default

This works around:

  machine: must succeed: nix-store -qR /run/current-system | grep nixos-
  machine# error: changing ownership of path ‘/nix/store’: Invalid argument

Probably Nix shouldn't be anal about the ownership of the store unless
it's trying to build/write to the store.

http://hydra.nixos.org/build/45093872/nixlog/17/raw
(cherry picked from commit 57a0f140643cde409022e297ed05e05f8d34d778)


Compare: https://github.com/NixOS/nixpkgs/compare/efd5508b8998...a02bb0015608___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] efd550: systemd: add slice support

2016-12-20 Thread Markov Dmitry
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: efd5508b8998667dd04a090bc43f8ab6683d4f52
  
https://github.com/NixOS/nixpkgs/commit/efd5508b8998667dd04a090bc43f8ab6683d4f52
  Author: Markov Dmitry 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
M nixos/modules/system/boot/systemd-unit-options.nix
M nixos/modules/system/boot/systemd.nix

  Log Message:
  ---
  systemd: add slice support


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 2a97e1: python/hetzner: 0.7.4 -> 0.7.5

2016-12-20 Thread aszlig
  Branch: refs/heads/release-16.09
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 2a97e149e50e1c701a957c6bd060cc74b7e9a905
  
https://github.com/NixOS/nixpkgs/commit/2a97e149e50e1c701a957c6bd060cc74b7e9a905
  Author: aszlig 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

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

  Log Message:
  ---
  python/hetzner: 0.7.4 -> 0.7.5

This essentially unbreaks deploying new Hetzner machines with NixOps,
because the Hetzner robot has changed its way of handling admin
accounts.

It also now provides a more helpful error message (instead of an
AssertionError) if admin account creation has failed.

Signed-off-by: aszlig 
Reported-by: Graham Christensen 
Issue: https://github.com/NixOS/nixops/issues/563
(cherry picked from commit ccbce6b11ab0e47c2f701f2539f989a7fd323687)


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] ccbce6: python/hetzner: 0.7.4 -> 0.7.5

2016-12-20 Thread aszlig
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: ccbce6b11ab0e47c2f701f2539f989a7fd323687
  
https://github.com/NixOS/nixpkgs/commit/ccbce6b11ab0e47c2f701f2539f989a7fd323687
  Author: aszlig 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

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

  Log Message:
  ---
  python/hetzner: 0.7.4 -> 0.7.5

This essentially unbreaks deploying new Hetzner machines with NixOps,
because the Hetzner robot has changed its way of handling admin
accounts.

It also now provides a more helpful error message (instead of an
AssertionError) if admin account creation has failed.

Signed-off-by: aszlig 
Reported-by: Graham Christensen 
Issue: https://github.com/NixOS/nixops/issues/563


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 3422a7: matrix-synapse: 0.18.4 -> 0.18.5

2016-12-20 Thread Frederik Rietdijk
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 3422a7710f43cdacb2ea4978b9c786c3fc6d54c8
  
https://github.com/NixOS/nixpkgs/commit/3422a7710f43cdacb2ea4978b9c786c3fc6d54c8
  Author: Benjamin Saunders 
  Date:   2016-12-19 (Mon, 19 Dec 2016)

  Changed paths:
M pkgs/servers/matrix-synapse/default.nix
M pkgs/servers/matrix-synapse/matrix-synapse.patch

  Log Message:
  ---
  matrix-synapse: 0.18.4 -> 0.18.5


  Commit: fd5a6b8efc0ae9dc1158e9340965c845dff1e77b
  
https://github.com/NixOS/nixpkgs/commit/fd5a6b8efc0ae9dc1158e9340965c845dff1e77b
  Author: Frederik Rietdijk 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
M pkgs/servers/matrix-synapse/default.nix
M pkgs/servers/matrix-synapse/matrix-synapse.patch

  Log Message:
  ---
  Merge pull request #21296 from Ralith/matrix-synapse

matrix-synapse: 0.18.4 -> 0.18.5


Compare: https://github.com/NixOS/nixpkgs/compare/f3b65f67d98a...fd5a6b8efc0a___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits