Commit Graph

34768 Commits

Author SHA1 Message Date
Franz Pletz 5f3c62698b
libav_0_8: 0.8.19 -> 0.8.20 for multiple CVEs
Fixes:

  * CVE-2016-9819
  * CVE-2016-9820
  * CVE-2016-9821
  * CVE-2016-9822
2017-01-25 20:53:32 -05:00
John Wiegley 1294909c2a
lens-family-th_0_4_1_0: Add to hackage-packages.nix for GHC 7.10 2017-01-25 16:56:51 -08:00
Tim Steinbach 4908138122
ammonite-repl: 0.8.1 -> 0.8.2 2017-01-25 17:24:13 -05:00
Jörg Thalheim 7c8c0bbbc2 Merge pull request #22145 from sternenseemann/valadoc
valadoc: 2016-10-09 -> 2016-11-11
2017-01-25 23:03:32 +01:00
sternenseemann 5f3db56048 valadoc: 2016-10-09 -> 2016-11-11 2017-01-25 21:28:45 +01:00
Robin Gloster 5dacc53af3
spidermonkey_24: remove 2017-01-25 20:12:42 +01:00
Robin Gloster d31b3a9e6d
freeimage: fix build with gcc6 2017-01-25 20:12:40 +01:00
Robin Gloster 8cae089f19
dirac: fix build with gcc6 2017-01-25 20:12:40 +01:00
Robin Gloster d3cd8b1d58
spidermonkey_1_8_5: add patch to fix build with gcc6 2017-01-25 20:12:39 +01:00
Robin Gloster b8340929d0
libtasn1: 4.9 -> 4.10 2017-01-25 20:12:38 +01:00
Robin Gloster 4e5f484016
libe-book: fix build with gcc6 2017-01-25 20:12:38 +01:00
Robin Gloster 0437bc9663
podofo: 0.9.3 -> 0.9.4, pin to gcc5 2017-01-25 20:12:37 +01:00
Robin Gloster 90fc5042ad
wxGTK30: fix build with gcc 6 2017-01-25 20:12:37 +01:00
Robin Gloster 0f3cee15b5
wxGTK: build with gcc 6 2017-01-25 20:12:37 +01:00
Robin Gloster 3098c3fd00
smpeg: build with gcc 6 2017-01-25 20:12:36 +01:00
Robin Gloster 9aae2991f2
qt4: add patch to fix build with gcc6, set c++ std 2017-01-25 20:12:36 +01:00
Robin Gloster a3a0e8fe64
protobuf3_0: fix build with gcc 6 2017-01-25 20:12:36 +01:00
Robin Gloster b80291ab98
protobuf3_0: 3.0.0 -> 3.0.2 2017-01-25 20:12:35 +01:00
Robin Gloster b13e77fc33
geos: 3.5.0 -> 3.6.1 2017-01-25 20:12:35 +01:00
Robin Gloster 3756edb109
ragel: fix build with gcc 6 2017-01-25 20:12:35 +01:00
Eelco Dolstra 48dce4ad7b
libraw: 0.17.1 -> 0.17.2
Also apply a fix from Debian for building with GCC 6.
2017-01-25 20:12:35 +01:00
Eelco Dolstra a2900f3f0f
libfaketime: Fix build on gcc 6
http://hydra.nixos.org/build/43031670
2017-01-25 20:12:34 +01:00
Eelco Dolstra d01d2db3d8
audiofile: Fix build on GCC 6
http://hydra.nixos.org/build/42228674
2017-01-25 20:12:33 +01:00
Eelco Dolstra 17a344a5da
binutils: Add lib output
Some packages depend on libbfd. This prevents them from having all of
binutils in their closure (which is 29 MiB).
2017-01-25 20:12:33 +01:00
Thomas Pham 8fa49a6351 postgis: 2.2.1 -> 2.3.1 2017-01-25 19:31:30 +01:00
Robin Gloster cb30150bd5
php: fix build in case mysql is not mariadb
fixes #20986
2017-01-25 18:11:38 +01:00
Sander van der Burg 0f6eab52e1 xcodeenv: make it work with Xcode 8.2.1 2017-01-25 16:56:55 +01:00
aszlig ca7923f111
nss: Provide a more stable URL for pkgconfig patch
Since 2bf0f84f1f, the patch isn't in our
repository anymore but being fetched from its origin.

