BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
142797 commits 1 branch 0 tags 3.8 GiB
Commit graph

37163 commits

Author SHA1 Message Date
John Ericson
58fd684c76 llvm: Separate tools and libraries for clarity 
Especially provides clarity with respect to cross.
 2018-05-23 14:42:06 -04:00
Jan Tojnar
a8d43946e7
Merge pull request #26090 from edwtjo/feedreader-2.0 
FeedReader 2.0
 2018-05-23 19:34:12 +02:00
Jörg Thalheim
273c882f53
Merge pull request #39214 from seppeljordan/add-nix-prefetch-github 
Add nix-prefetch-github
 2018-05-23 16:33:03 +01:00
Lancelot SIX
b86aa55408 pythonPackages.pylibconfig2: 0.2.4 -> 0.2.5 (#40985) 2018-05-23 17:25:44 +02:00
John Ericson
18742471af Merge remote-tracking branch 'upstream/master' into staging 
Use newer vagrant from master
 2018-05-23 09:40:37 -04:00
John Ericson
266adab32d cctools: Remove a bunch of stuff no longer needed for Linux 2018-05-23 09:22:19 -04:00
John Ericson
5f1ec8e6d9
Merge pull request #40961 from obsidiansystems/hash-preserving-llvm-cleanup 
llvm, top-level: Baby steps towards cross support
 2018-05-23 09:15:00 -04:00
Vincent Laporte
cc2ac8a39e ocamlPackages.imagelib: init at 20171028 (#40910) 2018-05-23 10:33:26 +02:00
Jörg Thalheim
be4b3e89e5
Merge pull request #39603 from Scriptkiddi/master 
gams: init at 25.02
 2018-05-23 09:26:49 +01:00
John Ericson
acc9843691 llvm: Starting to fix Clang wrapping and stdenv building for cross 2018-05-23 00:42:47 -04:00
John Ericson
25e866a7fe treewide: Less {cc,bintools}-wrapper eta expansion 
Also makes the LLVM ones more correct
 2018-05-23 00:27:30 -04:00
John Ericson
07d73c4ab0 clangSelf, clangWrapSelf, llvmPackagesSelf: Remove this unused thing 
It's old old LLVM built with new LLVM. How useless.
 2018-05-23 00:27:30 -04:00
Jan Tojnar
c2361d632d
rust-cbindgen: init at 0.6.0 2018-05-23 02:11:00 +02:00
Edward Tjörnhammar
5d88b73cef
feedreader: init at 2.2 2018-05-23 01:50:42 +02:00
Robert Schütz
9e5c5d95a8 pythonPackages.udiskie: replace alias by throw 
closes #40941
 2018-05-23 00:52:17 +02:00
Robert Schütz
d4890642b4 Revert "pythonPackages.udiskie: replace alias with abort" 
This reverts commit 437ee38c18.
 2018-05-23 00:36:41 +02:00
Yegor Timoshenko
437ee38c18
pythonPackages.udiskie: replace alias with abort 2018-05-23 01:28:15 +03:00
Yegor Timoshenko
eaf1c07836
Merge pull request #40626 from dtzWill/update/sqlite-2.23.1 
sqlite: 3.22.0 -> 3.23.1
 2018-05-23 01:27:20 +03:00
worldofpeace
b9bdd7d4a3 pythonPackages.asyncssh: init at 1.13.0 (#40527) 2018-05-23 00:09:33 +02:00
Yegor Timoshenko
0928b2a033
nodejs: update to nodejs-8_x 2018-05-22 23:48:35 +03:00
Yegor Timoshenko
57200f58f4 sqlite3_analyzer: assert, rename to sqlite-analyzer, clean up 2018-05-22 23:43:04 +03:00
jD91mZM2
71da438f21 cargo-tree: init at 0.18.0 (#40924) 2018-05-22 22:04:50 +02:00
Sebastian Jordan
aca3198c70 nix-prefetch-github: init -> 1.3 2018-05-22 20:55:07 +02:00
Dmitry Kalinkin
65c3273250 form: init at 4.2.0 (#40693) 2018-05-22 20:17:32 +02:00
Vincent Laporte
571a1e19e9 coqPackages.iris: init at 3.1.0 (#40909) 2018-05-22 19:26:32 +02:00
Michael Brantley
11b3435345 perlPackages.ParsePlainConfig: init at 3.05 (#40624) 2018-05-22 18:42:41 +02:00
Kevin Liu
b77277fcdc helmfile: init at 0.16.0 (#40814) 2018-05-22 18:38:05 +02:00
Pascal Wittmann
eadb87d36d
Merge pull request #40726 from dbohdan/s2png 
s2png: init at 0.7.2
 2018-05-22 18:06:59 +02:00
Josef Kemetmüller
020957716e heimdal: Fix darwin build 2018-05-22 18:19:28 +03:00
Tuomas Tynkkynen
f9feacfc7c Merge remote-tracking branch 'upstream/master' into staging 2018-05-22 17:48:29 +03:00
Jörg Thalheim
c8a4562f59
Merge pull request #40896 from symphorien/nix-du 
nix-du: init at 0.1.1
 2018-05-22 15:46:21 +01:00
Symphorien Gibol
87125d6d08 nix-du: init at 0.1.1 2018-05-22 16:24:00 +02:00
Robin Gloster
72f293aa50
python3Packages.pyairvisual: init at 1.0.0 2018-05-22 14:29:57 +02:00
Lancelot SIX
05db1a11a9 pythonPackages.timeout-decorator: 0.3.2 -> 0.4.0 (#40914) 2018-05-22 11:40:26 +02:00
Robert Schütz
57d591ec7f
youtube-dl: use toPythonApplication (#40831) 2018-05-22 11:01:55 +02:00
xeji
41344b8d62
Merge pull request #40886 from Synthetica9/atom-1-27-1 
atom: 1.27.0 -> 1.27.1, atom-beta: 1.24.0-beta3 -> 1.28.0-beta1
 2018-05-22 10:38:33 +02:00
Frederik Rietdijk
9f87abded9
Merge pull request #40885 from plapadoo/pyogg-init 
pyogg: init at 0.6.2a1
 2018-05-22 10:28:20 +02:00
Patrick Hilhorst
2ad8e9a978
atom, atom-beta: 1.27.0 -> 1.27.1, 1.24.0-beta3 -> 1.28.0-beta1 
Also rewrote the derivation for easier maintencence.

(And added @ysndr as maintainer for atom-beta, kind of an implicit
result of joining the two. If you're not okay with that, I'll patch
you out, but I'll presume consent.)
 2018-05-22 09:40:00 +02:00
Philipp Middendorf
131228c29d pyogg: init at 0.6.2a1 2018-05-22 09:26:26 +02:00
Jörg Thalheim
5a7e42f6a3
Merge pull request #40908 from emmanuelrosa/purple-xmpp-http-upload 
purple-xmpp-http-upload: init at 178096c
 2018-05-22 08:12:53 +01:00
Allan Espinosa
320e504d4d hadoop: 2.2.0 -> 2.7.6, 2.8.6, 2.9.1, 3.0.2, 3.1.0 2018-05-21 21:27:31 -04:00
Matthew Bauer
04bc0bd2b7 freeciv: cleanup overrides 
This is how we do overrides elsewhere. The "name" suffix makes things
a little bit complicated IMO. Other input welcome.
 2018-05-21 19:55:37 -05:00
Matthew Bauer
f2dc19703a spidermonkey_38: add darwin support 2018-05-21 19:55:37 -05:00
Matthew Bauer
3dc8328b1f sfml: support darwin 2018-05-21 19:55:37 -05:00
John Ericson
db4d77779c Merge remote-tracking branch 'upstream/master' into staging 2018-05-21 20:21:48 -04:00
Emmanuel Rosa
2a09ee7a4a purple-xmpp-http-upload: init at 178096c 2018-05-21 16:09:30 -04:00
Vincent Laporte
19f768a978
ocamlPackages.earley_ocaml: init at 1.0.2 2018-05-21 16:10:12 +00:00
Jörg Thalheim
fc1ccb361b
Merge pull request #36506 from plapadoo/pysdl2-init 
pythonPackages.pysdl2: init at 0.9.6
 2018-05-21 13:02:36 +01:00
Matthieu Coudron
d9dadce758 libnl: 3.3.0 -> 3.4.0 2018-05-21 18:51:34 +09:00
Uli Baum
d9bdd77eb5 vimNox: pin to lua 5.1 
vimNox is currently built from a patched vim 7.3 source from 2012
that requires lua 5.1. Temporary fix, see discussion in #40749.
 2018-05-21 11:46:44 +02:00
Philipp Middendorf
ad399afd6f pythonPackages.pysdl2: init at 0.9.6 2018-05-21 09:50:08 +02:00
Peter Hoeg
80bfd2f371 musescore: 2.1.0 -> 2.2.1 
Fixes #29519
 2018-05-21 15:45:37 +08:00
Orivej Desh
66002a0e07 spdk: init at 18.04 
Closes #39138.
 2018-05-21 02:00:07 +00:00
Orivej Desh
345f4639d6 odp-dpdk, ofp, pktgen: move from linuxPackages 
These packages do not depend on the kernel.

ofp is not aliased because it is marked as broken.
 2018-05-21 01:18:25 +00:00
Orivej Desh
2287c5f6a5 dpdk: extract from linuxPackages.dpdk 
DPDK kernel modules are optional and its libraries do not reference them.

This allows to move the packages that depend on DPDK out of linuxPackages,
since they do not depend on kernel version.
 2018-05-21 01:05:43 +00:00
Mario Rodas
f5ca57b6d9 powerline-rs: Fix darwin build (#40840) 2018-05-21 00:55:21 +02:00
Emmanuel Rosa
3dadae4cd2 purple-lurch: init at 0.6.7 
Adds XEP-0384: OMEMO Encryption for libpurple
 2018-05-20 22:11:15 +00:00
leenaars
bc309f5c57 webmetro: init => unstable-20180426 (#39673) 2018-05-20 23:27:34 +02:00
Matthew Justin Bauer
130e5f6548
Merge pull request #40169 from leenaars/kcgi 
kcgi: init -> 0.10.5
 2018-05-20 16:22:55 -05:00
Michiel Leenaars
1a611d4f4e kcgi: init -> 0.10.5 2018-05-20 22:37:36 +02:00
Benjamin Hipple
65f58cfaf8 vim_configurable: unpin from old lua 5.1 (#40749) 
This pin was added in 2014 during a lua upgrade, but it appears vim today builds
fine with lua 5.2, so we can have it just depend on the `lua` package.
 2018-05-20 22:11:43 +02:00
averelld
e92d68e3ab x2goclient: qt4 -> qt5 (#40811) 2018-05-20 21:53:45 +02:00
Peter Hoeg
d7679fb2b5 0ad: 0.0.22 -> 0.0.23 (#40807) 2018-05-20 21:32:03 +02:00
Orivej Desh
75e66b5581 swift-im: init at 4.0.2 
(cherry picked from commit d7117945f5a3edf44b3c71432a8a6a4f94e1d75b)
 2018-05-20 11:51:17 +00:00
Orivej Desh
5188ef371f libnatpmp: init at 20150609 2018-05-20 11:51:17 +00:00
Vladimír Čunát
392e6de7d0
Merge branch 'master' into staging 2018-05-20 13:20:53 +02:00
Samuel Leathers
be5e8faafc
Merge pull request #40742 from worldofpeace/antibody 
antibody: init at 3.4.6
 2018-05-19 21:39:40 -04:00
Samuel Leathers
caa1414482
Merge pull request #40770 from mnacamura/gauche 
gauche: init at 0.9.5
 2018-05-19 21:38:39 -04:00
Jörg Thalheim
8bcec815bd
Merge pull request #40744 from kirelagin/wireguard-darwin 
WireGuard: Make tools available on other platforms
 2018-05-19 22:49:54 +01:00
Silvan Mosberger
c8a8ecb5b3 blockhash: init at 0.3 (#40737) 2018-05-19 23:33:09 +02:00
Silvan Mosberger
bf629981a6 nms: init at 0.3.3 (#40707) 2018-05-19 23:26:06 +02:00
Vincent Laporte
0d319657ef ocamlPackages.earley: init at 1.0.2 (#40755) 2018-05-19 23:01:40 +02:00
Daiderd Jordan
41f3ceded8
Merge pull request #40724 from yurrriq/init/m-cli 
m-cli: init at 0.2.5
 2018-05-19 21:32:33 +02:00
Eric Bailey
84919cd3ef
m-cli: init at 0.2.5 2018-05-19 13:52:42 -05:00
worldofpeace
f434c71def antibody: init at 3.4.6 2018-05-19 13:45:50 -04:00
Michael Weiss
142b65f088
html-proofer: init at 3.8.0 (#40772) 2018-05-19 16:10:32 +02:00
Mitsuhiro Nakamura
ae89ef24aa gauche: init at 0.9.5 2018-05-19 22:29:29 +09:00
Jörg Thalheim
4c132c40bd
Merge pull request #40752 from TravisWhitaker/alacritty-darwin 
alacritty: Fix darwin.
 2018-05-19 14:25:13 +01:00
Jörg Thalheim
d0d9f49057
Merge pull request #40758 from kirelagin/wireguard-go 
wireguard-go: init at 0.0.20180514
 2018-05-19 12:27:50 +01:00
geistesk
2db356feb5 pythonPackages.geojson: init at 2.3.0 2018-05-19 12:14:16 +02:00
Yegor Timoshenko
60d96d7786
top-level/aliases: add wireguard -> wireguard-tools alias 2018-05-19 12:28:38 +03:00
Yegor Timoshenko
a9defaefab
top-level: remove wireguard attr 2018-05-19 12:27:21 +03:00
Robert Schütz
90c0100139 Merge branch 'master' into staging 2018-05-19 11:12:19 +02:00
Kirill Elagin
b599f672e4
wireguard-go: init at 0.0.20180514 2018-05-19 11:19:33 +03:00
Travis Whitaker
b739397ae4 alacritty: Fix darwin. 2018-05-19 00:01:47 -07:00
Matthew Justin Bauer
93a5152c82
Merge pull request #40606 from udono/fix/tryton-update 
Fix/tryton update
 2018-05-18 21:50:12 -05:00
Matthew Justin Bauer
d1605c559b
Merge pull request #40166 from akru/yrd-init 
yrd: init at 0.5.3
 2018-05-18 21:49:55 -05:00
Matthew Justin Bauer
da72ac2092
Merge pull request #40571 from vbgl/coq-stdpp 
coqPackages.stdpp: init at 1.1
 2018-05-18 21:48:35 -05:00
Matthew Justin Bauer
bc35f54a64
Merge pull request #40510 from tilpner/gomuks-init 
gomuks: init at 2018-05-16
 2018-05-18 21:46:20 -05:00
Matthew Justin Bauer
05ff6862c8
Merge pull request #40199 from jarjee/newpkg/mongodb-compass 
mongodb-compass: init at 1.13.1
 2018-05-18 21:43:38 -05:00
Kirill Elagin
865abfa609
wireguard: Enable tools on other platforms 
Wireguard is now split into two pretty much independent packages:
`wireguard` (Linux-specific kernel module) and `wireguard-tools`,
which is cross-platform.
 2018-05-19 01:17:26 +03:00
John Ericson
5ccb99e372 Merge remote-tracking branch 'upstream/master' into staging 2018-05-18 17:48:37 -04:00
Will Dietz
0c30d6597e xbps: init at 0.52 2018-05-18 12:42:34 -05:00
Udo Spallek
5a3ccf19c4 pythonPackages cdecimal: init at 2.3 2018-05-18 17:17:44 +00:00
Udo Spallek
31ebb53b12 pythonPackages goocalendar: init at 0.3 2018-05-18 17:17:44 +00:00
dbohdan
1d2eeec16c s2png: init at 0.7.2 2018-05-18 17:19:31 +03:00
Uli Baum
cab0bd00e1 staging: fix eval error (undefined 'ncursesReal') 
broken by an apparently faulty merge
in ddbe9191ef
 2018-05-18 16:13:19 +02:00
Yurii Rashkovskii
63f2c2f73f
ape: init at 6.7-131003 2018-05-17 21:47:43 -07:00
Tuomas Tynkkynen
003473613a Merge remote-tracking branch 'upstream/master' into staging 
Conflicts:
	pkgs/top-level/all-packages.nix
 2018-05-18 03:54:38 +03:00
Will Dietz
3432fa3fd5 bashplotlib: init at 2017-10-11 (#40685) 2018-05-17 23:16:26 +02:00
Will Dietz
26f06ddb16
Merge pull request #40702 from dtzWill/feature/sqlar 
sqlar: init at 2018-01-07
 2018-05-17 16:00:15 -05:00
Will Dietz
0f7eaddc50 sqlar: init at 2018-01-07 2018-05-17 14:58:41 -05:00
Will Dietz
ee57b14c04
Merge pull request #40680 from dtzWill/update/st-1.1.4 
App::St: 1.1.2 -> 1.1.4
 2018-05-17 14:42:53 -05:00
Pascal Wittmann
97ab2d40cb
Merge pull request #40614 from symphorien/ries 
ries: init at 2018-04-11
 2018-05-17 21:30:47 +02:00
Tobias Happ
93fedb03fe cargo-release: Init at 0.10.0 2018-05-17 14:20:28 -05:00
Peter Simons
b5cef2ea66
Merge pull request #40392 from ElvishJerricco/ghcjs-8.2 
Ghcjs 8.2 & 8.4
 2018-05-17 17:55:59 +02:00
Will Dietz
a5c9b87d78 App::St: no need for fixup anymore 
FWIW the fixup is the update 1.1.2 -> 1.1.4 is reverted.
 2018-05-17 10:12:34 -05:00
Will Dietz
0b4b3e648c perlPackages.AppSt: 1.1.2 -> 1.1.4 2018-05-17 10:06:56 -05:00
Fritz Otlinghaus
9668a66948 gams: init at 25.02 2018-05-17 14:46:31 +02:00
Symphorien Gibol
ea7404dcd7 ries: init at 2018-04-11 2018-05-17 14:09:33 +02:00
Robert Schütz
2c91ab54c9
Merge pull request #40353 from Assassinkin/mail-parser 
pythonPackages.mail-parser: init at 3.3.1
 2018-05-17 12:24:30 +02:00
Assassinkin
fb7340d3e5 pythonPackages.mail-parser: init at 3.3.1 2018-05-17 12:22:22 +02:00
Yegor Timoshenko
910644ef50
Merge pull request #40620 from NixOS/yegortimoshenko-patch-4 
top-level: build winePackages on Hydra
 2018-05-17 11:52:49 +03:00
Frederik Rietdijk
de55b71e0b
Merge pull request #30833 from nyarly/jira_cli 
(jira-cli) init at 2.2
 2018-05-17 08:53:03 +02:00
Tim Steinbach
fe2deeb458
kafka: Add 1.1 2018-05-16 22:26:40 -04:00
Yegor Timoshenko
1b2b126f82 winePackages: move to pkgs/top-level/wine-packages.nix 2018-05-17 02:31:03 +03:00
Yegor Timoshenko
570b1e52c6
top-level: build winePackages on Hydra 2018-05-17 02:04:42 +03:00
Will Dietz
2efa96b6b8
Merge pull request #40607 from Infinisil/add/pacvim 
pacvim: init at 2018-05-16
 2018-05-16 16:27:57 -05:00
John Ericson
ddbe9191ef Merge remote-tracking branch 'upstream/master' into staging 
Keep the dontCheck because the test suite fails, get rid of the LDFLAGS
hack because we don't need it!
 2018-05-16 15:16:08 -04:00
Silvan Mosberger
00c4ba1ea0
pacvim: init at 2018-05-16 2018-05-16 21:10:34 +02:00
John Ericson
f3fcf1b0a9
Merge pull request #40393 from ElvishJerricco/ios-prebuilt-dependency-fixes 
Fix some GHC dependencies on iOS
 2018-05-16 15:04:13 -04:00
tilpner
c1efa89126
gomuks: init at 2018-05-16 2018-05-16 20:47:35 +02:00
Ryan Trinkle
4f25cf5124 ncurses: when cross-compiling for iOS, use built-in ncurses 2018-05-16 14:28:25 -04:00
Will Dietz
1bbe4e9618
Merge pull request #40596 from dtzWill/feature/dyncall-1.0 
dyncall: init at 1.0
 2018-05-16 10:52:29 -05:00
Will Dietz
65eb3ec842 dyncall: init at 1.0 2018-05-16 10:29:40 -05:00
Andreas Rammhold
8a93595550
sysprof: 1.2.0 -> 3.28.1 2018-05-16 16:54:12 +02:00
worldofpeace
1edc7ae639 xbmcPlugins.osmc-skin: init at 17.0.4 2018-05-16 08:27:42 -04:00
Alexander Krupenkin
82550c639e
yrd: init at 0.5.3 2018-05-16 15:12:19 +03:00
Pascal Wittmann
ad31217cc4
Merge pull request #40584 from mnacamura/btops 
btops: init at 0.1.0
 2018-05-16 13:14:59 +02:00
Robert Schütz
40edf5eeed
Merge pull request #39120 from ktf/add-uproot 
pythonPackages.uproot: init at 2.8.23.
 2018-05-16 10:19:28 +02:00
Peter Hoeg
84ae5f1ee3 vcal: init at 2.7 2018-05-16 16:13:26 +08:00
Giulio Eulisse
54cf5d9358
pythonPackages.uproot: init at 2.8.23 2018-05-16 09:36:52 +02:00
Will Fancher
d86edd5161 Dont haddock ghcjs in either version 2018-05-16 03:11:32 -04:00
Mitsuhiro Nakamura
0910be8327 btops: init at 0.1.0 2018-05-16 16:05:49 +09:00
adisbladis
374a18fcb6
Merge pull request #40583 from adisbladis/emacsPackages.emacs-libvterm 
emacsPackages.emacs-libvterm: init at unstable-2017-11-24
 2018-05-16 14:20:34 +08:00
adisbladis
149a0dc1ff
emacsPackages.emacs-libvterm: init at unstable-2017-11-24 2018-05-16 14:02:49 +08:00
adisbladis
3290800d67
libvterm-neovim: init at 2017-11-05 2018-05-16 14:02:48 +08:00
Matthew Bauer
4592ed6e43 qtchan: fix on macos 2018-05-16 01:02:31 -05:00
Okina Matara
8419c347ca qtchan: init at v0.100 2018-05-16 01:02:31 -05:00
Matthew Bauer
bb831b7946 redshift: support macosx 2018-05-16 01:02:31 -05:00
Matthew Bauer
d6c9efa223 watchman: add fsevents support 
macOS needs apple sdks for fsevents support

Fixes #14309
 2018-05-16 01:02:31 -05:00
Matthew Justin Bauer
0e2dd13f43
Merge pull request #40506 from mmlb/flent 
flent: init at 1.2.2
 2018-05-16 01:00:11 -05:00
Peter Hoeg
7f27566efd
Merge pull request #40581 from peterhoeg/p/sedutil 
sedutil: init at 1.15.1 and corresponding nixos module
 2018-05-16 12:39:06 +08:00
Tuomas Tynkkynen
6b6a575748 Merge remote-tracking branch 'upstream/master' into staging 
Conflicts:
	pkgs/tools/networking/telnet/default.nix
	pkgs/top-level/aliases.nix
 2018-05-16 03:09:33 +03:00
Moritz Ulrich
977c207f22 pythonPackages.podcats: Init at 0.5.0 2018-05-15 23:23:57 +02:00
Vincent Laporte
42462d7b66
coqPackages.stdpp: init at 1.1 2018-05-15 20:55:53 +00:00
Matthew Justin Bauer
0b1a0e3330
Merge pull request #40184 from jD91mZM2/multibootusb 
multibootusb: init at 9.2.0
 2018-05-15 12:15:10 -05:00
Matthew Bauer
1d9d1fa780 telnet: use inetutils 
Inetutils provides a cross-platform version of telnet. Normally I
would try to contact the old maintainer, but none is listed.
 2018-05-15 10:43:00 -05:00
Sebastian Jordan
101d1d118d pythonPackages.effect: init -> 0.11.0 2018-05-15 14:35:10 +02:00
Jan Tojnar
d5060ac3a7
Merge pull request #33371 from jtojnar/flatpak 
Flatpak
 2018-05-15 14:19:33 +02:00
Jan Tojnar
843bc0f73a
flatpak-builder: init add 0.10.10 2018-05-15 13:28:30 +02:00
lewo
640b6359ae
Merge pull request #40453 from andersk/pytorch 
pytorch: 0.3.1 -> 0.4.0
 2018-05-15 08:40:51 +02:00
John Ericson
f2017c40ae Merge remote-tracking branch 'upstream/master' into staging 2018-05-14 22:53:10 -04:00
John Ericson
232bc24b56
Merge pull request #40530 from obsidiansystems/mingw-cleanup 
MinGW, Hurd: Clean ups and crossConfig removal
 2018-05-14 21:05:44 -04:00
John Ericson
9be118223b misc mingw: Get rid of crossConfig and clean up 
Style of dual implementation and headers derivations is take from
bb7067f882.
 2018-05-14 20:32:42 -04:00
Matthew Justin Bauer
e5274eb60e
Merge pull request #40391 from bhipple/truffleHog-gitpython-gitdb2-smmap2 
truffleHog: init at 2.0.91
 2018-05-14 18:10:07 -05:00
Matthew Justin Bauer
8dfecefd97
Merge pull request #40245 from bcdarwin/bicgl 
bicgl: init at 2017-09-10
 2018-05-14 18:09:27 -05:00
Pascal Wittmann
4e7d08cd97
Merge pull request #40523 from arcadio/minimap2 
minimap2: init at 2.10
 2018-05-14 23:34:26 +02:00
Arcadio Rubio García
e4a2b70f91 minimap2: init at 2.10 2018-05-14 21:26:07 +01:00
Robert Schütz
3189704549
Merge pull request #36426 from couchemar/isort-4.3.4 
pythonPackages.isort: 4.2.5 -> 4.3.4
 2018-05-14 22:05:49 +02:00
Manuel Mendez
b14f809bb1 flent: init at 1.2.2 2018-05-14 12:46:33 -04:00
John Ericson
8e891e6ed4 Merge remote-tracking branch 'upstream/master' into staging 2018-05-14 10:57:33 -04:00
Matthew Justin Bauer
09204fe806
Merge pull request #40440 from ruuda/libressl 
libressl: init at 2.7, change url to https
 2018-05-13 18:21:26 -05:00
Judson
51f4a46af2
jira_cli: init at 2.2 2018-05-13 14:35:42 -07:00
Ruud van Asseldonk
5bd19cfceb libressl: 2.5.5 -> 2.7.3 2018-05-13 23:05:04 +02:00
Tuomas Tynkkynen
f2ea9e0ebf U-Boot: Add Pine64 build 
(cherry picked from commit 4b77663edf)
(cherry picked from commit 1896fcff609d7b99b4be1781a5c9523193c33e4f)
 2018-05-13 16:12:11 -04:00
Samuel Dionne-Riel
566d3feb4e U-Boot: Add SOPINE Baseboard build 
This build is compatible with PINE A64-LTS.

[dezgeg changed the original device tree patch to v4 of the patch series
"sunxi: sync H3, H5, A64 DTs from mainline Linux" submitted to the
upstream mailing list by Andre Przywara. Also install the
u-boot-sunxi-with-spl.bin binary similar to 32-bit boards
since it's now being built by the upstream build system.]

(cherry picked from commit 2ff31f71ae)
(cherry picked from commit 176d151f4d98d54adf293ee58427da649f28452c)
 2018-05-13 16:12:10 -04:00
Tuomas Tynkkynen
7dffe0d38c U-Boot: Add AArch64 QEMU build 
See

https://github.com/u-boot/u-boot/blob/master/doc/README.qemu-arm

on how to use it.

(cherry picked from commit 6b069c656a)
(cherry picked from commit eff6d9628c9e0bae2096251f8e97789c0b9afe6f)
 2018-05-13 16:12:10 -04:00
Ben Wolsieffer
d50bcaa816 uboot: sheevplug and guruplug: use mainline U-Boot 
These derivations have not seen any updates since they were created in 2010,
and some of their sources have disappeared. There are upstream configs for
these boards, so these are now used, and they build correctly. I have no way
of testing them, and I don't if anyone even uses either board with Nix anymore.

(cherry picked from commit 01020b3263)
(cherry picked from commit 48ade50d8ece09d3ff732b07f0facdcd78084ac3)
 2018-05-13 16:12:08 -04:00
volth
3a4eda2e38 perlPackages.GD: fix build on staging (#40449) 2018-05-13 22:12:02 +02:00
Anders Kaseorg
d2f7acf30c pytorch: 0.3.1 -> 0.4.0 
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
 2018-05-13 14:02:08 -04:00
Benjamin Hipple
3fc1694e8a truffleHog: init at 2.0.91 
This commit adds the python3 application truffleHog, which is a stand-alone tool
that scans a git repo for unencrypted passwords.

This depends on a newer GitPython, which depends on a new major version of
gitdb, which depends on a new major version of smmap, so I've packaged those
as well in the preceding commits.
 2018-05-13 11:41:02 -04:00
Benjamin Hipple
5efce7c43d GitPython: 2.0.8 -> 2.1.9 
Also moves GitPython into the newer python module folder structure.
 2018-05-13 11:33:42 -04:00
Benjamin Hipple
318ce72a05 gitdb2: init at 2.0.3 
Also move gitdb and gitdb2 to the new python module structure.
 2018-05-13 11:33:41 -04:00
Benjamin Hipple
68573a61a9 smmap2: init at 2.0.3 
This commit adds smmap2, which is a separate pypi package from the existing
smmap 0.9.0, though they both come from the same repo. It also moves smmap into
the new python modules location.
 2018-05-13 11:33:41 -04:00
Meghea Iulian
8712ea5ccf avocode: init at 2.26.0 (#40425) 2018-05-13 16:02:51 +02:00
Ruud van Asseldonk
4371e5be0b libressl_2_7: init at 2.7.3 2018-05-13 15:25:24 +02:00
Stefan Matting
e0cf582493 Theano: fix broken compiler; Add nvidia_x11 as dependency when cudaSupport 2018-05-13 14:23:12 +02:00
Stefan Matting
6d8bf113bd libgpuarray: add nvidia_x11 as dependency when cudaSupport 2018-05-13 14:19:16 +02:00
Frederik Rietdijk
658b7c3f2e Merge master into staging 2018-05-13 12:13:25 +02:00
John Ericson
2c5d915200 Merge commit '92b7a814f26ee1d37e989431c18518c67285a332' into staging 2018-05-13 01:02:09 -04:00
Mitsuhiro Nakamura
3fd8dea354 rounded-mgenplus: init at 20150602 2018-05-13 07:22:02 +09:00
CrazedProgrammer
da08831345 compsize: init at 2018-04-07 (#40217) 2018-05-13 00:10:36 +02:00
Will Fancher
64df9b6b89 GHCJS 8.4 2018-05-12 17:48:30 -04:00
xeji
ef102bd43a
Merge pull request #39514 from Tmplt/update-geant4 
geant4: v10.0.2 -> v10.4.1, define datasets seperately, add dependencies for enableInventor
 2018-05-12 23:13:01 +02:00
Tmplt
3eabf15f9b soxt: init at 1.3.0 2018-05-12 21:58:36 +02:00
Unknown
37af5704f9 distrobuilder: init at HEAD 
Implement feedback
 2018-05-12 21:14:10 +03:00
Andreas Rammhold
6ec7291a79
Merge pull request #40006 from taku0/firefox-bin-59.0.3 
firefox, firefox-bin: 59.0.2 -> 59.0.3, firefox-esr: 2.7.3esr -> 52.7.4esr
 2018-05-12 19:50:04 +02:00
Matthew Justin Bauer
6f8cfae6c9
Merge pull request #40225 from brian-dawn/brian/add-librealsense 
librealsense: init at 2.11.0
 2018-05-12 11:47:06 -05:00
xeji
8f259f3e32
Merge pull request #40277 from peterhoeg/f/ansible 
ansible: update point releases and unify build
 2018-05-12 17:49:00 +02:00
Philipp
22cd5eb643 gnunet-svn: remove outdated package (#40401) 
Gnunet switched develpoment from svn to git and removed the svn repositories.
 2018-05-12 17:35:53 +02:00
obadz
204049763b citrix-receiver: 13.9.0 -> 13.9.1 2018-05-12 14:03:49 +01:00
Uli Baum
108cf05ff0 poppler_min: pin to poppler_0_61 
poppler_min is only used by texlive.bin, which doesn't build
with poppler 0.64 and blocked the update poppler 0.63->0.64.
Pin to poppler_0_61 (which we currently need for libreoffice)
so we don't have to keep 0_63 as a third version.
See discussion in #40327 and #40180
 2018-05-12 14:16:22 +02:00
taku0
c0e48427c6 firefox-esr: make 60.x as the default 2018-05-12 19:51:04 +09:00
taku0
873af991ef firefox-esr: 52.7.4esr -> 52.8.0esr, 60.0esr 2018-05-12 19:51:04 +09:00
Frederik Rietdijk
4ee37b7421 python.pkgs.ply: move expression 2018-05-12 10:30:48 +02:00
Will Fancher
c41675bce0 GHCJS 8.2 2018-05-12 01:54:42 -04:00
Matthew Bauer
c839771129 xquartz: fix build 
Things done:

- use libGLU instead of mesa for darwin support
- move patches from local to github url
- fixup xquartz install

There may still be some issues at runtime. PRs welcome!

Fixes #40196
 2018-05-11 23:55:59 -05:00
John Ericson
81387c2e78 Merge remote-tracking branch 'upstream/master' into staging 2018-05-11 17:12:04 -04:00
John Ericson
ee4b56edd3 Merge remote-tracking branch 'upstream/master' into staging 2018-05-11 14:36:08 -04:00
Spencer Baugh
f78c25239e pythonPackages.trio: init at 0.4.0 2018-05-11 17:00:42 +00:00
Spencer Baugh
c983bbb557 pythonPackages.trustme: init at 0.4.0 2018-05-11 16:39:15 +00:00
Spencer Baugh
46fa7ab686 pythonPackages.outcome: init at 0.1.0a0 2018-05-11 16:38:04 +00:00
Franz Pletz
59a6f939f8
pythonPackages.prometheus_client: init at 0.2.0 2018-05-11 18:31:48 +02:00
Robert Schütz
188fdf5bd0
Merge pull request #40189 from catern/contextvars 
Add pythonPackages.immutables, pythonPackages.contextvars
 2018-05-11 16:40:17 +02:00
Tim Steinbach
46440d3426
docker-edge: 18.04.0-ce -> 18.05.0-ce 2018-05-11 09:19:41 -04:00
Spencer Baugh
1bfa8c294c pythonPackages.contextvars: init at 2.2 2018-05-11 13:19:17 +00:00
Spencer Baugh
5862c6835a pythonPackages.immutables: init at 0.5 2018-05-11 13:19:12 +00:00
Jörg Thalheim
d01a13b74a
Merge pull request #40308 from mrVanDalo/remove_backup 
backup (gem) : remove
 2018-05-11 12:17:56 +01:00
Tuomas Tynkkynen
83b3e6d705 kernel: Drop bitrotted MIPS patches 
Not a single one of these applies to even 4.4 anymore, so these have
clearly bitrotted a long, long time ago.
 2018-05-11 12:27:31 +03:00
Markus Hauck
d12afa6642 googleearth: init at 7.1.8.3036 2018-05-11 09:34:29 +02:00
Matthew Bauer
a0ab41ca96 release: disable tests.cc-wrapper-gcc8.x86_64-darwin 
This test is broken because gcc8.x86_64-darwin is broken. Please add
the test back in once we have fixed it!

Job: https://hydra.nixos.org/job/nixpkgs/trunk/gcc8.x86_64-darwin
Issue: #40038
 2018-05-10 23:58:12 -05:00
Matthew Bauer
4d141bd463 tests: move to attribute set 2018-05-10 23:58:12 -05:00
Jan Tojnar
556c40c0e2
xdg-desktop-portal-gtk: init at 0.10 2018-05-11 06:06:41 +02:00
Jan Tojnar
fe54e14cef
xdg-desktop-portal: init at 0.11 2018-05-11 06:06:40 +02:00
Jan Tojnar
215dcb7285
flatpak: init at 0.11.7 2018-05-11 06:06:40 +02:00
Ingolf Wagner
4baafa9c16
backup (gem) : remove 
It is not working since 18.03 and nobody than me seems to use it, because I couldn't find a package.
Also I'm not willing to continue maintaining this package.
 2018-05-11 04:31:16 +02:00
Matthew Bauer
a9ac651764 libjpeg: always use libjpeg_turbo 
libjpeg_turbo is consistently built on Darwin now. I have no way to
verify FreeBSD so if anyone can confirm libjpeg_turbo is still broken
please revert this!
 2018-05-10 21:10:18 -05:00
John Ericson
67db915a43 Merge remote-tracking branch 'upstream/master' into staging 2018-05-10 16:35:04 -04:00
xeji
2d88a7b968
Merge pull request #40293 from romildo/upd.theme-jade-1 
theme-jade1: init at 3.2
 2018-05-10 21:28:41 +02:00
José Romildo Malaquias
461903974e theme-jade1: init at 3.2 2018-05-10 14:46:32 -03:00
Robert Schütz
71a561fc60
Merge pull request #38957 from guibou/guibou_pysensors 
pysensors: init at 2017-07-13
 2018-05-10 19:42:30 +02:00
John Ericson
f40aa17933 Merge remote-tracking branch 'upstream/master' into staging 2018-05-10 13:29:04 -04:00
xeji
d1c4260859
Merge pull request #40256 from rycee/bump/perl-URI 
perl-URI: 1.73 -> 1.74
 2018-05-10 19:25:04 +02:00
xeji
1463480edb
Merge pull request #40289 from yegortimoshenko/mpv-bump 
mpv: 0.27.2 -> 0.28.2
 2018-05-10 18:21:38 +02:00
xeji
d448ff75da
Merge pull request #40287 from yegortimoshenko/tio 
tio: init at 1.30
 2018-05-10 18:11:41 +02:00
John Ericson
42f6e7c4e4 Merge remote-tracking branch 'upstream/master' into staging 2018-05-10 12:04:17 -04:00
John Ericson
ad838f6f91 Merge branch 'fewer-crossAttrs' into staging 2018-05-10 12:03:24 -04:00
John Ericson
28b2f48ba9
Merge pull request #40276 from obsidiansystems/fewer-crossAttrs 
Fewer cross attrs
 2018-05-10 11:58:00 -04:00
John Ericson
9cb1d82be6 zeromqpp: Init at 4.2.0 2018-05-10 11:34:16 -04:00
Peter Hoeg
efbeca76fe ansible: drop 2.1, 2.2 and 2.3 as they are EOL 2018-05-10 23:11:37 +08:00
Peter Hoeg
06e394bbb4 ansible: update point releases and unify build 
1) We had lots of copy paste - instead use a generic builder for the various reasons.

2) Default version changed to latest (2.5 instead of 2.4)

3) Point release updates to all
 2018-05-10 23:11:37 +08:00
Yegor Timoshenko
956d174c8d
ffmpeg_4: init 2018-05-10 17:44:40 +03:00
Michael Brantley
56bd3b7db8
perlPackages.ClassEHierarchy: init at 2.00 2018-05-10 16:11:48 +02:00
Michael Brantley
988c56ee11
perlPackages.Paranoid: employ more restrictive blessed path 
Decided it would be better to employ an even more restrictive default
"blessed" path by only including the coreutils package bin directory.
 2018-05-10 16:06:44 +02:00
Michael Brantley
d4e71a2321
perlPackages.Paranoid: init at 2.05 2018-05-10 16:06:36 +02:00
Yegor Timoshenko
bcaff3c3e0
tty: init at 1.30 2018-05-10 17:04:04 +03:00
Jörg Thalheim
3e8a0c067a
Merge pull request #40153 from davidak/plank 
plank: init at 0.11.4
 2018-05-10 14:02:43 +01:00
Frederik Rietdijk
64c8c6dcb3 Merge master into staging 2018-05-10 09:30:56 +02:00
John Ericson
006422d08d Merge commit 'feb648ce59ffbed94c58133eb7aa2761992a35e1' into staging 2018-05-10 01:55:26 -04:00
John Ericson
feb648ce59 Merge commit '70963b382f3f820ba6d3bc3b3aaf50a2957ec1ff' into lib-platform-simplify 2018-05-10 01:40:38 -04:00
John Ericson
3bc923bf5f Merge remote-tracking branch 'upstream/master' into uclibc 2018-05-10 00:23:12 -04:00
John Ericson
b3ef322770 Merge commit '70963b382f3f820ba6d3bc3b3aaf50a2957ec1ff' into uclibc 2018-05-10 00:18:51 -04:00
John Ericson
d65fe65616 uclibc: Fix eval 2018-05-10 00:17:43 -04:00
John Ericson
f063a860d6 xbursttools: Cleanup slightly 2018-05-09 23:40:13 -04:00
Robert Helgesson
0cdb56dfa8
perl-URI: 1.73 -> 1.74 2018-05-09 23:42:22 +02:00
Ben Darwin
1e50e178ae simpleitk: init at 1.1.0 (note this only builds the C++ libs, not the Python/Lua/... bindings) (#27451) 
* conglomerate: init at 2017-09-10

* simpleitk: init at 1.1.0 (note this only builds the C++ libs, not the Python/Lua/... bindings)
 2018-05-09 15:50:01 -05:00
Matthew Justin Bauer
37cde0036e
Merge pull request #36358 from nicknovitski/init-cloud-sql-proxy 
cloud-sql-proxy: init at 1.11
 2018-05-09 15:42:32 -05:00
Michael Brantley
df37647ab2
Fix alphabetization of perl modules 2018-05-09 21:56:27 +02:00
Michael Brantley
9410c39b9a
perlPackages.LinuxACL: init at 0.05 2018-05-09 21:56:27 +02:00
Michael Brantley
7b0b4cd397
perlPackages.NetZooKeeper: init at 0.41 2018-05-09 21:55:32 +02:00
Ben Darwin
7a64b0726a bicgl: init at 2017-09-10 2018-05-09 14:05:29 -04:00
Brian Dawn
8a9402c207 librealsense: init at 2.11.0 2018-05-09 12:58:55 -05:00
Matthew Justin Bauer
d9debbeacf
Merge pull request #40042 from samueldr/package/input-utils 
input-utils: init at 1.3
 2018-05-09 16:07:59 +00:00
Samuel Dionne-Riel
4a2bf9c4ec input-utils: init at 1.3 2018-05-09 10:34:07 -04:00
Frederik Rietdijk
a18b493e02 Merge master into staging 2018-05-09 10:48:01 +02:00
Matthew Justin Bauer
118d9d7489
Merge pull request #39130 from veprbl/pr/graphicsmagick-imagemagick-compat 
Implement graphicsmagick-imagemagick-compat
 2018-05-09 08:12:13 +00:00
Dmitry Kalinkin
0d78386e21 rivet: switch to graphicsmagick 2018-05-09 03:11:19 -05:00
Dmitry Kalinkin
9b7d3f10e4 graphicsmagick-imagemagick-compat: init at 1.3.28 2018-05-09 03:11:19 -05:00
Frederik Rietdijk
8ff2dca388
Merge pull request #38939 from NixOS/python-unstable 
python.pkgs: pip 9.0.3 -> 10.0.1
 2018-05-09 10:01:25 +02:00
Matthew Justin Bauer
0481467282
Merge pull request #40148 from rkoe/add/ext4magic 
ext4magic: init at 0.3.2
 2018-05-09 06:12:12 +00:00
jD91mZM2
b6f3fcf140
multibootusb: init at 9.2.0 2018-05-09 04:44:42 +02:00
Nathan Smyth
f6e061f62f mongodb-compass: init at 1.13.1 2018-05-09 12:14:37 +10:00
Nick Novitski
2cac5d73ce cloud-sql-proxy: init at 1.11 2018-05-08 16:19:23 -07:00
Matthew Justin Bauer
882e08ced1
unixtools: fixup bad merge 
This should hopefully fix the eval issue.
 2018-05-08 15:37:10 -05:00
davidak
296e7717e0 plank: init at 0.11.4 2018-05-08 22:27:28 +02:00
davidak
4a30fc2522 bamf: init at 0.5.3 2018-05-08 21:52:16 +02:00
Emmanuel Rosa
7936474efc gnucash: restore version 2.4 2018-05-08 10:53:44 -04:00
Matthew Bauer
6748534d83 Merge remote-tracking branch 'upstream/master' into staging 2018-05-08 09:36:00 -05:00
John Ericson
f22bfb38c6
Merge pull request #40161 from ElvishJerricco/ghc-build-packages-integer-simple 
Use build packages GHC for haskell.packages.integer-simple
 2018-05-08 10:33:51 -04:00
Nikolay Amiantov
61a87491dc pacparser: init at 1.3.7 2018-05-08 16:27:55 +03:00
Nikolay Amiantov
d541169e1a wesnoth: unite with wesnoth-dev 
There's no Wesnoth development version now.
 2018-05-08 16:06:30 +03:00
Vincent Ambo
a8768c610e bluemix-cli: init at 0.6.6 (#40147) 
Adds the (non-free, binary) IBM Bluemix CLI which is required to
administrate IBM Bluemix services.
 2018-05-08 09:22:25 +01:00
Joel Burget
5d66a6bbdb 1password: init at version 0.4 (#40158) 2018-05-08 08:23:07 +01:00
Jörg Thalheim
b1c467ad92
Merge pull request #40159 from Ekleog/cargo-fuzz-0.5.3 
cargo-fuzz: init at 0.5.3
 2018-05-08 07:43:40 +01:00
Robert Schütz
6e6005c2af
Merge pull request #38794 from timokau/brial-init 
brial: init at 1.2.3
 2018-05-08 08:08:15 +02:00
Will Fancher
a33756a866 Use build packages GHC for haskell.packages.integer-simple 2018-05-07 23:57:01 -04:00
Léo Gaspard
376c55fcea
cargo-fuzz: init at 0.5.3 2018-05-08 03:36:41 +02:00
Timo Kaufmann
8b5ecf9141 brial: init at 1.2.3 2018-05-08 01:27:35 +02:00
Roland Koebler
b45fa92de6 ext4magic: init at 0.3.2 2018-05-08 00:39:38 +02:00
Michael Raskin
ec198337c4 love_11: init at 11.1 2018-05-07 23:58:24 +02:00
Franz Pletz
11ad518935
pythonPackages.pyowm: init at 2.8.0 2018-05-07 21:37:46 +02:00
Franz Pletz
509a340d90
pythonPackages.coinmarketcap: init at 4.2.1 2018-05-07 21:37:46 +02:00
Franz Pletz
c7d735a27b
pythonPackages.PyMVGLive: init at 1.1.4 2018-05-07 21:37:46 +02:00
Franz Pletz
95928538a5
pythonPackages.aiohue: init at 1.3.1 2018-05-07 21:37:46 +02:00
Patrick Hilhorst
ab0d4f26ff
unixtools: use 2-space indent 2018-05-07 20:16:58 +02:00
Patrick Hilhorst
4b93f21ced
unixtools: refactor for less redundancy 2018-05-07 20:13:55 +02:00
Jörg Thalheim
2326fd2d53
Merge pull request #39404 from dwe11er/wine-vulkan 
wine: add vulkanSupport option
 2018-05-07 16:25:50 +01:00
Jörg Thalheim
ddf902506e
Merge pull request #40116 from Synthetica9/spotify-nognome2 
spotify: Cleanup
 2018-05-07 13:46:57 +01:00
Jörg Thalheim
4c41c182ae
Merge pull request #39504 from markuskowa/soapysdr-pr 
soapysdr+plugins: init at 0.6.1
 2018-05-07 13:44:16 +01:00
Patrick Hilhorst
fcb6a0a56e
spotify: remove/update gnome2 references 
Part of #39976
 2018-05-07 14:04:15 +02:00
Jörg Thalheim
f469f2eae5
Merge pull request #40029 from knedlsepp/fix-pyopengl 
pythonPackages.pyopengl: fix build
 2018-05-07 10:16:35 +01:00
Michael Raskin
903ae1ea14
Merge pull request #40041 from timokau/liblapack-3.8.0 
liblapack: 3.4.1 -> 3.8.0
 2018-05-07 06:27:54 +00:00
Vincent Laporte
a600e0c8a5 ocaml: default to 4.06 on aarch64 (since 4.05 is broken there) 2018-05-07 07:11:11 +02:00
Matthew Justin Bauer
e4997af72b
Merge pull request #39999 from demyanrogozhin/particl 
particl-core: init at 0.16.0.4
 2018-05-07 04:30:39 +00:00
Matthew Justin Bauer
e71c44160b
Merge pull request #39968 from jD91mZM2/xidlehook 
xidlehook: init at 0.4.6
 2018-05-07 04:27:23 +00:00
Timo Kaufmann
ca9ea31ae1 liblapack: 3.4.1 -> 3.8.0 2018-05-06 21:12:01 +02:00
Jan Tojnar
d8e3ce750f
Merge pull request #40009 from jD91mZM2/termplay 
termplay: init at 2.0.4
 2018-05-06 15:34:36 +02:00
jD91mZM2
cf09900bbc
xidlehook: init at 0.4.6 2018-05-06 15:27:25 +02:00
Josef Kemetmüller
f92cf4b93f pythonPackages.pyopengl: fix build 2018-05-06 12:50:22 +00:00