JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,188 Commits 2 Branches 0 Tags 13 GiB
782440310d
Commit Graph

5273 Commits

Author SHA1 Message Date
Matej Cotman
4b74502a35 cmst: update to 2014.12.05 2014-12-08 12:49:28 +01:00
Matej Cotman
94f8f28433 connman: update to 1.26 2014-12-08 12:47:00 +01:00
Edward Tjörnhammar
3ce89ba002 srm: added package 2014-12-08 11:51:39 +01:00
Domen Kožar
4aa3eec330 Merge branch 'master' into staging 
Conflicts:
	pkgs/development/libraries/fontconfig/default.nix
 2014-12-07 14:02:48 +01:00
Richard Wallace
b00f6cde88 wrap pasystray to provide XDG_DATA_DIRS so tray icon displays correctly 2014-12-06 15:50:26 -07:00
cillianderoiste
4687494b7c Merge pull request #5245 from ftrvxmtrx/plan9port 
plan9port: make it actually work
 2014-12-06 15:46:59 +00:00
Siarhei Zirukin
60f2081019 plan9port: make it actually work 
* Add "which" dependency, otherwise it builds with lots of
  "command not found" errors.

* -lgcc_s, otherwise many commands basically fail without pthread_cancel.

* Fix X11 dependencies, otherwise it would be plan9port with none of UI
  programs working.
 2014-12-06 16:18:30 +01:00
Bjørn Forsman
32da2ba923 plantuml: update from 7991 to 8012 2014-12-06 16:13:15 +01:00
Austin Seipp
c3bdbd3b52 nixpkgs: tor-browser 4.0.1 -> 4.0.2 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-06 05:01:28 -06:00
Austin Seipp
92eb86e110 nixpkgs: add myself as a 'tor' maintainer 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-06 05:01:27 -06:00
Austin Seipp
c206c728a8 nixpkgs: tor depends on torsocks 
This may seem strange, but tor distributes its 'torify' wrapper which in
turn attempts to use torsocks to bridge a connection, meaning 'tor'
users out the box may want it to work.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-06 05:00:27 -06:00
Austin Seipp
d92d0eca92 nixpkgs: torsocks 1.3 -> 2.0.0 
Additionally, this fixes 'torsocks' using the 'which' executable as a
dependency.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-06 05:00:26 -06:00
Pascal Wittmann
47eabfabe2 Merge pull request #5239 from robberer/pkgs/mrtg 
mrtg: add 2.17.4
 2014-12-06 10:58:53 +01:00
Longrin Wischnewski
cf4318ad4e mrtg: add 2.17.4 
- The Multi Router Traffic Grapher
- You have a router, you want to know what it does all day long?
- Then MRTG is for you. It will monitor SNMP network devices and draw
- pretty pictures showing how much traffic has passed through each interface.
 2014-12-06 09:05:29 +01:00
Tobias Geerinckx-Rice
51ccf09ba2 Add duff: find duplicate files from the command line 2014-12-06 00:10:08 +01:00
Tobias Geerinckx-Rice
b7425f8fef Add eid-mw: authenticate & sign with Belgian eID identity cards 2014-12-05 23:15:44 +01:00
Rok Garbas
24848992bc goaccess: update to 0.8.5 2014-12-05 11:30:25 +01:00
Charles Strahan
aadb556e29 lastpass-cli: new package 
This adds the official lastpass CLI, a utility for manipulating lastpass logins.
 2014-12-04 18:23:25 -05:00
William A. Kennington III
d2a2c77643 ceph: 0.88 -> 0.89 2014-12-04 15:17:58 -08:00
Pascal Wittmann
00444ab724 logstalgia: fix build with new glm version 2014-12-04 14:31:28 +01:00
Luca Bruno
51992d82a1 Merge "Ipxe" PR #5208 
Fixed some indentation issues
 2014-12-04 12:04:08 +01:00
