JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,921 Commits 2 Branches 0 Tags 13 GiB
b6036c95d0
Commit Graph

28771 Commits

Author SHA1 Message Date
Michael Raskin
b89d66a198 Merge pull request #23062 from spacefrogg/ptask 
ptask: init at 1.0.0
 2017-03-18 17:21:13 +01:00
Michael Raskin
e8d7014dac Merge pull request #22722 from patternspandemic/kodestudio 
kodestudio: init at 17.1
 2017-03-18 17:18:10 +01:00
David Izquierdo
8547fa1d56 update powerline 2.4 -> 2.5.2 2017-03-18 17:13:23 +01:00
Frederik Rietdijk
e67b979ab5 Merge remote-tracking branch 'upstream/master' into HEAD 2017-03-18 15:32:43 +01:00
Vincent Laporte
959064cfbe ocamlPackages.ppx_deriving_yojson: init at 3.0 
deriving Yojson is a ppx_deriving plugin that generates JSON serializers and
deserializers that use the Yojson library from an OCaml type definition.

Homepage: https://github.com/whitequark/ppx_deriving_yojson
 2017-03-18 12:58:49 +00:00
Steven Taschuk
3edf455269 spambayes: Add bsddb build input 
To reproduce the issue:
```
nix-build -E 'import <nixpkgs> {}' -A python27Packages.spambayes
result/bin/sb_filter.py </dev/null
```
Before this commit, this fails with
```
[...]
  File "/nix/store/vlgr1wrxd2wiw5ay5ch54365dzqvcwgq-python2.7-spambayes-1.1b1/lib/python2.7/site-packages/spambayes/dbmstorage.py", line 20, in open_dbhash
    return bsddb.hashopen(*args)
AttributeError: 'NoneType' object has no attribute 'hashopen'
```
After this commit, it doesn't.
 2017-03-18 08:34:28 -04:00
Michael Raskin
5833da6ad5 wayv: init at 0.3 2017-03-18 12:41:09 +01:00
Michael Raskin
6e74e165cb xannotate: init at 20150301 2017-03-18 12:41:09 +01:00
Michael Raskin
266fb8845a xxdiff-tip: init at 4.0.1.20170111 
Supports Qt5
 2017-03-18 12:41:09 +01:00
Vladimír Čunát
742b120ddc
Merge branch 'master' into staging 
Nontrivial rebuilds from master, again :-/
 2017-03-18 11:00:31 +01:00
Joachim F
9a976c09ba Merge pull request #23963 from dtzWill/feature/irkerd 
irker: init at 2017-02-12
 2017-03-18 00:35:32 +01:00
Michael Fellinger
6cc1200bd5
marathonctl: init at 2017-03-06 2017-03-17 23:10:27 +01:00
Michael Fellinger
acdcbf7b14 phraseapp-client: init at 1.4.3 2017-03-17 21:50:50 +01:00
Thomas Tuegel
354ea69ae4
fontconfig-penultimate: init at 0.2 
Also provides a NixOS module.
 2017-03-17 13:50:05 -05:00
Rodney Lorrimar
0a2ea18e85 pythonPackages.zeep: init at 1.1.0 
Works with both Python 2.7 and 3.5.

Tests won't work under Python 3.5 due to the testtools dependency.
 2017-03-17 18:40:00 +00:00