However, the origin URL is always pointing to the latest master version
of Gentoo. This has the downside that whenever Gentoo changes the patch,
our build of NSS will be broken.

Also, I'm providing a comment here indicating what the patch does.

As to the reason *why* the patch is there, I vaguely remeber seeing a
few libraries/applications that depend on NSS relying that there's a
pkgconfig file.

After checking a few distros, they all seem to have it:

https://anonscm.debian.org/cgit/pkg-mozilla/nss.git/tree/debian?id=5306c4192d6bc0a2685842e9fd533196e7302297
https://apps.fedoraproject.org/packages/nss-devel/
https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/nss&id=3f7f54b357e23b7ac1cec849693334ad29be07d2

The issue is already reported upstream but hasn't been fixed yet:

https://bugzilla.mozilla.org/show_bug.cgi?id=530672

Tested by building nss on x86_64-linux (the hash didn't change anyway,
but just to be sure).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-01-25 16:25:00 +01:00
Vincent Laporte 42bf99ef44 coqPackages.{ssreflect,mathcomp}: fix build with Coq-8.6
by adding `findlib` as a build input.

Also clean `default.nix` a little bit.
2017-01-25 13:06:11 +00:00
Vladimír Čunát e5229c63ad
t1lib: add a note about CVE fixes 2017-01-25 13:53:55 +01:00
Michael Raskin 05d7ece4b6 Merge pull request #22040 from NeQuissimus/zulu
zulu: init at 8.19.0.1
2017-01-25 12:31:29 +00:00
Tim Cuthbertson a59c3038cd gup: 0.5.5 -> 0.6.0 and derivation update 2017-01-25 22:25:31 +11:00
Domen Kožar f87deb0b3a Merge pull request #22101 from zimbatm/no-md5
Bye bye MD5
2017-01-25 09:07:48 +01:00
Vincent Laporte 453a3838f9 ocamlPackages.mtime: init at 0.8.3
Mtime is an OCaml module to access monotonic wall-clock time.

Homepage: http://erratique.ch/software/mtime
2017-01-25 06:55:59 +00:00
Vincent Laporte c57715570a freealut: fix build on Darwin 2017-01-25 06:54:07 +00:00
Frederik Rietdijk cad9bdc78d Merge pull request #22025 from lsix/update_django_guardian
Update django guardian
2017-01-25 07:48:53 +01:00
Bas van Dijk a96b6e64fb ghc-8.0.2: remove unused fetchFilteredPatch function 2017-01-24 23:34:40 +01:00
Peter Simons e832d380de haskell-brick: fix reference to vty 2017-01-24 23:14:02 +01:00
Peter Simons 2bbf68eafb structured-haskell-mode: drop obsolete version override 2017-01-24 23:14:02 +01:00
William Casarin 663afff780 haskellPackages.HsOpenSSL: remove jailbreak
issue has been closed and it seems to work
2017-01-24 23:14:02 +01:00
William Casarin dc3182a15c haskellPackages.store: enable check
looks like it works again
2017-01-24 23:14:02 +01:00
William Casarin 0cb43b920e haskellPackages.git-annex: remove overrides
they don't seem to be needed anymore
2017-01-24 23:14:02 +01:00
William Casarin 4e536a9f61 haskellPackages.elm-export: remove jailbreak
fixed here:

257962f512
2017-01-24 23:14:02 +01:00
William Casarin a8aee189e8 haskellPackages.barrier: remove jailbreak
fixed here:

1d61f4db12
2017-01-24 23:14:02 +01:00
William Casarin 8ea8493889 haskellPackages.ReadArgs: remove jailbreak
fixed here:

90d6122d74
2017-01-24 23:14:02 +01:00
Peter Simons d350650577 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.4-8-g0d49e12 from Hackage revision
e2cd120f15.
2017-01-24 23:14:02 +01:00
Nathan Zadoks 15b6374918 spidermonkey_17: add AArch64 support patch 2017-01-25 00:01:54 +02:00
Nathan Zadoks 2a82be9af1 libunwind: add AArch64 support patch 2017-01-25 00:01:53 +02:00
Nathan Zadoks 46991f88f7 gnu-efi: fix discarded const qualifier on aarch64 2017-01-25 00:01:53 +02:00
Tuomas Tynkkynen ed74fcf14b libsigsegv: Add Aarch64 patch 2017-01-25 00:01:52 +02:00
Tuomas Tynkkynen 6e46dbf8e7 gnu-config: init at 2016-12-31 2017-01-25 00:01:51 +02:00
Peter Simons 7673d5932d Merge pull request #22104 from aherrmann/pr_diagrams
diagrams: Fix the 1.4.* versions of the ecosystem
2017-01-24 22:40:14 +01:00
Michael Raskin 54e97b8ec6 Merge pull request #22114 from vbgl/ocaml-4.04
OCaml 4.04
2017-01-24 21:38:19 +00:00
Michael Raskin c915fd68cf Merge pull request #22106 from romildo/new.drake
drake: init at 0.9.2.0.3.1
2017-01-24 21:33:20 +00:00
Vincent Laporte 5bcf3c5e25 ocamlPackages.spacetime_lib: init at 0.1.0 2017-01-24 21:20:08 +00:00
Vincent Laporte 88e620f587 ocamlPackages.js_of_ocaml: add ocamlbuild as a dependency 2017-01-24 21:14:46 +00:00
Lancelot SIX 86a26322e8
pythonPackages.pytest_30: 3.0.5 -> 3.0.6 2017-01-24 22:13:40 +01:00
Lancelot SIX 18b2c31eaa
pythonPackages.pytest_*: move to pkgs/development/python-modules 2017-01-24 22:13:29 +01:00
Lancelot SIX b6e5976d4b
pythonPackages.django_guardian: 1.4.4 -> 1.4.6 2017-01-24 22:13:20 +01:00
Lancelot SIX 93d0e4ab5b
pythonPackages.pytestdjango: 2.9.1 -> 3.1.2 2017-01-24 22:13:07 +01:00
Vincent Laporte 92f9c0600d ocamlPackages.ocsigen-deriving: 0.7 -> 0.7.1 2017-01-24 21:13:00 +00:00
Vincent Laporte 82ab1f8408 ocaml: fix the meta.branch attribute 2017-01-24 21:13:00 +00:00
Vincent Laporte 0caeaf4cdd ocamlPackages.ppx_tools: minor refactoring 2017-01-24 21:13:00 +00:00
Vincent Laporte f697e5ae3b camlp4: init at 4.04+1 2017-01-24 21:13:00 +00:00
Vincent Laporte ae047510bf ocaml: init at 4.04 2017-01-24 21:13:00 +00:00
Tuomas Tynkkynen 41fd1ed903 glibc: Check that 'cross.float' is defined
Because if we define it, then gcc compilation fails because it doesn't
support --with-float for aarch64.
2017-01-24 22:13:47 +02:00
John Ericson 5ad696b067 Merge pull request #22107 from Ericson2314/cross-tepid
Somewhat saner cross-compiling through bootstrapping
2017-01-24 15:09:56 -05:00
romildo a0d29cf33e drake: init at 0.9.2.0.3.1 2017-01-24 16:36:22 -02:00
Michael Raskin 62b0495614 Merge pull request #22084 from LumiGuide/opencv-3.2.0
opencv: upgrade from 3.1.0 to 3.2.0
2017-01-24 18:05:05 +00:00
Michael Raskin 1a8d12e922 Merge pull request #22069 from kamilchm/vagrant
vagrant: FIX #21365 add libxml2 and libxslt paths
2017-01-24 17:57:37 +00:00
Michael Raskin 89278345c2 Merge pull request #22023 from vbgl/apron
ocamlPackages.apron: init at 20160125
2017-01-24 17:47:13 +00:00
Andreas Herrmann 1a534e0aab diagrams: Fix the 1.4.* versions of the ecosystem
The affected packages now depend on:

   diagrams-core ==1.4.*
   diagrams-lib ==1.4.*
   optparse-applicative ==0.13.*