Emery Hemingway
3faacca044 nixpkgs: iPXE initial package 2014-12-04 11:03:56 +01:00
Shea Levy
fcaf268d54 nixUnstable: bump 2014-12-03 22:22:18 -05:00
Austin Seipp
25d883a46d nixpkgs: afl 0.79b -> 0.85b 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-03 18:53:20 -06:00
Rob Vermaas
6ae8983a5e Update dd-agent to 4.4.0 2014-12-03 16:08:39 +01:00
Peter Simons
79486d44c0 tree: don't rely on $CC being set in the stdenv build environment 
Fixes https://github.com/NixOS/nixpkgs/issues/5214.
 2014-12-03 16:00:41 +01:00
Bjørn Forsman
3ba01941ce duply: update 1.7.3 -> 1.9.1 2014-12-02 22:56:44 +01:00
Bjørn Forsman
998e6153be duplicity: update 0.6.24 -> 0.6.25 (latest stable) 2014-12-02 22:56:44 +01:00
Thomas Tuegel
02157ab123 libcurl: honor $SSL_CERT_FILE (fixed) 
The previous attempt to patch libcurl used

getenv("CURL_CA_BUNDLE") || getenv("SSL_CERT_FILE")

to get the second environment variable if the first is unset.
Unfortunately, this broke libcurl because the (||) operator is C returns
only 0 or 1, so it is inappropriate for pointer comparisons! Now we use

getenv("CURL_CA_BUNDLE") ? getenv("CURL_CA_BUNDLE") : getenv("SSL_CERT_FILE")

instead. This has one downside: it always calls getenv twice! But,
that's a small price to pay for actually being correct.
 2014-12-02 10:41:24 -06:00
Domen Kožar
f57d22fd05 openvpn: fix build 2014-12-02 15:30:25 +01:00
Domen Kožar
cc0d52846e openvpn: 2.3.4 -> 2.3.6 (CVE-2014-8104) 2014-12-02 13:11:37 +01:00
lethalman
9bce8d2ef2 Merge pull request #5190 from deepfire/debootstrap-version-fix 
debootstrap | 404-fix:  -> 1.0.64, since 1.0.63 disappeared from archive
 2014-12-02 10:59:14 +01:00
Domen Kožar
a2acbc230a Merge pull request #5191 from AndersonTorres/megatools 
Megatools: update to 1.9.93
 2014-12-01 22:03:34 +01:00
Moritz Ulrich
77049af46f pngcheck: New package. 2014-12-01 17:05:20 +01:00
Georges Dubus
1c3a9336ed Packaged cloud-init and its dependencies 2014-12-01 10:55:45 +01:00
Austin Seipp
8f6279be5c afl: 0.68b -> 0.79b 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-11-30 13:19:26 -06:00
AndersonTorres
3af34aa2b1 Megatools: update to 1.9.93 2014-11-30 12:07:44 -02:00
Kosyrev Serge
ae72e5ba8f debootstrap | 404-fix: -> 1.0.64, since 1.0.63 disappeared from archive 2014-11-30 16:51:42 +03:00
Arseniy Seroka
5b8fb2239c Merge pull request #5188 from DamienCassou/umlet 
New package for Umlet 13.1
 2014-11-30 15:30:03 +03:00
Damien Cassou
dcc2f1ac38 New package for Umlet 13.1 2014-11-30 12:56:08 +01:00
Corey O'Connor
b2f3e10a35 Add primus and extend bumblebee to support 32bit/64bit multilib architectures. 
Using primusrun will work as expected in a multilib environment. Even if the initial program
executes a antoehr program of the another architecture. Assuming the program does not modify
LD_LIBRARY_PATH inappropriately.

This does not update virtualgl for seemless multilib. I was unable to get a mixed 64/32 bit
environment to work with VirtualGL. The mechanism VirtualGL uses to inject the fake GL library would
fail if both 32bit and 64 bit libraries were in the environment. Instead the bumblebee package
creates a optirun32 executable that can be used to run a 32bit executable with optimus on a 64 bit
host. This is not created if the host is 32bit.

For my usage, gaming under wine, the primusrun executable works as expected regardless of
32bit/64bit.
 2014-11-29 16:42:00 -08:00
Jaka Hudoklin
31ebe4d89d Merge pull request #5181 from grwlf/plowshare 
plowshare: version bump
 2014-11-29 21:57:05 +01:00
Sergey Mironov
2e95f697fb plowshare: version bump 
fixes games/adom downloader
 2014-11-29 23:39:33 +03:00