Emery Hemingway
fa65cc067b
xaster: init at release 208 2017-03-17 12:09:37 -05:00
Emery Hemingway
7196d16e3f
shapelib: init at 1.4.0 2017-03-17 12:09:37 -05:00
Pascal Bach
3728143cbc prometheus-unifi-exporter: init at 0.4.0 2017-03-17 15:41:22 +01:00
Will Dietz
f9f15fff56 irker: init at 2017-02-12 2017-03-17 09:16:18 -05:00
Michael Raskin
b4fd04c395 pygame_sdl2: init at 6.99.10.1227 2017-03-17 14:14:38 +01:00
koral
f6c1133102 ack: 2.14 -> 2.16 2017-03-17 11:01:55 +01:00
Nick Novitski
a3620396fd hostsblock: init at 20161213 2017-03-17 22:07:15 +13:00
Nick Novitski
1fb21ca25c kwakd: init at 0.5 2017-03-17 22:07:15 +13:00
Peter Hoeg
c216a71215 terraform: use generic builder and add 0.9.0 (#23979) 2017-03-17 09:05:16 +00:00
Vincent Laporte
cc012b227f ocamlPackages.functoria: init at 2.0.2 
Functoria is a DSL to describe a set of modules and functors, their
types and how to apply them in order to produce a complete application.

Homepage: https://github.com/mirage/functoria
 2017-03-17 02:39:15 +00:00
Florent Becker
bc26feb1d6 ocamlPackages.ocsigen_toolkit: init at 1.0 2017-03-17 02:09:53 +00:00
ndowens
7e902f5399 umockdev: init at 0.8.13 
umockdev: all-packages cosmetic change
 2017-03-16 18:05:13 -05:00
patternspandemic
bb728268b5
kodestudio: init at 17.1 2017-03-16 15:50:01 -07:00
Daiderd Jordan
00ed0f792e Merge pull request #22897 from timor/couchdb-2.0.0 
couchdb: add support for version 2.0.0
 2017-03-16 22:03:32 +01:00
Jörg Thalheim
989c7c7812 Merge pull request #23823 from orivej/qmetro 
qmetro: init at 0.7.1
 2017-03-16 21:11:00 +01:00
Antoine Eiche
f28fe4cfae
pythonPackages.pycassa: init at 1.11.2 
fixes #23920
 2017-03-16 19:23:39 +01:00
Jörg Thalheim
8e6247844b Merge pull request #23911 from Mic92/taskjuggler 
taskjuggler: remove 2.x series
 2017-03-16 18:24:39 +01:00
Dan Peebles
504b596e55 pythonPackages.pathspec_0_5: init 
The pre-release version of pants needs it. I'll kill the duplicated copy
once the new version of pants is final.
 2017-03-16 11:01:14 -04:00
Frederik Rietdijk
645c2189d1 pythonPackages.pytest-django: unpin setuptools_scm 
- unpin setuptools_scm
- move to file in folder following guidelines
- use PyPI/upstream name
 2017-03-16 12:40:43 +01:00
Peter Hoeg
aca073eb3a pytest-catchlog: init at 1.2.2 2017-03-16 18:19:57 +08:00
Vincent Laporte
49c18cc75d ocamlPackages.bos: init at 0.1.4 
Bos provides support for basic and robust interaction
with the operating system in OCaml.

Homepage: http://erratique.ch/software/bos
 2017-03-16 07:11:33 +00:00
Dan Peebles
e3abe9c6fa pythonPackages.pants13-pre: init 2017-03-15 22:22:02 -04:00
Jörg Thalheim
26045faaaf
cligh: init at 0.3 
fixes #23914
 2017-03-16 01:00:21 +01:00
Jörg Thalheim
09cfbc8cc3
PyGithub: init at 1.32 2017-03-16 00:59:56 +01:00
Jörg Thalheim
00addcb95e
pythonPackages.python-jose: init at 1.3.2 2017-03-16 00:59:56 +01:00
Marius Bergmann
2a65628826 restic: init at 0.5.0 2017-03-15 23:45:42 +01:00
Christopher League
cfc7a1877a clips: init at 6.30 
CLIPS is a language for building expert systems.
 2017-03-16 00:05:02 +02:00
Tuomas Tynkkynen
3c57a37c55 sbt_0_12_4: Fix eval 2017-03-15 23:44:25 +02:00
Vincent Laporte
eba3900781 ocamlPackages.rresult: init at 0.5.0 
Rresult is an OCaml module for handling computation results and errors in an
explicit and declarative manner without resorting to exceptions.

Homepage: http://erratique.ch/software/rresult
 2017-03-15 21:21:27 +00:00
Sergii Paryzhskyi
18a272ef75 sbt-0.12.4: add an older stable version (#23933) 2017-03-15 21:17:23 +00:00
Daiderd Jordan
c8ddac7c76 Merge pull request #23864 from mimadrid/update/ripgrep-0.5.0 
ripgrep: 0.4.0 -> 0.5.0
 2017-03-15 21:42:23 +01: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
Tom Hunger
5a9e14ee16 altair: 1.0.0 -> 1.2.0 
Also disabling tests because the test runner picks up too much and
then fails.
 2017-03-15 18:09:29 +00:00
Leon Isenberg
6505c6e3df keepass-keeagent: init at 0.8.1 
[Bjørn: change fetchurl indent 4 -> 2 spaces.]
 2017-03-15 17:55:57 +01:00
Pascal Bach
a8cca7037e prometheus-fritzbox-exporter: init at 1.0 2017-03-15 17:22:36 +01:00
Daniel Peebles
38a03817b0 Merge pull request #22571 from LnL7/darwin-frameworks-hook 
add setup-hook to fix darwin frameworks
 2017-03-15 11:33:23 -04:00
Daniel Peebles
d78f3de21b Merge pull request #23907 from copumpkin/update-frameworks 
Update macOS frameworks from 10.9 to 10.10
 2017-03-15 11:22:55 -04:00
Maksim Bronsky
97f26ee39a initial release: vulnix 2017-03-15 15:09:19 +01:00
Tom Hunger
90223a9bbd vega: add pytest as a build-input. 
It's unclear how this worked before but it clearly did because we
have vega running in production.
 2017-03-15 12:28:18 +00:00
Tom Hunger
b0115c2fac Logbook: 0.11.3 -> 1.0.0 2017-03-15 12:28:18 +00:00
Jörg Thalheim
61f20c94ca
taskjuggler: remove 2.x series 
The version was released 8 years ago and does not build anymore
 2017-03-15 10:32:55 +01:00
Will Dietz
c766960150 lit: init at 0.5 2017-03-15 09:02:45 +01:00
Dan Peebles
dc61ff31a7 xhyve: update and fix to use our Hypervisor framework 
(this is a cherry-picked version of f3b65f67d9,
which got reverted because it depended on my 10.11 frameworks, which were
flawed)
 2017-03-14 22:38:35 -04:00
Marius Bergmann
ee69ee419b liquid-dsp: init at 20170307 
liquid-dsp is a dependency for the latest git version of inspectrum, therefore I
added it in order to be able to upgrade inspectrum.
 2017-03-14 23:42:18 +01:00
Shea Levy
5fa84fb1a8 terra{form,grunt}: Add some needed old versions 2017-03-14 16:31:08 -04:00
Frederik Rietdijk
a79c653d5d Merge pull request #23885 from FRidh/jupyter 
Jupyter
 2017-03-14 17:32:27 +01:00
Frederik Rietdijk
4a615d90af pythonPackages.pywatchman: disable python 3.x and disable tests 2017-03-14 17:09:20 +01:00
Frederik Rietdijk
6a6d48be4e pythonPackages.dateparser: mark as broken 2017-03-14 17:07:09 +01:00
Frederik Rietdijk
fd68cd4ed7 pythonPackages.pygal: 2.0.10 -> 2.3.1 2017-03-14 16:57:00 +01:00
Herwig Hochleitner
b27dfdbe66 pythonPackages.parsedatetime: 2.1 -> 2.3 2017-03-14 16:46:23 +01:00
Frederik Rietdijk
d7378da028 pythonPackages.configparser: fix with namespace packages 2017-03-14 16:43:46 +01:00
Frederik Rietdijk
4bfa709562 pythonPackages.pytest-virtualenv: 1.1.0 -> 1.2.7 2017-03-14 16:41:07 +01:00
Frederik Rietdijk
c9d9f072e5 pythonPackages.pytest-shutil: 1.1.1 -> 1.2.8 2017-03-14 16:40:52 +01:00
Bart Brouns
5b7b1f7aa4 alot: 0.5 -> 0.5.1 2017-03-14 16:12:35 +01:00
Bas van Dijk
308c09d41f wordpress: security upgrade: 4.7.2 -> 4.7.3 & other improvements (#23837) 
* Moved the wordpress sources derivation to the attribute pkgs.wordpress. This
  makes it easier to override.

* Also introduce the `package` option for the wordpress virtual host config which
  defaults to pkgs.wordpress.

* Also fixed the test in nixos/tests/wordpress.nix.
 2017-03-14 16:11:51 +01:00
Frederik Rietdijk
fc55e80ee7 pythonPackages.ipython_genutils: 0.1.0 -> 0.2.0 2017-03-14 15:41:10 +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
88a3861c7b pythonPackages.pyzmq: 15.2.0 -> 16.0.2 2017-03-14 13:29:02 +01:00
Frederik Rietdijk
db512addef pythonPackages.prompt_toolkit: 1.0.9 -> 1.0.13 2017-03-14 13:29:02 +01:00
Frederik Rietdijk
c7268fa2a9 pythonPackages.pickleshare: 0.5 -> 0.7.4 2017-03-14 13:29:01 +01:00
Frederik Rietdijk
47f77d6104 pythonPackages.pathpy: 8.1.2 -> 10.1 2017-03-14 13:29:01 +01:00
Frederik Rietdijk
bd0a0c7908 pythonPackages.pathlib2: 2.1.0 -> 2.2.1 2017-03-14 13:29:01 +01:00
Frederik Rietdijk
0c11ce6541 pythonPackages.notebook: 4.3.2 -> 4.4.1 2017-03-14 13:29:01 +01:00
Frederik Rietdijk
044014826b pythonPackages.nbformat: 4.2.0 -> 4.3.0 2017-03-14 13:29:00 +01:00
Frederik Rietdijk
fbb30ee46f pythonPackages.jupyter_core: 4.2.1 -> 4.3.0 2017-03-14 13:29:00 +01:00
Frederik Rietdijk
2a1cceac16 pythonPackages.jupyter_client: 4.4.0 -> 5.0.0 2017-03-14 13:28:56 +01:00
Frederik Rietdijk
065383cde8 pythonPackages.ipython: 5.2.1 -> 5.3.0 2017-03-14 13:24:21 +01:00
Nikolay Amiantov
648db95651 python.pkgs.bleach: 1.5.0 -> 2.0.0 
Fixes #23854.
 2017-03-14 12:29:38 +03:00
Peter Hoeg
f09a73896b crudini: init at 0.9 2017-03-14 17:22:56 +08:00
Vincent Laporte
8498f979a1 ocaml-top: 1.1.2 -> 1.1.3 2017-03-14 07:57:59 +00:00
Volth
d4294265fd virt-viewer: 2.0 -> 5.0 2017-03-14 04:54:11 +00:00
Peter Hoeg
80750f459c Merge pull request #17303 from peterhoeg/iio 
iio-sensor-proxy: init at 2.2 and nixos module
 2017-03-14 11:16:09 +08:00
Vladimír Čunát
bfed19cfaa
Merge #23860: llvmPackages_4: rc4 -> release 2017-03-14 00:02:53 +01:00
Vladimír Čunát
57463868db
top-level llvm-4 attrs: drop lowPrio 
Now the packages are properly released.
 2017-03-14 00:01:04 +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
mimadrid
68a1dc6304
rustRegistry: 2017-02-19 -> 2017-03-13 2017-03-13 22:47:10 +01: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
Vincent Laporte
88d7718a64 mkvtoolnix-cli: fix build on darwin 2017-03-13 21:20:26 +00: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
Vincent Laporte
b2b8a412fb ocaml-llvm: 3.7.1 -> 3.9.1 2017-03-13 19:14:11 +01:00
Frederik Rietdijk
8aee2b5c4f pythonPackages.traitlets: 4.3.1 -> 4.3.2 2017-03-13 16:37:25 +01:00
Frederik Rietdijk
891a051df1 ipython_genutils: fix for python 3.3 and 3.4 2017-03-13 16:37:24 +01:00
Domen Kožar
9ab1d08bb0
Add sphinxcontrib-openapi at 0.3.0 2017-03-13 13:25:03 +01:00
Domen Kožar
28d2066063
sphinxcontrib-httpdomain: 1.3.0 -> 1.5.0 2017-03-13 13:25:03 +01:00
Domen Kožar
f32fc9b03e
setuptools_scm: 1.11.1 -> 1.15.0 2017-03-13 13:25:03 +01:00
Peter Hoeg
5fa3b11239 tvnamer: 2.3 -> 2.4 
Also add support for python3
 2017-03-13 17:49:50 +08:00
Peter Hoeg
c1b1da21ea tvdb_api: add support for python3 2017-03-13 17:49:50 +08:00
Peter Hoeg
64fcdf7aa4 requests-cache: 0.4.10 -> 0.4.13 
Also add support for python3
 2017-03-13 17:49:50 +08:00
Pascal Wittmann
d1247221cb Merge pull request #21802 from yurrriq/add/pkgs/tools/misc/latex2html 
latex2html: init at 2016
 2017-03-13 09:20:09 +01:00
Peter Hoeg
d4beeef3ce vlc: compile against qt 5.6 2017-03-13 11:55:45 +08:00
Orivej Desh
bed935bd13 qmetro: init at 0.7.1 2017-03-13 00:37:53 +00:00
Jörg Thalheim
9e6fe2e4f2 Merge pull request #23765 from benley/ykpers-duplicate 
ykpers: consolidate into yubikey-personalization
 2017-03-12 22:26:32 +01:00
Bo Bakker
1d948ddc01
caf: init at 0.15.3 
fixes #23772
 2017-03-12 21:53:49 +01:00
Thomas Tuegel
ce180eb109 Merge pull request #23755 from jerith666/krfb 
krfb: expose kde 5 version
 2017-03-12 13:03:22 -05: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
Ji-Haeng Huh
697838cbea
yasr: init at 0.6.9 
fixes #23188
 2017-03-12 16:59:00 +01:00
Daiderd Jordan
97a3e7cf52
darwin-frameworks: don't use pure CF 2017-03-12 15:19:04 +01:00
Daiderd Jordan
04fa8e006c
darwin: add setup-hook to fix CF references 2017-03-12 15:19:03 +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
Benjamin Staffin
f474f82860 ykpers: consolidate into yubikey-personalization 
Looks like this accidentally got packaged twice.
 2017-03-11 16:23:00 -05:00
Periklis Tsirakidis
7c980f5e9c valgrind: enable darwin build 2017-03-11 20:29:52 +01:00
Matt McHenry
2a9208cd24 krfb: init at 16.12.2 2017-03-11 14:10:11 -05: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
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
Marius Bakke
3051dafeb6
pythonPackages.pyudev: 0.16.1 -> 0.20.0 2017-03-11 15:25:30 +01:00
Joachim F
92b3b9bb3f Merge pull request #23560 from lheckemann/precision-strike 
Precision strike
 2017-03-11 12:07:07 +01:00
Lluís Batlle i Rossell
7aa5effaf6 lzham: init at 1.0 
Compressor.
 2017-03-11 10:00:06 +01:00
Lluís Batlle i Rossell
8ac134321b bsc: init at 3.1.0 
Compressor.
 2017-03-11 10:00:06 +01:00
Franz Pletz
82f1c3fb43
kanboard: init at 1.0.40 2017-03-11 09:12:15 +01:00
Franz Pletz
ff2313a6c6
linux: 3.12.70 -> 3.12.71 2017-03-11 08:14:29 +01:00
David Johnson
26623240e9 Init HaLVM at 2.4.0 2017-03-10 19:31:12 -06:00
Tuomas Tynkkynen
77c49794cd linux_testing: 4.10-rc7 -> 4.11-rc1 
Some config options got removed, so conditionalize them.
 2017-03-11 01:27:06 +02:00
David Johnson
2151e3b8eb
packetdrill: init at 1.0 
Closes https://github.com/NixOS/nixpkgs/pull/23679
 2017-03-10 23:35:26 +01:00
sternenseemann
f3bf3a4318 redo-sh: init at 1.2.6 2017-03-10 21:50:25 +01:00
Vincent Laporte
b34b4674d2 jbuilder: init at 1.0+beta2 
jbuilder is a fast, portable and opinionated build system

Homepage: https://github.com/janestreet/jbuilder
 2017-03-10 20:14:09 +00:00
Joachim Fasting
69ce1ed526 surf-webkit2: init at 2017-03-06 2017-03-10 20:31:20 +01:00
Dan Peebles
7dff6a8689 kubernetes: fix on Darwin 
Also bump its Go version to 1.7, since 1.6 is fatally flawed on macOS 10.12
 2017-03-10 13:31:16 -05:00
Ben Darwin
7baad2e4be c3d: init at 1.1.0 2017-03-10 11:57:19 -05:00
Susan Potter
35f9f63a39 dd-agent: 5.5.2 -> 5.11.2 2017-03-10 17:35:27 +01:00
Susan Potter
17a8d19032 dd-agent: fix Python missing dependencies and versions 2017-03-10 17:35:27 +01:00
Frederik Rietdijk
262993d2b8 Merge pull request #23452 from bcdarwin/edward 
edward: init at 1.2.2
 2017-03-10 17:23:27 +01:00
Robert Scott
b3fadc9085 sops: init at version 2.0.8 2017-03-10 15:41:57 +00:00
zimbatm
1873721fcd luaPackages.mpack: enable darwin platform 
It was working fine but then regressed by
77f5a50c40
 2017-03-10 11:58:42 +00:00
Lancelot SIX
1ca372e4d2
pythonPackages.celery_3: drop 2017-03-10 12:56:27 +01:00
Lancelot SIX
9041f0d8d9
pythonPackages.django-raster: 0.3 -> 0.3.1 2017-03-10 12:51:02 +01:00
Michael Raskin
f3a4f31554 libreoffice-still: apply the patch for ICU 58, see 17126 2017-03-10 09:48:54 +01:00
Dan Peebles
1309b0883d buildbot-plugins: use callPackages, since it contains several 
This should allow Hydra to build those plugins.
 2017-03-10 01:08:01 -05:00
Peter Hoeg
bce352949e virtmanager-qt: init at 0.39.60 2017-03-10 11:08:19 +08:00
Dan Peebles
8e61b7fefa pythonPackages.pyopenssl: disable tests on Darwin 2017-03-09 21:56:54 -05:00
Ben Darwin
57486f21a3 edward: init at 1.2.2 2017-03-09 21:13:11 -05:00
Vladimír Čunát
ed4a79c65e
Merge branch 'master' into staging 
... to fix an evaluation problem in dogecoin.
 2017-03-09 23:14:19 +01:00
Dan Peebles
0b0b3b8021 pythonPackages.webcolors: enable on Darwin and other unixes 
Seemed to work fine on Darwin
 2017-03-09 15:12:33 -05:00
Dan Peebles
a4f8b67783 pythonPackages.funcparserlib: enable on Darwin and other unixes 
Seemed to work fine on Darwin
 2017-03-09 15:12:32 -05:00
Dan Peebles
cdfa92184d pythonPackages.blockdiag: enable on Darwin and other unixes 
Seemed to work fine on Darwin
 2017-03-09 15:12:32 -05:00
Michael Raskin
ccebeca500 libreoffice-still: use icu_57 2017-03-09 18:47:38 +01:00
Michael Raskin
b5485da2cd icu_57: init at 57.1 for LibreOffice Still 2017-03-09 18:47:38 +01:00
Michael Raskin
6962e84b8d botan2: init at 2.0.1 2017-03-09 18:47:37 +01:00
Jörg Thalheim
3c170e505c Merge pull request #23659 from lheckemann/nltk 
nltk: init at 3.2.2
 2017-03-09 14:51:09 +01:00
Linus Heckemann
1fa6ecb48d nltk: init at 3.2.2 2017-03-09 12:46:34 +00:00
Nick Hu
e7a432db1e python-PyQt: 5.6 -> 5.8 2017-03-09 15:38:10 +03:00
Linus Heckemann
603b799bcb Add removeReferencesTo for removing specific refs 
This allows for a less blanket approach than nuke-refs, targetting specific
references that we know we don't want rather than all references that we don't
know we want.
 2017-03-09 12:01:55 +00:00
Jörg Thalheim
eb8b6022ed Merge pull request #23640 from PierreR/master 
pythonPackages.pepper: init at 0.5.0
 2017-03-09 12:05:24 +01:00
Jörg Thalheim
9ce5fb002a Merge pull request #23649 from teh/pyrax 
pyrax: 1.8.2 -> 1.9.8
 2017-03-09 11:06:21 +01:00
Jörg Thalheim
d639498ed9
pythonPackges.pyrax: enable tests 2017-03-09 11:01:58 +01:00
Tom Hunger
a9aeb1039a pyrax: 1.8.2 -> 1.9.8 2017-03-09 09:22:46 +00:00
Tom Hunger
f2480bdb0a rackspace-novaclient: init at 2.1 
Note that I package a number of dependencies that make no sense
outside of rackspace-novaclient. I don't want to pollute the main
namespace with those packages.
 2017-03-09 09:22:45 +00:00
Dan Peebles
ccf7640a4b openjdk: stop defaulting Darwin to version 7 
Let's just be consistent with 8. At some point we'll get a proper build
of it from source but until then we might as well standardize on 8, which
has been out for years now and seems to work fine on Darwin.
 2017-03-08 23:28:45 -05:00
Tuomas Tynkkynen
dc94d1a2b5 release.nix: Fix another typo 2017-03-09 03:38:04 +02:00
Pierre Radermecker
ee4e630648 salt-pepper: init at 0.5.0 2017-03-09 00:18:07 +01:00
Justin Bedo
1ac797861b
SnpEff: init at 4.3i 2017-03-08 22:43:50 +01:00
Justin Bedo
076e513b94
varscan: init at 2.4.2 2017-03-08 22:43:49 +01:00
Justin Bedo
4bb50fd08c
picard-tools: init at 2.7.1 2017-03-08 22:43:45 +01:00
Justin Bedo
7f214e6410
bedtools: init at 2.26.0 2017-03-08 22:36:29 +01:00
Justin Bedo
661048c803
platypus: init at 2017-03-07 2017-03-08 22:36:03 +01:00
Joachim Fasting
116953ffc9
torbrowser: callPackage can fill in missing params from xorg 2017-03-08 20:40:25 +01:00
Tuomas Tynkkynen
9188f2ed8a release.nix: Fix typo 2017-03-08 21:35:31 +02:00
Tuomas Tynkkynen
5f5b87107f raspberrypifw, linux_rpi: 1.20161020 -> 1.20170303 2017-03-08 21:35:31 +02:00
Dan Peebles
4ae5f4d3cc pythonPackages.cryptography: fix test on macOS 10.12 
Hydra didn't notice because it's running 10.11.
 2017-03-08 14:14:40 -05:00
Daniel Peebles
a53d5cfaba Merge pull request #23642 from copumpkin/buildbot-cleanup 
buildbot: assorted cleanups
 2017-03-08 11:29:22 -05:00
Dan Peebles
49b20e5569 buildbot: assorted cleanups 
Some changes to be more idiomatic and use stdenv building blocks more.
I also added a `buildbot.withPlugins` instead of the current plugins
mechanism, which forces an unnecessary rebuild of the package and reruns
all the tests. This should be equivalent and more pleasant to use in
practice.
 2017-03-08 11:28:44 -05:00
Franz Pletz
e3b84d71a6
nixpkgs: add aarch64-linux to release-lib 
cc #23638
 2017-03-08 17:13:34 +01:00
Eelco Dolstra
7a08a44b52 Merge pull request #23638 from grahamc/aarch64-linux 
nixpkgs: build aarch64-linux
 2017-03-08 16:13:58 +01:00
Graham Christensen
bb4c6a7800
nixpkgs: build aarch64-linux 2017-03-08 09:08:31 -05:00
Leon Isenberg
b9c7d291bc haskellPackages: apply GHC specific overrides before GHCJS 
GHCJS is effectively a backend for GHC, so all the GHC version specific package set overrides should in
general apply to the GHCJS package sets, too.
 2017-03-08 13:10:28 +01:00
Ricardo Ardissone
e17d3d4ef1 gplates: use boost 160 
update 161 changed reference parameters for optional
https://hydra.nixos.org/build/49707856/nixlog/1
http://www.boost.org/doc/libs/1_61_0/libs/optional/doc/html/boost_ooptional/relnotes.html
 2017-03-08 13:04:34 +02:00
Peter Simons
722b129652 Merge pull request #23607 from NixOS/haskell/justStaticExecutables 
Haskell/just static executables
 2017-03-08 08:49:19 +01:00
Graham Christensen
ebeb722e14 Merge pull request #23459 from xNWDD/gitkraken 
gitkraken: init at 2.1.0
 2017-03-07 20:17:34 -05:00
Graham Christensen
442fc47cbe Merge pull request #23617 from rycee/delete/old-cassandra 
cassandra: remove old branches 1.2 and 2.0
 2017-03-07 18:55:38 -05:00
Graham Christensen
9e6ae2f60a Merge pull request #23441 from oxij/pkg/pretty-xen 
xen: modular expression
 2017-03-07 18:52:40 -05:00
Vladimír Čunát
b86b7c04a3
Merge branch 'master' into staging 2017-03-07 21:59:32 +01:00
Robert Helgesson
e965d8aa1c
cassandra: remove old branches 1.2 and 2.0 
These are no longer supported upstream.
 2017-03-07 21:54:13 +01:00
Robert Helgesson
ac0021ce53
cassandra_2_2: init at 2.2.9 2017-03-07 21:46:50 +01:00
Domen Kožar
f67a89e248
haskell: use new justStaticExecutables and add purescript 2017-03-07 18:15:07 +01:00
Profpatsch
feab711f84 lilyterm-git: init at 2017-01-06 
The latest stable release is quite old (2013-02) and many improvements have been
made in the meantime.
 2017-03-07 17:35:29 +01:00
NWDD
0aa29fa4d8 gitkraken: init at 2.1.0 2017-03-07 17:25:19 +01:00
Peter Simons
e7b68767a8 nlopt: rescue build by dropping support for Octave 2017-03-07 14:56:46 +01:00
Robin Gloster
09d7f7dfbd
kiwix: fix eval and build 2017-03-07 14:09:33 +01:00
Frederik Rietdijk
70160ff208 Merge pull request #23240 from jyp/tf 
tensorflow: depend on cudatoolkit 8 and cudnn 5.1
 2017-03-07 13:22:07 +01:00
Frederik Rietdijk
b5355c827f Merge pull request #23563 from dtzWill/update/mendeley 
mendeley: 1.16.3 -> 1.17.8, multiple improvements
 2017-03-07 10:22:07 +01:00
Frederik Rietdijk
03504f0150 Merge pull request #23565 from teh/mypy 
Mypy
 2017-03-07 10:09:11 +01:00
Will Dietz
9614ebf137
coccinelle: 1.0.0-r23 -> 1.0.6 
* Remove camlp4 dependency, no longer needed
* Keep pycaml to use ours over bundled version
* Enable tests for sanity (broken on darwin)
* no longer need to force specific ocaml version
* don't create python wrappers, they don't seem to be needed
* remove deprecated configure flag.
* fix spgen by removing bytecode version.
 2017-03-06 17:50:11 -05:00
Graham Christensen
5054035c18 Merge pull request #23571 from rycee/remove/javasvn 
javasvn: remove
 2017-03-06 17:27:53 -05:00
Robert Helgesson
a3e6b41d36
javasvn: remove 
Upstream URL is invalid and the package has not had direct attention
since June 2006.
 2017-03-06 23:07:11 +01:00
Tom Hunger
1a8a194186 mypy-lang: 0.4.5 -> 0.501 and rename to mypy 2017-03-06 21:29:05 +00:00
Tom Hunger
18f1127f05 typed-ast: init at 1.0.1 2017-03-06 21:29:05 +00:00
Jörg Thalheim
b10fb4624b
xapian-ruby: link against correct xapian 2017-03-06 20:24:07 +01:00
Will Dietz
37315d65a0 mendeley: 1.16.3 -> 1.17.8, multiple improvements 
* don't use bundled qt
* fix link-handler script, autorun as 'normal'
* fix execution on grsec kernels
 2017-03-06 13:20:00 -06:00
Profpatsch
07bf113bbe garden-of-coloured-lights: init at 1.0.9 2017-03-06 19:37:24 +01:00
AndersonTorres
9ef30ce570
dvdstyler: init at 3.0.3 2017-03-06 17:36:28 +01:00
AndersonTorres
1205b27b24
wxSVG: init at 1.5.11 2017-03-06 17:36:20 +01:00
pngwjpgh
4da7f83f4e nitpick: Init at 1.1 (#23389) 2017-03-06 16:12:49 +01:00
Jörg Thalheim
7576bea49d Merge pull request #23551 from nthorne/clog-derivation 
clog-cli: init at 0.9.2
 2017-03-06 14:54:12 +01:00
Parnell Springmeyer
8d6fbd0578
go: 1.7 -> 1.8 2017-03-06 08:47:50 -05:00
Jörg Thalheim
d971a9bcca Merge pull request #23548 from yurrriq/update/pkgs/misc/lilypond/with-fonts 
lilypond: add openlilylib-fonts and lilypond-with-fonts
 2017-03-06 14:37:20 +01:00
timor
f40b961378 couchdb: add support for version 2.0.0 
Version 2.0.0 is installed as a separate package called "couchdb2".
When setting the config option "package" attribute to pkgs.couchdb2, a
corresponding service configuration will be generated.  If a previous
1.6 installation exists, the databases can still be found on the local
port (default: 5986) and can be replicated from there.

Note that single-node or cluster setup still needs to be configured
manually, as described in
http://docs.couchdb.org/en/2.0.0/install/index.html.
 2017-03-06 11:42:02 +01:00
Jörg Thalheim
290297ecd5 Merge pull request #23526 from oxij/pkg/speedread 
speedread: init at git-2016-09-21
 2017-03-06 11:26:45 +01:00
Niklas Thörne
ae38cdad26 clog-cli: init at 0.9.2 2017-03-06 11:15:35 +01:00
Eric Bailey
0f40d2dea3
latex2html: init at 2016 2017-03-06 04:01:25 -06:00
Eric Bailey
bdc9589df1
lilypond: add openlilylib-fonts and lilypond-with-fonts 2017-03-06 02:16:42 -06:00
Julien Dehos
78ede3ab1f hieroglyph: init at 0.7.1 2017-03-06 00:10:59 +01:00
Michiel Leenaars
b5bb83b273
sha1collisiondetection: init at 1.0.1 
Closes https://github.com/NixOS/nixpkgs/pull/23114
 2017-03-05 18:59:28 +01:00
Jan Malakhovski
27367d6347 speedread: init at git-2016-09-21 2017-03-05 15:07:22 +00:00
Jan Malakhovski
916fa0a610 xen: rewrite build expression to be more modular, support upstream qemu and seabios 
Also:

* provides a bunch of build options
* documents build options config in longDescription
* provides a bunch of predefined packages and documents them some more
* sources' hashes stay the same
 2017-03-05 13:59:28 +00:00
Jan Malakhovski
1c8940a2b8 qemu: add xen support 2017-03-05 13:59:28 +00:00
Théo Zimmermann
12a00b51b3 coq: default version 8.4pl6 -> 8.6 2017-03-05 14:14:24 +01:00
Théo Zimmermann
9eec461890 coq_8_4: ocaml dependency 4.01 -> 4.02 2017-03-05 14:14:24 +01:00
zraexy
49ea0e2736 eclipse: Do not use webkitgtk2 by default 
Tell callPackage to not include webkitgtk2 due to the fact that it has
multiple vulnerabilities.
 2017-03-05 11:33:17 +01:00
Peter Hoeg
3f34000358 xca: build against qt 5.6 as 5.7 segfaults 2017-03-05 09:41:29 +08:00
Peter Hoeg
4618585e5e qsyncthing: build against qt 5.6 as 5.7 segfaults 2017-03-05 09:39:55 +08:00
Thomas Tuegel
46ba7cf94a
lyx: pin to Qt 5.7 
Build fails with Qt 5.8 due to an ambiguous overloaded member function.
 2017-03-04 15:08:47 -06:00
Thomas Tuegel
cd7d8a60b4
qt58: init at 5.8.0 
Qt 5.8 is now the default version.
 2017-03-04 15:08:47 -06:00
Frederik Rietdijk
dc2bf68d7b pythonPackages.sympy: disable tests 2017-03-04 14:29:28 +01:00
rnhmjoj
9b6164ffb9 kaitaistruct: init at 0.6 2017-03-04 12:58:29 +02:00
Frederik Rietdijk
f8e5b8dbe2 pythonPackages.jupyter: set priority 
in order to prevent a collision.
 2017-03-04 08:19:13 +01:00
Vincent Laporte
5a0c577d32 ocamlPackages.async_unix: init at 113.33.00+4.03 2017-03-04 04:59:22 +00:00
Vincent Laporte
d3899a2495 ocamlPackages.async_kernel: init at 113.33.00 2017-03-04 04:54:51 +00:00
Nikolay Amiantov
4a6ba21bdd liferea: 1.10.19 -> 1.12-rc2 
It's a release candidate but it works with new WebKitGTK and we don't build old
one anymore because of vulnerabilities.
 2017-03-04 01:03:53 +03:00
Joachim Schiele
d6b0c87bda tlspool: init at 20170123 (#23437) 2017-03-03 17:38:33 +01:00
Pradeep Chhetri
6c99a31c89 httplab: init at 0.1.0 2017-03-03 17:35:31 +01:00
Alistair Bill
0904cf034c proselint: init at 0.8.0 2017-03-03 16:25:41 +00:00
Ji-Haeng Huh
85d0348e2a
eflite: init at 0.4.1 
fixes #23336
 2017-03-03 16:33:16 +01:00
Jörg Thalheim
bcef9f83c0 Merge pull request #23444 from nand0p/pylint-1.6.5 
Pylint 1.6.5
 2017-03-03 15:52:32 +01:00
Robin Gloster
fc57e634f3
scid: fix build 2017-03-03 15:18:08 +01:00
Fernando J Pando
f40b0f5e37 astroid: 1.4.4 -> 1.4.9 2017-03-03 08:46:46 -05:00
Fernando J Pando
6be140d621 pylint: 1.5.4 -> 1.6.5 
- tested on nixos
- tested on darwin
 2017-03-03 08:37:42 -05:00
Vladimír Čunát
913aae40ba
luajitPackages.mpack.meta.broken = true 
It seems only to link succesfully to vanilla lua.
http://hydra.nixos.org/build/49554613
 2017-03-03 14:10:18 +01:00
Robin Gloster
bb9a37a2a5
ikarus: remove 
unmaintained, only works on 32 bit
 2017-03-03 13:43:04 +01:00
Lancelot SIX
a25c93994b Merge pull request #23094 from veprbl/for_upstream 
pythonPackages: add pyhepmc, graphviz; bump rootpy
 2017-03-03 09:42:55 +01:00
Peter Simons
09a593b3de Drop obsolete, unmaintained haskell.packages.lts-x_y package sets. 
Stack no longer uses them since a long time: https://github.com/commercialhaskell/stack/issues/2259.
 2017-03-03 09:27:32 +01:00
Vladimír Čunát
92f454e73c
Merge #23408: llvm: 4.0rc2 -> 4rc3 
and rename attributes 4.0 -> 4
 2017-03-03 08:15:35 +01:00
Will Dietz
6f6c06adc1 llvm4.0: Rename "4.0" (and _40) to "4" (and _4). 
This reflects upstream versioning change, and allows
us to replace 4.0 with 4.1 (which is now a minor revision)
without changing the attribute name.

Thanks to @vcunat for the idea.
 2017-03-02 17:19:44 -06:00
Nikolay Amiantov
cb13a8c5f8 openspades: 0.0.12 -> 0.1.1b 
Remove openspades-git, it's not needed now that there was a release.
 2017-03-03 00:34:36 +03:00
Jörg Thalheim
53b059ade5
miniupnpc: switch to old version by default 
miniupnpc 2.0.20161216 change its api
 2017-03-02 19:30:37 +01:00
Robin Gloster
306eb6ded0
d4x: remove 
removed in debian in 2010
 2017-03-02 13:20:59 +01:00
Andreas Herrmann
5a68d5484e blitz: switch back to boost-1.60 
The build fails with boost-1.62.
More specifically, the test of the boost-serialization integration fails
due to the protected destructor in the class template `MemoryBlock`.
 2017-03-02 11:40:59 +01:00
Dmitry Kalinkin
ac51822ee8
pythonPackages.python-sybase: init at 0.40pre2 2017-03-01 22:53:41 -05:00
Dmitry Kalinkin
2198a7c747
pythonPackages.graphviz: init at 0.5.2 2017-03-01 22:53:41 -05:00
Dmitry Kalinkin
e60805061b
pythonPackages.pyhepmc: init at 0.5.0 2017-03-01 22:53:40 -05:00
Ben Darwin
05359c327b ANTs: init at 2.1.0 (0gyys1lf) 2017-03-01 21:06:30 -05:00
Lancelot SIX
247408d26f
pythonPackages.dateutil: 2.5.3 -> 2.6.0 2017-03-01 21:54:34 +01:00
Robert Helgesson
337356448a
perl-Log-Log4perl: 1.48 -> 1.49 2017-03-01 20:12:24 +01:00
Vladimír Čunát
b43614a6bb
Merge branch 'staging' 
(Truly, this time :-)
 2017-03-01 11:34:44 +01:00
John Chee
bb46cde859 zstdmt: init at 0.3 2017-03-01 00:11:31 +00:00
Nikolay Amiantov
2e80b50a7e cura, curaengine: 14.04 -> 2.4.0 
Move old Cura to {cura,curaengine}_stable
 2017-03-01 02:23:18 +03:00
Nikolay Amiantov
868794010f python.pkgs.uranium: init at 2.4.0 2017-03-01 02:23:18 +03:00
Nikolay Amiantov
e3a6a1fc0e python.pkgs.libarcus: init at 2.4.0 2017-03-01 02:23:18 +03:00
Nikolay Amiantov
b6cba9ae3f python.pkgs.zeroconf: init at 0.18.0 2017-03-01 02:23:18 +03:00
Nikolay Amiantov
834471985e python.pkgs.enum-compat: init at 0.0.2 2017-03-01 02:23:18 +03:00
Nikolay Amiantov
6c5cbfd091 python3.pkgs.protobuf3_0: fix build 
I spent some time trying to fix tests instead but have no idea what happens.
 2017-03-01 02:14:21 +03:00
Daiderd Jordan
e0ed902b50 Merge pull request #23204 from yurrriq/add/pkgs/applications/audio/musescore-darwin 
musescore: add darwin-specific package
 2017-02-28 23:18:10 +01:00
Franz Pletz
bfa067179e
multisync: remove, no release in > 10 years 
Upstream suggests to use opensync.

cc #23253
 2017-02-28 19:17:47 +01:00
Franz Pletz
c4fd85a451
phpPackages.redis22: not supported with php >= 7 
cc #23253
 2017-02-28 18:35:40 +01:00
Jörg Thalheim
6405bbe867
cantata: 1.5.1 -> 2.0.1 2017-02-28 17:45:58 +01:00
Robin Gloster
8ddfbe34bc
libjson_rpc_cpp_0_2_1: remove 2017-02-28 17:15:04 +01:00
Robin Gloster
efd9331333
libjson-rpc-cpp: 0.6.0 -> 0.7.0, fix build 2017-02-28 17:15:04 +01:00
Lancelot SIX
a9d404c616
pythonPackages.libais: init at 0.16 2017-02-28 16:41:54 +01:00
Robin Gloster
be84f410cd
libcm: remove 
umaintained, broken and not used for 10 years
 2017-02-28 16:06:23 +01:00
Nikolay Amiantov
d7ecf89580 opensubdiv: 3.0.5 -> 3.2.0 
Also remove cudatoolkit override as we have cudatoolkit = cudatoolkit8 now.
 2017-02-28 17:22:06 +03:00
Lancelot SIX
5c8a8c888a Merge pull request #23044 from lsix/channels_updates 
updates pythonPackages.channels and dependencies
 2017-02-28 14:22:16 +01:00
Lancelot SIX
bc935b0d16 Merge pull request #23234 from lsix/update_django_rest_framework 
pythonPackages.djangorestframework: 3.2.3 -> 3.5.4
 2017-02-28 14:21:45 +01:00
Robert Helgesson
86b840d8c9
perl-Data-FormValidator: 4.81 -> 4.85 2017-02-28 09:33:17 +01:00
Eric Bailey
22404a068f
musescore: add darwin-specific package 
This is basically a clone of the Homebrew cask version:
https://github.com/caskroom/homebrew-cask/blob/master/Casks/musescore.rb
 2017-02-27 20:58:22 -06:00
Daniel Peebles
1f779398c9 Merge pull request #20444 from NeQuissimus/java_packages 
Java packages
 2017-02-27 20:04:56 -05:00
Lluís Batlle i Rossell
9e7ce9010c
lzbench: init at 20170208 
In-memory benchmark of several up-to-date compressors.

Signed-off-by: Lluís Batlle i Rossell <viric@viric.name>
 2017-02-27 22:42:40 +01:00
Dmitry Kalinkin
fa8afc05c0
pythonPackages.rootpy: 0.8.3 -> 0.9.0 2017-02-27 15:40:01 -05:00
Vladimír Čunát
a1919db7cd
Merge branch 'master' into staging 2017-02-27 20:15:27 +01:00
Thomas Tuegel
6542ea7f31
qt5: 5.6.2 -> 5.7.1 2017-02-27 11:50:08 -06:00
Thomas Tuegel
6a115a247c
Export KDE packages at top level 2017-02-27 11:50:07 -06:00
Thomas Tuegel
b58b07f903
mkLibsForQt5: Inherit libraries from Plasma 5 and KDE Applications 2017-02-27 11:50:06 -06:00
Thomas Tuegel
127bf18a35
extra-cmake-modules: Lift Qt dependency 2017-02-27 11:49:46 -06:00
Thomas Tuegel
8be4bd7416
kdeApplications: Move out of desktops/kde-5 
- There is no such thing as KDE 5
 2017-02-27 11:49:30 -06:00
Thomas Tuegel
e50ba70411
plasma5: Hide internal plasmaPackage deriver 2017-02-27 11:49:28 -06:00
Thomas Tuegel
fca3f2e661
kdeFrameworks: Hide internal kdeFramework deriver 2017-02-27 11:49:27 -06:00
Thomas Tuegel
68e0bc38a2
Move kdeWrapper out of kdeFrameworks 2017-02-27 11:49:21 -06:00
Thomas Tuegel
d446303d0b
Move kdeDerivation out of kdeFrameworks 2017-02-27 11:49:16 -06:00
Thomas Tuegel
c650dc8bd7
kirigami_2: Do not mix Qt versions! 2017-02-27 11:49:15 -06:00
Thomas Tuegel
e39a4597ce
mkLibsForQt5: remove kdeFrameworks attribute 2017-02-27 11:49:13 -06:00
Thomas Tuegel
7f84ad5f4c
plasma5: Move to desktops/plasma-5 2017-02-27 11:49:12 -06:00
Thomas Tuegel
8eb4d2afbc
Remove top-level kde5 attribute 
- There is no such thing as KDE 5
 2017-02-27 11:49:10 -06:00