3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

97725 commits

Author SHA1 Message Date
Benjamin Staffin c1ecf36b93 Merge pull request #21323 from bjornfor/prometheus
nixos/prometheus: add services.prometheus.configText option
2016-12-20 20:36:27 -08:00
Eric Litak 489ba1744c top-level: missing parentheses 2016-12-20 16:27:04 -08:00
Ricardo M. Correia 04a9e07bbd Merge pull request #21295 from vbgl/containers-0.22
ocamlPackages.containers: 0.20 -> 0.22
2016-12-21 01:23:36 +01:00
Bjørn Forsman caa476b357 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).
2016-12-21 00:32:24 +01:00
Frederik Rietdijk 48fa032aae Merge pull request #21322 from mimadrid/update/meld-3.16.4
meld: 3.16.2 -> 3.16.4
2016-12-21 00:09:27 +01:00
mimadrid 8021c1f429
meld: 3.16.2 -> 3.16.4 2016-12-20 23:56:29 +01:00
Bjørn Forsman 3fb785b0ad 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.
2016-12-20 23:26:51 +01:00
Aristid Breitkreuz 06cfff71dd parted: re-enable checks 2016-12-20 21:57:28 +01:00
Nikolay Amiantov b0a1028a1a samba4: 4.4.6 -> 4.5.3 2016-12-20 21:30:00 +03:00
Nikolay Amiantov f84344ed41 libkrb5: 1.14.3 -> 1.15 2016-12-20 21:29:59 +03:00
Nikolay Amiantov a60500ce70 cyrus_sasl: 2.1.26 -> 2.5.10 2016-12-20 21:29:59 +03:00
aszlig 5ed1aee3af
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 <aszlig@redmoonstudios.org>
2016-12-20 19:00:29 +01:00
Tim Steinbach d7e342d185 Merge pull request #21312 from NeQuissimus/mc-server_1_11_1
minecraft-server: 1.11 -> 1.11.1
2016-12-20 12:50:29 -05:00
Tim Steinbach cbe8ff1a72 minecraft-server: 1.11 -> 1.11.1 2016-12-20 12:48:56 -05:00
Aristid Breitkreuz 8a5fb68b0c mariadb: use latest boost 2016-12-20 16:53:32 +01:00
Aristid Breitkreuz 76c4b5fcca cmake: 3.6.2 -> 3.7.1 2016-12-20 16:20:08 +01:00
Eelco Dolstra edd5babb31 Merge pull request #21306 from joachifm/gzip-9n
Remove uses of gzip that might capture build time
2016-12-20 15:52:47 +01:00
Eelco Dolstra df48cb7aa2 Merge pull request #21305 from joachifm/deterministic-tarball-v2
make-system-tarball: create reproducible tarballs
2016-12-20 15:39:32 +01:00
Joachim Fasting a34eae0ecb
stun: gzip -9 -> gzip -9n
Note that it does not seem to make a difference to `nix-build --check`.
2016-12-20 15:32:14 +01:00
Joachim Fasting 8246a845b4
zerotierone: gzip -9 -> gzip -9n
Note that it does not seem to make a difference to `nix-build --check`.
2016-12-20 15:32:07 +01:00
Joachim Fasting 6758d157d2
multipath-tools: ensure gzip does not capture timestamp
gzip is originally called as 'gzip -9 -c'

This is a port of
a8e7ddd1df

Note that it does not seem to make a difference to `nix-build --check`.
2016-12-20 15:31:55 +01:00
Joachim Fasting 168fe999e7
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
4b78a5b5fb
2016-12-20 15:26:21 +01:00
Thomas Tuegel b9d3898995
qt57: 5.7.0 -> 5.7.1 2016-12-20 07:40:53 -06:00
Aristid Breitkreuz 6d75b913fd Merge pull request #21255 from jokogr/u/syncthing-0.14.15
syncthing: 0.14.13 -> 0.14.15
2016-12-20 14:20:26 +01:00
Aristid Breitkreuz ec4d73573a boost: default version 1.62.0 2016-12-20 14:16:27 +01:00
Aristid Breitkreuz 978c26a465 Merge pull request #21290 from peterhoeg/u/db
dropbox: 15.4.22 -> 16.4.29
2016-12-20 14:12:34 +01:00
Aristid Breitkreuz bb18e10ba0 Merge remote-tracking branch 'origin/master' into staging 2016-12-20 14:05:30 +01:00
Joachim Fasting 5a8147479e 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).
2016-12-20 14:00:04 +01:00
Daiderd Jordan 49e3190efa
Revert "xhyve: update and fix to use our Hypervisor framework"
This reverts commit f3b65f67d9.
2016-12-20 13:02:27 +01:00
Alexander Kjeldaas 6b4a41a360 libfaketime: make the build reproducible
A rebased version of cb8bd05a01
Note: we no longer apply the spurious lrt patch.