2017-01-24 18:36:14 +01:00
zimbatm c0d60b9dbe hunspellDict.it-it: use sha256 hash 2017-01-24 16:56:25 +00:00
zimbatm cf4f91f1a2 hunspellDicts: remove spanish dictionaries
Unfortunately the upstream has gone and I didn't find any replacement
sources.
2017-01-24 16:55:35 +00:00
zimbatm 414b1d2128 metaBuildEnv: use sha256 hash 2017-01-24 16:48:43 +00:00
zimbatm 883eb32e64 gtkmozembedsharp: remove package
The package has:

* broken source URL
* uses md5 hash
* no maintainer
* is a library with nobody depending on it
2017-01-24 16:47:13 +00:00
zimbatm 9120a99807 cilaterm: remove package
The package is broken since September, doesn't have a maintainer and
uses md5 for hashing
2017-01-24 16:45:41 +00:00
zimbatm 29be6e1685 jikes: use sha256 hash 2017-01-24 16:42:44 +00:00
zimbatm 0f35029959 aspectj: use sha256 hash 2017-01-24 16:41:21 +00:00
John Ericson a1a798f017 top-level: `crossSystem` is no longer exposed to packages. Use `*Platform`. 2017-01-24 11:37:56 -05:00
John Ericson 94df8e7e4d openssl: Output-santizing hack properly uses native perl again 2017-01-24 11:37:56 -05:00
zimbatm c3e4c2f179 jjtraveler: remove package
The package is a java library that no other project is using and which
upstream source doesn't work.

See http://www.program-transformation.org/Tools/JJTraveler
2017-01-24 16:34:36 +00:00
zimbatm 31d1a52b0c lucene: 1.4.1 -> 1.4.3 2017-01-24 16:31:39 +00:00
zimbatm 4b284a2bb6 mockobjects: use sha256 hash 2017-01-24 16:28:20 +00:00
zimbatm 7ef36fface jclasslib: use sha256 hash 2017-01-24 16:27:20 +00:00
zimbatm 1005d786ba libjpeg62: remove
This package has broken upstream url and was only used by warsow
2017-01-24 16:22:25 +00:00
zimbatm a17311a33e antlr3: point to version 3.4
This was pointing to a broken upstream URL and is a beta release. No
dependent in the nixpkgs tree.
2017-01-24 16:15:21 +00:00
zimbatm 4958485bc3 ocamlPackages.ocaml_optcomp: update hash to sha256 2017-01-24 16:01:04 +00:00
Vladimír Čunát 30a94deac5
nss: remove parameter that just got unused 2017-01-24 15:56:36 +01:00
Vladimír Čunát f8e39ec13c
nss: fetchpatch -> fetchurl
This isn't a dynamically generated patch, so it's not required,
and the hash was for unmodified patch anyway.
2017-01-24 15:43:53 +01:00
Eelco Dolstra c2bd9cad11
sqlite: 3.15.2 -> 3.16.2 2017-01-24 14:54:19 +01:00
Eelco Dolstra 2bf0f84f1f
nss: 3.27.2 -> 3.28.1 2017-01-24 14:49:46 +01:00
Bas van Dijk 52d44b76c1 opencv: upgrade from 3.1.0 to 3.2.0 2017-01-24 14:24:05 +01:00
Sander van der Burg de9a4f5fb4 titaniumenv: add 6.0 SDK + bump kitchensink testcase 2017-01-24 13:22:16 +01:00
Robert Hensing de8148d74c haskellPackages.doctest-discover: fix 2017-01-24 11:57:09 +01:00
Frederik Rietdijk e33bc13349 Merge pull request #22086 from timbertson/pip-stderr
buildPythonPackage: send pip output to stderr
2017-01-24 11:20:53 +01:00
Tim Cuthbertson 7af2d3d6e2 buildPythonPackage: send pip output to stderr 2017-01-24 21:08:42 +11:00
Sander van der Burg 4f7fe27065 titaniumenv: use Node.js 4.x for the CLI tools 2017-01-24 10:55:29 +01:00
Jörg Thalheim 4785a19444 Merge pull request #22073 from romildo/upd.pcmanfm
{lib,pcman}fm: 1.2.4 -> 1.2.5
2017-01-24 10:48:56 +01:00
Graham Christensen 5c84eaaec3 Merge pull request #21344 from mdaiter/gWrap
gwrap: remove unnecessary checks
2017-01-23 19:56:40 -05:00
Shea Levy 46bec22f66 Revert "Add function to build a ghc standalone archive (OSX/iOS only)"
Partial revert of accidental changes.