Jaka Hudoklin
88d4ae98ae Merge pull request #5168 from pmahoney/skarnet-refactor 
Skarnet refactor
 2014-11-29 02:48:06 +01:00
Ricardo M. Correia
d4b4bae307 Update my maintainership 2014-11-29 02:15:39 +01:00
Patrick Mahoney
cf5f282940 Consolidate conf-compile steps for skarnet.org pkgs. 2014-11-28 13:10:37 -06:00
Vladimír Čunát
cbd2305d4d Merge branch 'master' into staging 2014-11-28 18:59:07 +01:00
Vladimír Čunát
06c6d4696d *: fix builds by disregarding warning from new glibc 
Also, in case of collectd, the -lgcc_s shouldn't be needed anymore,
as the library is in ${glibc}/lib/ now, which is practically always on RPATH.

In case of seyren it was some stdenv change uncovering the mistake of
putting src into buildInputs.
 2014-11-28 18:42:03 +01:00
Pascal Wittmann
4261ab39a8 nzbget: update from 14.0 to 14.1 2014-11-28 11:08:12 +01:00
cillianderoiste
d2a1867a20 Merge pull request #5157 from magnetophon/sselp 
sselp prints X selection to standard out
 2014-11-28 09:33:44 +00:00
Mateusz Kowalczyk
456312a5fc youtube-dl: update to 2014.11.27 2014-11-28 02:31:01 +00:00
Michael Raskin
0fc32b90d8 Add qrcode minimalistic QR-code decode/encode tool (for pure codes only) 2014-11-28 00:12:26 +03:00
Michael Raskin
9ef9544189 Adding quirc QR code decoder 2014-11-28 00:12:26 +03:00
Bart Brouns
647617885d added platforms and maintainers 2014-11-27 21:30:36 +01:00
Bart Brouns
b7f51920ee sselp prints X selection to standard out 2014-11-27 21:06:24 +01:00
Wout Mertens
cacf3f6c1e Merge branch 'curl-ssl-cert-file' of https://github.com/the-kenny/nixpkgs into staging 
Standardize NixOS on using only SSL_CERT_FILE for the trusted SSL certificate store.
 2014-11-27 13:29:50 +01:00
Oliver Charles
1132484200 opentsdb: Use fetchurl to fetch all dependencies 2014-11-27 12:06:01 +00:00
Domen Kožar
34ca304f58 network-manager: 0.9.8.8 -> 0.9.8.10 2014-11-27 12:10:20 +01:00
Domen Kožar
91bdca38a0 NetworkManager.service -> network-manager.service 2014-11-27 12:10:20 +01:00
Vladimír Čunát
abcb355453 restund, openssh_hpn: mark as broken 2014-11-27 01:19:24 +01:00
William A. Kennington III
021efdf021 yubico-piv-tool: 0.1.0 -> 0.1.2 2014-11-26 15:50:15 -08:00
William A. Kennington III
e1988740a5 yubikey-personalization: 1.16.0 -> 1.16.1 2014-11-26 15:47:43 -08:00
William A. Kennington III
17a1b67cb6 btrfsprogs: 3.17.1 -> 3.17.2 2014-11-26 15:47:43 -08:00
Vladimír Čunát
bdc323c540 opentsdb: mark as broken 
It tries to download things and fails. CC @ocharles.
 2014-11-27 00:45:47 +01:00
Vladimír Čunát
a68c1adc35 *: fix builds by disregarding warning from new glibc 
Says: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
CC: #4803. There will likely appear more of these errors on Hydra in time.
 2014-11-26 23:40:03 +01:00