This allows `nix-build --check -A libfaketime` to succeed.
2016-12-20 12:54:23 +01:00
Daiderd Jordan fb2a7cd705 Revert "apple-sdk: 10.9 -> 10.11"
This reverts commit 377cef8d16.
2016-12-20 12:33:27 +01:00
Eelco Dolstra a02bb00156
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 57a0f14064)
2016-12-20 10:52:47 +01:00
Eelco Dolstra f173da375d
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 8bfa4ce82e)
2016-12-20 10:52:46 +01:00
Eelco Dolstra aad5d1f9a7
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 03c55005df)
2016-12-20 10:52:46 +01:00
Eelco Dolstra 8a0843c3c4
qemu-kvm: Mark the version for tests
(cherry picked from commit d58a4ec1ba)
2016-12-20 10:52:46 +01:00
Markov Dmitry efd5508b89 systemd: add slice support 2016-12-20 10:49:08 +01:00
aszlig ccbce6b11a
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 <aszlig@redmoonstudios.org>
Reported-by: Graham Christensen <graham@grahamc.com>
Issue: https://github.com/NixOS/nixops/issues/563
2016-12-20 10:16:14 +01:00
Frederik Rietdijk fd5a6b8efc Merge pull request #21296 from Ralith/matrix-synapse
matrix-synapse: 0.18.4 -> 0.18.5
2016-12-20 09:26:12 +01:00
J Phani Mahesh a737eff5c1 python:html5lib: 0.999 -> 0.999999999
fixes LWN vuln:709146
ref #21289: Vulnerability roundup 14
2016-12-20 12:27:08 +05:30
Vincent Laporte 1b79847e75 ocamlPackages.containers: 0.20 -> 0.22 2016-12-20 04:10:05 +00:00
Benjamin Saunders 3422a7710f matrix-synapse: 0.18.4 -> 0.18.5 2016-12-19 19:50:24 -08:00
Dan Peebles f3b65f67d9 xhyve: update and fix to use our Hypervisor framework 2016-12-19 19:47:24 -05:00
Dan Peebles 377cef8d16 apple-sdk: 10.9 -> 10.11 2016-12-19 19:47:24 -05:00
Daiderd Jordan 405507acac Merge pull request #21293 from mdaiter/fixNixOpsDarwin
python-pillow: Disable tests on Darwin
2016-12-20 01:33:18 +01:00
Matthew Daiter 6bce0dc23f python/pillow: Disable tests on Darwin 2016-12-20 01:29:20 +01:00
Joachim Fasting 3e92b56be3
tor: 0.2.8.10 -> 0.2.8.12
Notably contains fix for CVE-2016-1254

cc @grahamc
2016-12-19 23:49:17 +01:00
Peter Hoeg 08b01310c6 dropbox: 15.4.22 -> 16.4.29 2016-12-20 06:44:56 +08:00
Michael Fellinger bb80d77d84 neovim: green :CheckHealth 2016-12-19 23:05:31 +01:00
aszlig 7199f1bd94
paperwork: init at 1.0.6.1
I have not yet tested scanning, but the main application works so far.

A lot of patching is required here, because the upstream project
references some paths from well-known FHS locations which of course are
not available on Nix(OS).

We also use all available aspell dictionaries right now, which is maybe
a bit ugly but it makes language switching easier.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-12-19 22:25:56 +01:00
aszlig d331f58b90
python/paperwork-backend: init at 1.0.6
While not explicitly checked by setup.py or by the "chkdeps" command
from the project I have added pyinsane2 and pyocr to the list of
dependencies as well, because they're referenced in the source.

Tested by building against Python 3.3, 3.4, 3.5 and 3.6.

The build against Python 3.6 failed because pycairo doesn't build, so
it's a non-issue at least for paperwork-backend.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-12-19 22:25:53 +01:00