This reverts commit 4f9f00fcc9.
2017-01-23 18:37:15 -05:00
Shea Levy 4f9f00fcc9 Add function to build a ghc standalone archive (OSX/iOS only) 2017-01-23 18:35:03 -05:00
Daiderd Jordan e026568e6c Merge pull request #22027 from LnL7/darwin-go
go: fix tests on darwin
2017-01-24 00:27:45 +01:00
Bas van Dijk f2afe922f4 opencv-3.1: make ippicv download URL consistent
with the URL defined in:

  https://github.com/opencv/opencv/blob/3.1.0/3rdparty/ippicv/downloader.cmake
2017-01-23 23:12:18 +01:00
Arseniy Seroka a9a5dad531 Merge pull request #22068 from bachp/gitlab-runner-1.10.0
gitlab-runner: 1.9.0 -> 1.10.0
2017-01-24 00:54:32 +03:00
Bas van Dijk 1853f174d1 opencv-3.1: get ippicv from the nix store
If ippicv can't be found in the directory:

  3rdparty/ippicv/downloads/${platform}-${md5}

it will be downloaded instead. Commit 7fedbe7 accidentally swapped the
md5 with the sha256 causing ippicv to be downloaded each time opencv
gets build. This patch fixes that.
2017-01-23 22:22:56 +01:00
Daiderd Jordan 02341c20bc
db: disable dbm support by default 2017-01-23 22:21:20 +01:00
romildo 32a3f71149 libfm: 1.2.4 -> 1.2.5 2017-01-23 19:01:33 -02:00
Kamil Chmielewski 29ac5d5209 vagrant: FIX #21365 add libxml2 and libxslt paths 2017-01-23 20:34:04 +01:00
Pascal Bach 55be1b30fc gitlab-runner: 1.9.0 -> 1.10.0 2017-01-23 20:32:17 +01:00
Daiderd Jordan 7ac3f53eed Merge pull request #22051 from sifmelcara/update/crystal
crystal: 0.20.4 -> 0.20.5
2017-01-23 19:12:13 +01:00
Shea Levy 2154108270 haskell-modules/generic-builder: Fix copy-paste error 2017-01-23 11:35:59 -05:00
Lancelot SIX 43753eafd2 pythonPackages.matplotlib: 1.5.3 -> 2.0.0 2017-01-23 16:48:58 +01:00
Peter Simons 24fed4d344 Merge pull request #22057 from shlevy/haskell-modules-cross-env
(haskellPackages.callPackage foo).env: Set the right env vars when cross-compiling
2017-01-23 14:30:58 +01:00
mingchuan 28f3b62efc crystal: 0.20.4 -> 0.20.5 2017-01-23 19:06:20 +08:00
Franz Pletz e10cd27269
Merge branch 'staging' 2017-01-23 11:06:41 +01:00
Peter Hoeg 025c571f1e wp-cli: add bash completion
Instead of creating 4 different tiny derivations, just stick everything into 1.
2017-01-23 12:50:55 +08:00
Tim Steinbach 32ae22b387
zulu: init at 8.19.0.1 2017-01-22 19:21:01 -05:00
Shea Levy 0ff6b6fc0f (haskellPackages.callPackage foo).env: Set the right env vars when cross-compiling 2017-01-22 17:05:19 -05:00
Vladimír Čunát df67f58fbf
gtk3: move gtk-update-icon-cache to the main output
This is basically what aa0fa19373 was for gtk2 and Xfce.
Fixes #20874, though I haven't tested it directly.
2017-01-22 22:57:52 +01:00
Alistair Bill 6a87904296 msgpack-tools: init at 0.6 2017-01-22 21:11:06 +00:00
Periklis Tsirakidis 01fef925fc rtags: 2.3 -> 2.8-p1 2017-01-22 17:46:26 +01:00
Franz Pletz 268e57bcc5
libvirt-glib: 0.2.3 -> 1.0.0 2017-01-22 13:01:03 +01:00
Franz Pletz a50ff980be
libvirt: 2.5.0 -> 3.0.0 2017-01-22 13:01:02 +01:00
Franz Pletz 152f1131c4
liboping: 1.8.0 -> 1.9.0 2017-01-22 13:01:02 +01:00
Franz Pletz 8a7407e881
libnftnl: 1.0.6 -> 1.0.7 2017-01-22 13:01:00 +01:00
Franz Pletz 57145c6251
libnetfilter_conntrack: 1.0.5 -> 1.0.6 2017-01-22 13:01:00 +01:00
Franz Pletz f3f5045432
libpcap: 1.7.4 -> 1.8.1 2017-01-22 13:00:59 +01:00
Franz Pletz 608c167f95
libmicrohttpd: 0.9.50 -> 0.9.52 2017-01-22 13:00:59 +01:00
Daiderd Jordan 99f8e2c9cb
go_1_6: disable x509 tests on darwin 2017-01-22 02:03:50 +01:00
Daiderd Jordan 79a7729338
go_bootstrap: fix tests on darwin 2017-01-22 01:41:37 +01:00
Charles Strahan d298a961f1 Merge pull request #21416 from cstrahan/mesos-1.1.0
mesos: 1.0.1 -> 1.1.0
2017-01-21 19:05:18 -05:00
Pascal Wittmann 487f2cfef8
groovy: 2.4.7 -> 2.4.8 2017-01-21 23:40:13 +01:00
Pascal Wittmann 57f1198bbc
udunits: 2.2.21 -> 2.2.23 2017-01-21 23:36:40 +01:00
Franz Pletz c796bfc0ba
libmd: clean up autoreconfHook usage 2017-01-21 20:42:41 +01:00
vbgl 664d1d6dc9 Merge pull request #21261 from vbgl/uutf-1.0.0
Eliom 6 and various OCaml package updates
2017-01-21 20:23:28 +01:00
Peter Simons f0314dea93 haskell-http-api-data: update overrides for latest version 2017-01-21 20:06:32 +01:00
Peter Simons 0d6d18c098 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.4-8-g0d49e12 from Hackage revision
6d0e8a7e4b.
2017-01-21 20:06:32 +01:00
Karn Kallio 4b1da9ba67 Postiats version 0.3.0
The attached patch updates the Postiats nixpkgs expression to the
latest released 0.3.0 version.

