mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 07:31:20 +00:00
Code Issues Wiki Activity
103821 commits 228 branches 124 tags 7.2 GiB
Commit graph

35909 commits

Author SHA1 Message Date
Dan Peebles 2ffda66f11 go1.8: patch test to work with recent tzdata 2017-03-15 15:17:11 -04:00
Dan Peebles e6a5ab85b4 go1.7: patch test to work with recent tzdata 2017-03-15 15:17:11 -04:00
Dan Peebles 08314598bb go1.6: patch test to work with recent tzdata 2017-03-15 15:17:11 -04:00
Dan Peebles 331f5a886d go1.4: patch test to work with recent tzdata 2017-03-15 15:17:11 -04:00
Vladimír Čunát e99bc64552
Merge branch 'master' into staging 
More larger rebuilds from master, unfortunately.
 2017-03-15 19:09:56 +01:00
Vladimír Čunát 9adcebb1a9
Merge #23917: fix firefox crashes 2017-03-15 17:01:32 +01:00
Kamil Chmielewski d16b08ac85 go2nix: 1.1.1 -> 1.2.0 2017-03-15 16:09:55 +01:00
Shea Levy d6c3e74425 buildGoModule: share the buildFlagsArray with the parallel subprocesses 2017-03-15 11:00:55 -04:00
Andrzej Trzaska 162845d5b1 Use gem 2.6.10 (#23902) 2017-03-15 14:55:45 +00:00
Ashley Gillman e7dca2c230 ITK build on darwin 2017-03-15 22:41:20 +10:00
Will Dietz 15ca6e149e souper: bump to latest--using LLVM 4 and custom KLEE. 
Add patch to fix the build when LLVM reports no system libs,
llvm-config's behavior changed in LLVM r291285.

Fixes #22920.
 2017-03-15 07:39:25 -05:00
David McFarland 1ea6860cc7 icu: fix crash in firefox 
Fixes #23857
 2017-03-15 08:49:56 -03:00
Will Dietz c766960150 lit: init at 0.5 2017-03-15 09:02:45 +01:00
Bjørn Forsman db937b9d60 qt57.full: add missing modules 
qtquickcontrols2, qtwebchannel, qtwebengine, qtwebkit.

Added in the same order as the modules are listed in default.nix (and
then reformatted the block).
 2017-03-14 22:27:20 +01:00
Bjørn Forsman 961c73a78c qt56.full: add missing modules 
qtquickcontrols2, qtwebkit.

Added in the same order as the modules are listed in default.nix (and
then reformatted the block).

(The qt55 expression already has all modules in *full.)
 2017-03-14 22:27:20 +01:00
Markus Schneider cbf87bc2b2 granite: 0.3.0 -> 0.4.0.1 2017-03-14 22:26:19 +01:00
ndowens e721905d0f google-gflags: 2.1.2 -> 2.2.0 
google-gflags: Changed homepage
 2017-03-14 16:04:27 -05:00
Jörg Thalheim 496120c19f
travis: 1.8.2 -> 1.8.8 2017-03-14 21:03:58 +01:00
Lancelot SIX 4f644cd004
gdal: 2.1.1 -> 2.1.3 2017-03-14 17:59:07 +01:00
Frederik Rietdijk a79c653d5d Merge pull request #23885 from FRidh/jupyter 
Jupyter
 2017-03-14 17:32:27 +01:00
Frederik Rietdijk 47f7817037 pythonPackages.typed-ast: 1.0.1 -> 1.0.2 2017-03-14 16:52:25 +01:00
Frederik Rietdijk d7378da028 pythonPackages.configparser: fix with namespace packages 2017-03-14 16:43:46 +01:00
Peter Simons e916236130 Merge pull request #23615 from ljli/ghcjs-dom-jsffi-fix 
haskell: ghcjs packages: fix ghcjs-dom-jsffi with newer Cabal
 2017-03-14 16:09:37 +01:00
Peter Simons 83df89aa63 Merge pull request #23611 from ljli/ghcjs-shims-update 
haskell: ghcjs shims: dc034a0 -> b970152
 2017-03-14 16:06:08 +01:00
Robin Gloster 770794cbfe
urt: remove 2017-03-14 14:41:28 +01:00
Frederik Rietdijk 33fa4ce2be Merge pull request #23701 from lsix/update_django-raster 
pythonPackages.django-raster: 0.3 -> 0.3.1
 2017-03-14 13:42:14 +01:00
Frederik Rietdijk bf86b48b0f Merge pull request #23813 from ndowens/geis 
geis: 2.2.16 -> 2.2.17
 2017-03-14 13:39:36 +01:00
Frederik Rietdijk 5f837b1b94 Merge pull request #23867 from ndowens/htmlcxx 
htmlcxx: 0.85 -> 0.86
 2017-03-14 13:38:30 +01:00
Frederik Rietdijk 8c99040a7a Merge pull request #23826 from ndowens/gtkspell 
gtkspell:3.0.8 -> 3.0.9
 2017-03-14 13:36:42 +01:00
Frederik Rietdijk 683dc8cb4f Merge pull request #23810 from ndowens/ffms2 
ffms: 2.21 -> 2.22
 2017-03-14 13:32:46 +01:00
Daiderd Jordan dcfff701dc Merge pull request #23835 from periklis/topic_qt57_submodules_darwin 
qt57.{qtdeclarative,qtscript,qttranslations}: fix darwin compat
 2017-03-14 12:36:22 +01:00
Frederik Rietdijk a312abedeb hypothesis: disabled for Python 3.3 2017-03-14 10:49:39 +01:00
ndowens d46fe334ca
ffmpegthumbnailer: 2.0.10 -> 2.2.0 2017-03-14 09:41:24 +01:00
Periklis Tsirakidis a6be98c9c1 qt57.{qtdeclarative,qtscript,qttranslations}: fix darwin compat 
Fixes duplicate linkings issue for Qt-Frameworks provided by qtbase
during configurePhase.
 2017-03-14 09:37:37 +01:00
Vincent Laporte 8498f979a1 ocaml-top: 1.1.2 -> 1.1.3 2017-03-14 07:57:59 +00:00
Peter Simons 1d5878166e Merge pull request #23880 from ElvishJerricco/callCabal2nix-dont-rebuild-cabalfile 
callCabal2nix: Don't rebuild unchanged cabal file
 2017-03-14 08:57:45 +01:00
Volth d4294265fd virt-viewer: 2.0 -> 5.0 2017-03-14 04:54:11 +00:00
Will Fancher 24b47526ce callCabal2nix: Don't rebuild unchanged cabal file 
It can be quite annoying that callCabal2nix will build a new derivation
if anything in the source has changed, even if the cabal file hasn't.
 2017-03-13 22:20:56 -04:00
Dan Peebles 25e75cd580 kube-aws: 0.8.1 -> 0.9.4 
Also, enable on Darwin
 2017-03-13 22:20:52 -04:00
ndowens 706bd194c7 iso-codes: 3.56 -> 3.74 2017-03-13 20:29:03 -05:00
Tim Steinbach bb26805051 Merge pull request #23874 from NeQuissimus/kotlin_1_1 
kotlin: 1.0.6 -> 1.1
 2017-03-13 20:04:28 -04:00
Tim Steinbach 89c91c6e32 Merge pull request #23873 from NeQuissimus/gradle_3_4_1 
gradle: 3.4.0 -> 3.4.1
 2017-03-13 20:04:05 -04:00
Tim Steinbach dd015a829f
kotlin: 1.0.6 -> 1.1 2017-03-13 20:03:39 -04:00
Tim Steinbach 56fea1a8c0
gradle: 3.4.0 -> 3.4.1 2017-03-13 20:00:58 -04:00
ndowens 64218d61fc hwloc: 1.11.2 -> 1.11.6 (#23870) 2017-03-14 00:44:28 +01:00
Vladimír Čunát bfed19cfaa
Merge #23860: llvmPackages_4: rc4 -> release 2017-03-14 00:02:53 +01:00
Tuomas Tynkkynen aba0b45b86 Merge remote-tracking branch 'upstream/master' into staging 
Conflicts:
      pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
 2017-03-14 00:49:22 +02:00
Lluís Batlle i Rossell 46c9eac980 guile: enable parallel building 
civodul today on irc said that 2.0.13 likely has the parallel building
issue fixed (case equal-or-over 8 cores). Let's try.
 2017-03-13 23:38:52 +01:00
Tim Steinbach 17978fe64c Merge pull request #23740 from ben-z/nodejs-7.7.2 
nodejs: 7.7.1 -> 7.7.2
 2017-03-13 18:14:32 -04:00
Tim Steinbach 2c1876ec6c Merge pull request #23844 from frontsideair/flow-41 
flow: 0.39.0 -> 0.41.0
 2017-03-13 18:12:16 -04:00
ndowens 4aee4cc8a5 htmlcxx: 0.85 -> 0.86 2017-03-13 17:11:03 -05:00
Tim Steinbach bc1f692e49 Merge pull request #23846 from mayflower/jenkins_2.49 
jenkins: 2.44 -> 2.49
 2017-03-13 18:09:19 -04:00
Tim Steinbach 6e0c3e1a6d Merge pull request #23862 from mimadrid/update/filezilla-3.25.0 
filezilla: 3.24.0 -> 3.25.0
 2017-03-13 17:58:34 -04:00
Jörg Thalheim 065c05e849 Merge pull request #23801 from zimbatm/pip-tools 
Pip tools
 2017-03-13 22:32:07 +01:00
zimbatm a3c03eb11f
pip-tools: init at 1.8.1rc3 2017-03-13 22:21:57 +01:00
mimadrid 7e9c815c23
libfilezilla: 0.9.0 -> 0.9.1 2017-03-13 22:17:08 +01:00
zimbatm 5e701625de
pythonPackages.first: init at 2.0.1 2017-03-13 22:08:45 +01:00
Vincent Laporte 369230cc76 ocamlPackages.cpuid: init at 0.1.0 
cpuid allows detection of CPU features from OCaml.

Homepage: https://github.com/pqwy/cpuid
 2017-03-13 20:58:51 +00:00
Will Dietz f54813d767 llvm4: rc4 -> release! 2017-03-13 14:54:39 -05:00
Michael Raskin 90f2b24fd7 Merge pull request #23850 from makefu/update/radare2 
radare2: 0.10.6 -> 1.3.0
 2017-03-13 19:32:41 +01:00
Vincent Laporte b2b8a412fb ocaml-llvm: 3.7.1 -> 3.9.1 2017-03-13 19:14:11 +01:00
makefu bc1011b330
radare2: 0.10.6 -> 1.3.0 2017-03-13 17:53:12 +01:00
Frederik Rietdijk 57e768f58e hypothesis: 3.6.0 -> 3.6.1 2017-03-13 16:37:25 +01:00
Frederik Rietdijk 6f90badeac pythonPackages.hypothesis: fix for python 3.3 2017-03-13 16:37:24 +01:00
Tristan Helmich 4efed1d0d4 jenkins: 2.44 -> 2.49 2017-03-13 15:43:06 +01:00
Fatih Altinok d23effdedf flow: 0.39.0 -> 0.41.0 2017-03-13 17:04:36 +03:00
Domen Kožar 609f2fefce Merge pull request #23836 from expipiplus1/jailbreak-strict-io 
Haskell Packages: jailbreak strict-io
 2017-03-13 13:27:37 +01:00
Joe Hermaszewski 0867ac9963 Haskell Packages: jailbreak strict-io 2017-03-13 11:27:08 +00:00
Robin Gloster dbbdccdd65
ispc: fix build 2017-03-13 12:07:48 +01:00
Robin Gloster 80bd50a6e4
ponyc: 0.10.0 -> 0.11.0 2017-03-13 11:43:24 +01:00
Robin Gloster c836651084
purePackages.octave: 0.7 -> 0.9 2017-03-13 11:03:52 +01:00
Michael Raskin a77380b34c Merge pull request #23780 from asppsa/pure-0.66 
pure: 0.64 -> 0.66
 2017-03-13 10:56:08 +01:00
Vladimír Čunát b264486cf1
gnutls: bugfix+security 3.5.9 -> 3.5.10 
http://gnutls.org/security.html#GNUTLS-SA-2017-3
 2017-03-13 10:28:53 +01:00
Robin Gloster 89747d357b
msilbc: fix build 2017-03-13 09:33:15 +01:00
Michael Raskin 7dc3edaa6a slimerjs: 0.10.2 -> 0.10.3 2017-03-13 08:23:52 +01:00
ndowens afeb989c5c gtkspell:3.0.8 -> 3.0.9 2017-03-12 20:38:46 -05:00
ndowens b64c6b46b1 gssdp: 0.14.11 -> 1.0.1 2017-03-12 19:41:00 -05:00
ndowens 86a23bcfff gmm: 4.3 -> 5.1 
gmm: Remove whitespace
 2017-03-12 18:51:15 -05:00
Michael Raskin 54b7c3b63f clisp-git: update to the upstream fix of 32-bit builds 
The current exact tip fails to build on x86_64, there probably is a
fresher safe commit, but I haven't try bisecting.
 2017-03-13 00:00:13 +01:00
ndowens a2d50e744a gloox: 1.0.14 -> 1.0.20 2017-03-12 17:56:33 -05:00
Jörg Thalheim ceeb0de60c Merge pull request #23773 from ndowens/cdk 
cdk:5.0-20160131 -> 5.0-20161210
 2017-03-12 23:16:19 +01:00
Vladimír Čunát 848423f223
clisp-tip: make the build more reliable 
Hydra shows it sometimes fails without autoconf:
http://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.clisp-tip.x86_64-linux
I can't say I understand why this happened.
 2017-03-12 23:07:55 +01:00
Benno Fünfstück 6c99f88eec fix typo in comment 2017-03-12 22:47:28 +01:00
Benno Fünfstück 039c6a6dfa haskell: comment about configuration-nix.nix's intersectAttrs 2017-03-12 22:45:19 +01:00
obadz 1dd16a9374 coreclr: mark broken 2017-03-12 21:32:27 +00:00
ndowens f0bb10fea3 geis: 2.2.16 -> 2.2.17 2017-03-12 16:25:18 -05:00
ndowens d80cb1b080 gecode: 4.4.0 -> 5.0.0 2017-03-12 16:21:13 -05:00
ndowens 3d9d879bc0 ace: 6.3.3 -> 6.4.2 2017-03-12 21:03:42 +00:00
Bo Bakker 1d948ddc01
caf: init at 0.15.3 
fixes #23772
 2017-03-12 21:53:49 +01:00
ndowens 6723703f46 filter-audio: 20150624 -> 0.0.1 2017-03-12 15:43:03 -05:00
ndowens a7b6f2eee4 ffms: 2.21 -> 2.22 2017-03-12 15:24:05 -05:00
ndowens fb35166629 fcppt: 1.3.0 -> 2.5.0 2017-03-12 14:53:50 -05:00
ndowens e86bb4da9d exosip: 4.0.0 -> 4.1.0 2017-03-12 14:44:58 -05:00
ndowens 7b89e8b2b6 exempi: 2.2.2 -> 2.4.2 2017-03-12 14:33:54 -05:00
Nikolay Amiantov c05ac3ea12 makeDBusConf: re-add XDG directories for session bus 
Fixes #23770.
 2017-03-12 22:15:51 +03:00
ndowens 498cc60f90 libp11: 0.2.7 -> 0.4.4 2017-03-12 13:27:55 -05:00
ndowens 45cfd3969a drumstick: 1.0.2 -> 1.1.0 2017-03-12 20:23:44 +02:00
Joachim Fasting 3c37edb928
tinycc: 0.9.27pre-20170220 -> 20170225 
Contains a fix for x86-64 asm gen and unified cross-compilation.
 2017-03-12 18:56:59 +01:00
Jörg Thalheim 55074a0e3c Merge pull request #23783 from ndowens/cl 
cl:1.2.1 -> 1.2.3
 2017-03-12 18:51:43 +01:00
Jörg Thalheim 879ccfd69c Merge pull request #23779 from ndowens/chipmunk 
chipmunk:7.0.0 -> 7.0.1
 2017-03-12 18:50:08 +01:00
Karn Kallio d2e30a74f4
eigen : Fix an extra slash. 2017-03-12 18:40:07 +01:00
Vladimír Čunát 50fadc8b18
cups: split the $lib output 
This saves > 10 MB from most closures.
Printing test succeeds on x86_64-linux.
 2017-03-12 18:36:30 +01:00
Jörg Thalheim 28337316d1 Merge pull request #23796 from ndowens/dlib 
dlib: 18.10 -> 19.4
 2017-03-12 18:32:19 +01:00
Jörg Thalheim d0922896be Merge pull request #23097 from dmjio/halvm 
Initial commit of HaLVM support
 2017-03-12 18:31:29 +01:00
Jörg Thalheim bcc3755477 Merge pull request #23784 from ndowens/ck 
concurrencykit: 0.4.5 -> 0.6.0
 2017-03-12 18:30:38 +01:00
Jörg Thalheim 847a5d11cb Merge pull request #23797 from rvl/scala-docs-subdir 
scala: put docs in correct subdirectory
 2017-03-12 18:25:53 +01:00
Vladimír Čunát 69448187a4
haskellPackages.llvm-general-darwin: fix #23794 
by hiding under llvm-general.  There seems no use in a separately named
attribute.  The derivations are unchanged.
 2017-03-12 18:19:35 +01:00
Rodney Lorrimar e333a71478 scala: put docs in correct subdirectory 
Under NixOS, /run/current-system/sw/share/doc was getting the license
file, etc.
 2017-03-12 16:27:16 +00:00
ndowens 496b293070 dlib: 18.10 -> 19.4 2017-03-12 11:15:38 -05:00
Rodney Lorrimar 453529bd60
nodePackages: support github:owner/repo scheme for package deps 
JS devs found a new way to be annoying - adjust code accordingly.

Have also put this change in PR svanderburg/node2nix#40
 2017-03-12 16:00:13 +01:00
Periklis Tsirakidis 4904df80bb qt57.qtbase: enable darwin compatibility 2017-03-12 15:02:24 +01:00
mimadrid a57d9e420c
libzip: 1.1.2 -> 1.2.0 2017-03-12 12:33:04 +01:00
ndowens 819b8c68de assimp: 3.2 -> 3.3.1 2017-03-12 08:34:51 +01:00
ndowens 1e68693cef cimg: 1.7.0 -> 1.7.9 2017-03-12 08:32:32 +01:00
Vincent Laporte c9d8ae084d ocamlPackages.ocaml-migrate-parsetree: init at 0.5 
This library converts parsetrees, outcometree and ast mappers
between different OCaml versions. High-level functions help making
PPX rewriters independent of a compiler version.

Homepage: https://github.com/let-def/ocaml-migrate-parsetree
 2017-03-12 07:29:54 +00:00
Peter Hoeg e18d518d66 heroku-cli: 5.6.14 -> 5.6.32 2017-03-12 14:48:17 +08:00
ndowens a7843b01f2 chromaprint: 1.3.1 -> 1.3.2 2017-03-11 21:52:14 -06:00
ndowens 5f03cf8f94 concurrencykit: 0.4.5 -> 0.6.0 2017-03-11 21:15:29 -06:00
ndowens ef741de5b1 cl:1.2.1 -> 1.2.3 2017-03-11 20:59:11 -06:00
ndowens 5d025f5731 chipmunk:7.0.0 -> 7.0.1 2017-03-11 19:58:16 -06:00
Alastair Pharo 2188e0f61f pure: 0.64 -> 0.66 2017-03-12 12:22:52 +11:00
ndowens a50e64a60c ceres-solver: 1.10.0 -> 1.12.0 2017-03-11 19:10:06 -06:00
ndowens e098899023 cdk:5.0-20160131 -> 5.0-20161210 2017-03-11 18:36:11 -06:00
Thomas Tuegel e24261ed16
qtbase: fix sed syntax in .pc file fixup 2017-03-11 16:25:48 -06:00
Periklis Tsirakidis 7c980f5e9c valgrind: enable darwin build 2017-03-11 20:29:52 +01:00
Joachim Fasting 617d8af325
pythonPackages.pyaes: init at 1.6.0 2017-03-11 19:26:29 +01:00
Joachim Fasting 9cc2083dac
pythonPackages.mnemonic: 0.12 -> 0.17 2017-03-11 19:26:27 +01:00
Joachim Fasting 10a0f1c2af
pythonPackages.trezor: 0.7.4 -> 0.7.12 2017-03-11 19:26:22 +01:00
Ben Zhang 1252a3707b
closurecompiler: 20160208 -> 20170218 2017-03-11 12:37:05 -05:00
ndowens 286917bfc9 aubio: 0.4.1 -> 0.4.4 (#23739) 2017-03-11 15:28:07 +01:00
Joachim Fasting 61edb1cb2e
pythonPackages.pyudev: 0.20.0 -> 0.21.0 
Also move expression
 2017-03-11 15:25:34 +01:00
Marius Bakke 4aaf27bb4d
pythonPackages.ds4drv: 0.5.0 -> 0.5.1 
Also move expression
 2017-03-11 15:25:32 +01:00
Tuomas Tynkkynen a241abf603 Revert "stdenv: aarch64 is also ARM" 
This reverts commit a5f4e22289.

Breaks the stdenv build, e.g.: http://hydra.nixos.org/build/50015717
In general, the architectures are different enough that there is no
reason to consider both as ARM, just like we don't consider x86_64 as
32-bit x86.

cc @fpletz
 2017-03-11 15:57:51 +02:00
Robin Gloster 91bbd73ffa
suil-qt5: fix build 2017-03-11 14:47:29 +01:00
aszlig e25f8f2e37
gwenhywfar: 4.15.3 -> 4.17.0 
* 4.17.0: A few smaller fixes.
 * 4.16.0beta: It's now possible to show saved passwords from the
               GWEN_PASSWD_STORE file.
 * 4.15.6beta: Improve Certificate handling with TLS connections.
 * 4.15.5beta: Fix problem with some servers aborting SSL connections.

The full changelogs in German can be found at:

https://www.aquamaniac.de/sites/news/index.php

Built and tested successfully on my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2017-03-11 12:38:01 +01:00
aszlig 460c064852
aqbanking: 5.6.10 -> 5.6.12 
* 5.6.11: Fix problem with some servers aborting SSL connections.
 * 5.6.12: Improve handling of offset accounts during turnover
           retrieval.

The full changelogs in German can be found at:

https://www.aquamaniac.de/sites/news/index.php

Built and tested successfully on my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2017-03-11 12:37:58 +01:00
aszlig 1de5f1bbeb
aqbanking/updater: Switch to HTTPS URL 
The site has changed to HTTPS and no longer serves HTTP (yay).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2017-03-11 12:37:54 +01:00
Franz Pletz bf6c90ed67
libarchive: 3.2.2 -> 3.3.1 2017-03-11 10:25:34 +01:00
Franz Pletz 70b174d79d
Revert "libarchive: 3.2.2 -> 3.3.1" 
This reverts commit 051b3b3b78.

This is a mass rebuild and should go into staging.
 2017-03-11 10:24:29 +01:00
Franz Pletz a5f4e22289
stdenv: aarch64 is also ARM 2017-03-11 09:40:19 +01:00
Michael Raskin 8ef4cd9e20 Merge pull request #23733 from ndowens/cgal 
cgal: 4.7 -> 4.9
 2017-03-11 08:18:57 +00:00
Franz Pletz 051b3b3b78
libarchive: 3.2.2 -> 3.3.1 2017-03-11 08:14:28 +01:00
vbgl cef420bd61 cgal: fix typo in license 2017-03-11 06:49:31 +00:00
Ben Zhang 49a14162b9
Update emscripten-fastcomp version to 1.37.3 2017-03-10 23:13:14 -05:00
Ben Zhang 954e145101
emscripten 1.37.1 -> 1.37.3 2017-03-10 22:59:19 -05:00
Ben Zhang e50dba97d2
nodejs: 7.7.1 -> 7.7.2 2017-03-10 21:54:49 -05:00
David Johnson 26623240e9 Init HaLVM at 2.4.0 2017-03-10 19:31:12 -06:00
ndowens 9017f36349 appstream: 0.9.5 -> 0.10.6 2017-03-10 18:49:01 -06:00
Tuomas Tynkkynen 8d3c35ad02 SDL2_gfx: Fix non-x86 build 2017-03-11 02:37:00 +02:00
Daiderd Jordan a2eae3bc44
Revert "Merge pull request #23602 from periklis/topic_qt57_darwin" 
This reverts commit 4c0737eb80, reversing
changes made to 943c4ed72f.
 2017-03-11 00:28:23 +01:00