muflax
dc9f084278 parcellite: 1.1.7 -> 1.1.9 2014-11-26 21:23:17 +00:00
Vladimír Čunát
b5ff06eda4 Merge branch 'master' into staging 2014-11-26 21:48:26 +01:00
Domen Kožar
f45b6fb078 fix tarball job 2014-11-26 21:04:59 +01:00
Edward Tjörnhammar
49e112c309 i2pd: 0.3.0 -> 0.4.0 2014-11-25 21:15:53 +01:00
Austin Seipp
57ec90f90f nixpkgs: Fuzzing test case optimizer 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-11-25 13:03:43 -06:00
Austin Seipp
b0dc5b17ca nixpkgs: American Fuzzy Lop 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-11-25 12:43:03 -06:00
Pascal Wittmann
10c9196c0f parallel: update from 20141022 to 20141122 2014-11-25 18:18:05 +01:00
Pascal Wittmann
880f6a517e bmon: update from 3.5 to 3.6 2014-11-25 18:18:05 +01:00
Igor Pashev
4f9111e91f strongSwan needs python for building (Closes #4940) 2014-11-25 15:29:05 +01:00
Shea Levy
140e1de0ec strongswan: dont patchelf 
fixes #5045 ('fixes')
 2014-11-24 20:50:26 -05:00
Vladimír Čunát
a9bad25ffe Merge branch 'master' into staging 2014-11-24 22:14:25 +01:00
Oliver Charles
9cab0e1b8a Add meta information to hbase, bosun, scollector, opentsdb 2014-11-24 14:40:48 +00:00
Oliver Charles
751a2943f4 opentsdb: Upgrade to 2.1.0-RC1 2014-11-24 14:40:47 +00:00
Oliver Charles
764cca613d opentsdb: New package and NixOS module 2014-11-24 14:40:47 +00:00
Edward Tjörnhammar
4c1d65130f Merge pull request #5066 from vbgl/kst 
Adds Kst
 2014-11-24 15:23:27 +01:00
Arseniy Seroka
fd5566da41 Merge pull request #5080 from joachifm/dnscrypt-refactor 
dnscrypt-proxy: minor superficial improvements
 2014-11-24 15:48:47 +03:00
Domen Kožar
d8e89ebd4b xmlroff: 0.3.98 -> 0.6.2 2014-11-24 08:43:43 +01:00
Bjørn Forsman
bad831d6fe rdiff-backup: unbreak 'rdiff-backup-statistics' 
By adding needed module to python sys.path. Fixes this:

  $ rdiff-backup-statistics backup-dir
  Traceback (most recent call last):
    File "/home/bfo/.nix-profile/bin/rdiff-backup-statistics", line 24, in
  <module>
      from rdiff_backup import connection, regress, rpath, Globals,
  restore, \
  ImportError: No module named rdiff_backup
 2014-11-23 21:58:46 +01:00
Bjørn Forsman
98344757b9 rdiff-backup: set meta.platforms 2014-11-23 21:35:24 +01:00
Shea Levy
3cc397b2a1 dar: bump 
cc @viric
 2014-11-23 12:56:49 -05:00
Michael Raskin
b67bf6e038 Behave in a sane way in ZXing wrapper when user gives --help argument 2014-11-23 16:27:28 +03:00
Tobias Geerinckx-Rice
d72f6c85e4 Add eid-viewer: Java reader for Belgian eID identity cards 2014-11-23 00:42:52 +01:00
Michael Raskin
e511865580 Add a binary distribution of ZXing 1D/2D code library 2014-11-23 02:35:15 +03:00
Domen Kožar
10592215a7 Merge pull request #5076 from ehmry/cjdns 
cjdns: update 20141023 -> 20141121
 2014-11-22 22:53:35 +01:00
Joachim Fasting
119d93e223 dnscrypt-proxy: minor superficial improvements 
- Use upstream description and explicitly set platforms = all
- Coding conventions fix
 2014-11-22 16:19:06 +01:00
vbgl
a4a235c0d0 Merge pull request #5082 from robberer/pkgs/clamav 
clamav: bump 0.98.4 to 0.98.5
 2014-11-22 10:35:21 +00:00
Longrin Wischnewski
a8bce0cf73 clamav: bump 0.98.4 to 0.98.5 2014-11-22 09:50:41 +01:00
Thomas Tuegel
c2740b5017 network-manager: patch for libnl-3.2.25 2014-11-21 21:15:18 -06:00
Emery Hemingway
9f1bd2d419 cjdns: update 20141023 -> 20141121 
include protocol version in package version string
 2014-11-21 18:04:53 -05:00
Shea Levy
97f35cf29a nixUnstable: bump 
Bug fixed in b0c5c2a was giving me segfaults...
 2014-11-21 08:36:02 -05:00
Vincent Laporte
d1d22919aa Adds Kst-2.0.8 
Kst is a real-time large-dataset viewing and plotting tool that has
built-in data analysis functionality.

Homepage: https://kst-plot.kde.org/
 2014-11-21 11:54:59 +00:00
Edward Tjörnhammar
2151abb92d i2pd: 0.2.0 -> 0.3.0 2014-11-21 11:53:04 +01:00
vbgl
3e8fd1b30b Merge pull request #5014 from doublec/tor 
Update Tor to 0.2.5.10.
 2014-11-21 07:33:53 +00:00
Emery Hemingway
c1f458eb85 initial liquidsoap package expression 2014-11-20 17:34:14 -05:00
Thomas Tuegel
dfaa39db41 polkit-qt-1: Qt 5 support 
polkit-qt-1 is upgraded to the latest version, which supports Qt 5. The
attributes are also renamed to differentiate the Qt 4 and Qt 5
branches. The prior naming scheme differentiated between polkit-qt-1 and
polkit-qt, but we no longer package the latter.
 2014-11-20 11:10:39 -06:00
Mateusz Kowalczyk
8570046e5c rlwrap: update from 0.41 to 0.42 2014-11-20 13:28:43 +00:00
Eelco Dolstra
87419c016f openssh: Update to 6.7p1 2014-11-20 12:12:33 +01:00
Moritz Ulrich
f4ab3dc223 libcurl: Honor $SSL_CERT_FILE 2014-11-19 23:50:48 +01:00
Mateusz Kowalczyk
03655c332a Add meta.branch to a bunch of packages 
Gives better results in the monitor
 2014-11-19 18:54:58 +00:00
Domen Kožar
8236ca5d70 properly package pyopenssl 2014-11-19 19:41:44 +01:00
Mateusz Kowalczyk
5b156eb20a Merge pull request #5019 from Fuuzetsu/updates 
Updates (orphans)
 2014-11-19 18:31:45 +00:00
Eelco Dolstra
8be7b23cb3 nixUnstable: Update to 1.8pre3899_8299aaf 2014-11-19 18:26:07 +01:00
Benno Fünfstück
aa9c9aecbe xvkbd: set meta.platforms 2014-11-19 12:40:32 +01:00
Pascal Wittmann
7862ef25a9 groff: update from 1.22.2 to 1.22.3 an adopt it 2014-11-19 08:47:41 +01:00
Pascal Wittmann
6e3318e233 nzbget: update from 0.13 to 0.14 and adopt it 2014-11-19 08:47:41 +01:00
Shea Levy
25b4674e67 gnupg-2.1: Add socket activation patch 2014-11-18 16:58:14 -05:00
Robert Helgesson
c6d4881a42 Add package 'xml2'. 2014-11-18 22:01:53 +01:00
Moritz Ulrich
48032400ca httrack: update from 3.48.19 to 3.48.20 2014-11-18 21:20:53 +01:00
Arseniy Seroka
0bb6efa314 Merge pull request #5023 from doublec/torbrowser 
Update Tor Browser to 4.0.1
 2014-11-18 18:11:47 +03:00
Pascal Wittmann
dfc3140b3d Merge pull request #5031 from AndersonTorres/youtubeDL 
Youtube-DL: update to 2014.11.16
 2014-11-18 14:47:21 +01:00
AndersonTorres
a24225da61 Youtube-DL: update to 2014.11.16 2014-11-18 11:31:55 -02:00
wmertens
53488aa023 Merge pull request #5026 from robberer/pkgs/hdf5 
hdf5: move to a more stable URL
 2014-11-18 14:07:13 +01:00
Chris Double
32d09e2699 Update Tor Browser to 4.0.1 
Updates Tor Browser to 4.0.1. This requires the gcc 4.9 runtime.

Add myself to the maintainers.
 2014-11-18 23:46:42 +13:00
Longrin Wischnewski
73aef348bb hdf5: move to a more stable URL 2014-11-18 11:14:17 +01:00
Mateusz Kowalczyk
f4c350d26e dropbear: update from 2013.62 to 2014.66 2014-11-17 18:09:30 +00:00
Chris Double
75425ff879 Update Tor to 0.2.5.10. 
Updates Tor to latest stable version.

Add myself to the maintainer list.
 2014-11-18 01:47:42 +13:00
vbgl
2a6f4eb86f Merge pull request #5011 from 4z3/urlwatch-1.17 
urlwatch: update to version 1.17
 2014-11-17 07:11:43 +00:00
Shea Levy
8b9b0d95a0 nixUnstable: bump 2014-11-17 00:59:31 -05:00
tv
a9a10ac2ed urlwatch: update to version 1.17 2014-11-17 04:18:09 +01:00
Eelco Dolstra
a0f3faf34e Merge remote-tracking branch 'origin/glibc-2.20' into staging 2014-11-16 22:17:36 +01:00
Aristid Breitkreuz
7bb0ff509c remove gcc 3.3 and snx ("SSL Network Extender"), the only package that depends on it 2014-11-16 14:57:42 +01:00
Michael Raskin
ef9a3161d7 Fix obsolete gs option usage by asymptote 2014-11-16 13:28:16 +03:00
Pascal Wittmann
11aa16d2a6 Merge pull request #5000 from ikervagyok/hdf 
updated hdf5 to version HDF5-1.8.14
 2014-11-16 10:11:09 +01:00
Lengyel Balázs
79fc5bde48 updated hdf5 to version HDF5-1.8.14 2014-11-16 09:27:32 +01:00
Michael Raskin
cee91fe789 Update lftp 2014-11-16 10:54:02 +03:00
Michael Raskin
b3b9ec4c89 Add a fallback URL for lftp 2014-11-16 10:54:02 +03:00
Michael Raskin
1a69d88174 Update pdftk and fix its build 2014-11-16 02:16:42 +04:00
Aristid Breitkreuz
05d4db4c71 fix openobex build 2014-11-15 22:32:47 +01:00
Benno Fünfstück
a1bca683f4 xvkbd: new expression 2014-11-15 21:37:34 +01:00
Evgeny Egorochkin
7e2f54ae44 youtube-dl: update from 2014.11.12 to 2014.11.13.3 2014-11-15 22:20:16 +02:00
Michael Raskin
17140ebba8 Fix tex4ht build: our new stdenv lacks CC (why, by the way?) so default to gcc if CC empty 2014-11-16 00:12:29 +04:00
Thomas Hunger
41d89224c9 Update fail2ban to 0.9.1. 
Version 0.9 is no longer available for downloat at github.
 2014-11-15 16:54:40 +00:00
Pascal Wittmann
58ad907b49 abduco: update from 0.1 to 0.2 2014-11-15 16:21:56 +01:00
Pascal Wittmann
dd37edd2d8 dvtm: update from 0.12 to 0.13 2014-11-15 16:21:56 +01:00
Pascal Wittmann
2c19d082fb opkg: update from 0.2.3 to 0.2.4 2014-11-15 12:19:54 +01:00
Domen Kožar
62dd6c1d72 pastebinit: fix build 2014-11-15 10:57:51 +01:00
William A. Kennington III
596a46caf7 btrfs-progs: 3.17 -> 3.17.1 2014-11-14 22:46:59 -08:00
William A. Kennington III
cd9619f871 dhcp: 4.3.0 -> 4.3.1 2014-11-14 22:44:13 -08:00
William A. Kennington III
6fbb5711f5 pcsclite: 1.8.12 -> 1.8.13 2014-11-14 22:22:12 -08:00
William A. Kennington III
f4249e7f5a ceph: 0.87 -> 0.88 2014-11-14 21:59:32 -08:00
Petr Rockai
c5b5020681 ConTeXt: Update to a current version & include it in texLiveFull. 2014-11-14 22:49:06 +01:00
Shea Levy
4fe383de48 strongswan: bump 2014-11-14 15:22:22 -05:00
Pascal Wittmann
de8df3ce47 rxp: update from 1.2.3 to 1.5.0 2014-11-14 19:20:16 +01:00
Eelco Dolstra
ca441636f1 Merge branch 'staging' 2014-11-14 16:00:23 +01:00
Eelco Dolstra
03d828a976 nixUnstable: Update to 1.8pre3890_8cfe939 2014-11-14 16:00:00 +01:00