From c89bfabd847ebd62c8dd77cb7385ea4effa929be Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Sat, 21 Jan 2017 13:28:23 -0400
Subject: [PATCH] ats2 : update Postiats to the latest released 0.3.0 version.
2017-01-21 13:38:35 -05:00
Michael Raskin 4d337f1c86 Merge pull request #22019 from schneefux/pkg.discordpy
pythonPackages.discordpy: 0.16.0 -> 0.16.4
2017-01-21 18:24:07 +00:00
Michael Raskin 52103deef1 Merge pull request #22006 from womfoo/bump/facter-3.5.1
facter: 3.4.1 -> 3.5.1 and related deps
2017-01-21 18:14:08 +00:00
Peter Simons ad7a2b7ee8 Merge pull request #22010 from robbinch/pkg-tinc
haskellPackages.tinc: 20161102 -> 20161119
2017-01-21 18:45:09 +01:00
schneefux afb3d5c9cb
pythonPackages.discordpy: 0.16.0 -> 0.16.4 2017-01-21 18:10:10 +01:00
Franz Pletz 140d135ee2
libopus: add patch to fix CVE-2017-0381 2017-01-21 14:14:46 +01:00
Robbin C 8a89d89352 haskellPackages.tinc: 20161102 -> 20161119 2017-01-21 11:58:25 +08:00
Daiderd Jordan 78c68f23d0 Merge pull request #21815 from deepfire/irony-server
irony-server:  init at irony version
2017-01-21 01:55:22 +01:00
Kosyrev Serge 7ceca3dbbc irony-server: init at 'same-version-irony-of-chosen-elpa` 2017-01-21 03:43:20 +03:00
Sander van der Burg 5cf1a4d36a nodePackages: upgrade node2nix to version 1.1.1 and regenerate the package set 2017-01-20 22:05:44 +01:00
Carles Pagès fd400ced6b Rename page to cpages to match github
I also updated the mail.
2017-01-20 16:55:29 +01:00
Vladimír Čunát 6b6553c768
Merge branch 'staging'
It contains security updates.  I somehow forgot to push this yesterday.
2017-01-20 16:33:59 +01:00