William A. Kennington III
b452bd40e1
Merge pull request #6602 from codyopel/ffmpegbr
...
ffmpeg: refactor to generic
2015-03-08 15:23:55 -07:00
Pascal Wittmann
228183f4f1
Merge pull request #6313 from matthiasbeyer/add-khal
...
Add package: khal
2015-03-08 21:22:12 +00:00
Domen Kožar
17a44e5013
Merge pull request #6717 from sjagoe/package-python-grin
...
Add grin package
2015-03-08 21:58:23 +01:00
Simon Jagoe
f4965177b5
Move grin definition to tools/text and call it from all-packages.nix
2015-03-08 20:10:40 +00:00
Simon Jagoe
ab6a03e706
Place grin in Python 2.7 section; it is not Python 3.x compatible
2015-03-08 17:09:11 +00:00
Simon Jagoe
02fdd38400
Add grin package
2015-03-08 16:38:31 +00:00
Vladimír Čunát
3d0a6819da
wmutils-core: add to tools/X11 ( close #6585 )
...
@vcunat fixed and cleaned this a little.
2015-03-08 15:46:02 +01:00
Andraz Brodnik
2d8f7883a9
Add scrolls game (unfree). Close #6456 .
...
@vcunat added today's date as version.
2015-03-08 15:37:33 +01:00
lethalman
0a83c2a2a9
Merge pull request #6697 from ardumont/add-tuxguitar
...
[new] tuxguitar derivation
2015-03-08 11:54:57 +01:00
Antoine R. Dumont
00fb3c0b7e
Add tuxguitar derivation
2015-03-08 10:22:56 +01:00
Bob van der Linden
08ea20df65
git-cola: add package
2015-03-08 01:39:29 +01:00
Benjamin Staffin
ed6ce446d0
euca2ools: bump to 2.1.4, use python27
...
Change-Id: I8be644bcf2892e1146c3b3eedea36c5f5e749c16
2015-03-07 14:06:08 -08:00
Benjamin Staffin
65d6eb0f20
docker-registry: update to 0.9.1
2015-03-07 14:06:08 -08:00
Benjamin Staffin
5113a065d7
boto: Apply patch needed to fix docker-registry
...
This makes docker-registry work when backed by S3. It's the same patch
applied in the docker upstream container image.
Backported from boto/boto#2932
2015-03-07 14:06:08 -08:00
Arseniy Seroka
1a25b83c6b
Merge pull request #6695 from matthiasbeyer/add-hstr
...
Add package: hstr (hh)
2015-03-07 18:45:42 +03:00
Matthias Beyer
425110dea6
Add package: hstr (hh)
2015-03-07 14:50:14 +01:00
Carles Pagès
2bc4f5c149
SDL2_ttf: add version 2.0.12
2015-03-07 14:35:19 +01:00
Shea Levy
e57e44f867
llvm-3.6 packages: Build everything (except clang and llvm) with clang
2015-03-07 13:08:34 +00:00
Robert Scott
211f1b826f
osrm-backend: add a luajit variant
2015-03-07 11:26:46 +00:00
Fedor Pakhomov
eb8105ad01
Separated DDCcontrol-DB declaration from DDCcontrol declaration
2015-03-07 01:10:46 +03:00
William A. Kennington III
a00e19ceb9
samba4: Remove explicit libiconv specification
2015-03-06 11:59:05 -08:00
Vincent Laporte
116ddda218
Adds ocaml-enumerate
...
Quotation expanders for enumerating finite types in OCaml.
2015-03-06 20:29:07 +01:00
Shea Levy
c62b5456f5
Merge branch 'llvm-3.6' of git://github.com/Ralith/nixpkgs into llvm-3.6-merge
...
LLVM, clang, and lldb 3.6iLLVM, clang, and lldb 3.6
Conflicts:
pkgs/top-level/all-packages.nix
2015-03-06 19:10:10 +00:00
Shea Levy
6b53021205
Merge branch 'master' into staging
2015-03-06 19:02:36 +00:00
Lluís Batlle i Rossell
d1e302121a
Merging changes to make more things build on rpi2
2015-03-06 15:43:32 +00:00
Eelco Dolstra
bf0aa66c17
Only test evaluation on supported platforms
2015-03-06 14:07:45 +01:00
Ambroz Bizjak
5f76d08865
polkit: Use spidermonkey-17.
...
The old version doesn't build for ARMv7.
(cherry picked from commit 5fe72cafffb22749520dd03a18bb862a37cca8b3)
2015-03-06 09:11:11 +00:00
Tobias Geerinckx-Rice
40e4ebbb57
python-packages: pgcli 0.16.0 -> 0.16.1
2015-03-06 03:48:40 +01:00
Tobias Geerinckx-Rice
22080d1951
Add x2goclient 4.0.3.2
...
Thanks to Christoph-Simon Senjak <c s s at u x u l dot d e>
2015-03-06 03:48:40 +01:00
Tobias Geerinckx-Rice
2a93bee7f3
Add nxproxy 3.5.0-2015-02-18
...
Thanks to Christoph-Simon Senjak <c s s at u x u l dot d e>
2015-03-06 03:48:40 +01:00
Tobias Geerinckx-Rice
47712a21bd
Add libxcomp 3.5.0-2015-02-18
...
Thanks to Christoph-Simon Senjak <c s s at u x u l dot d e>
2015-03-06 03:48:39 +01:00
Eric Seidel
6b60f3dcad
Merge pull request #6641 from oxij/emacs-ng
...
Somewhat more generic emacs packages' builder and a bunch of new emacs packages and metas
2015-03-05 13:22:45 -08:00
Arseniy Seroka
268a355988
Merge pull request #6633 from ts468/enlightenment
...
Update: Enlightenment + EFL
2015-03-05 23:58:37 +03:00
Peter Jones
ff42e0ae7f
2.0.0-rc2 -> 2.0.0, add CardDAV support
2015-03-05 13:23:02 -07:00
Nikolay Amiantov
c532beeb0d
sddm: add package
2015-03-05 20:49:26 +03:00
Matthias Beyer
c6ab53e9db
Add package: scim
2015-03-05 18:04:11 +01:00
Jeff Simpson
2b0a3cd085
Added choqok build
2015-03-05 07:11:57 -07:00
Peter Simons
1d953779b0
Merge remote-tracking branch 'origin/master' into staging.
2015-03-05 12:24:57 +01:00
Lluís Batlle i Rossell
9d8c26efae
Add comment explaining the rpi2 gcc flags.
2015-03-05 10:00:21 +00:00
Ambroz Bizjak
c1b803ba0e
Cut down on the gcc flags for raspberrypi2.
2015-03-05 09:23:24 +00:00
Lluís Batlle i Rossell
56989d9f20
Updating the raspberry pi kernel sources to recent, for pi2
2015-03-05 09:09:32 +00:00
Lluís Batlle i Rossell
1c7fc46ee5
Adding the raspberrypi2 platform.
2015-03-05 09:09:30 +00:00
Sou Bunnbu
f6796bd7b9
Merge pull request #6654 from taktoa/master
...
Added Numix/Numix-Circle icon theme and Numix GTK theme
2015-03-05 14:59:59 +08:00
Benjamin Saunders
de89820f69
Add LLVM 3.6 to all-packages
2015-03-04 22:45:04 -08:00
Remy Goldschmidt
8a732aecb8
Fixed licenses, fixed platform, renamed packages
2015-03-05 00:23:18 -06:00
William A. Kennington III
7915060d79
samba4: Remove broken glusterfs comment
2015-03-04 17:32:04 -08:00
William A. Kennington III
936fdc7b68
samba4: 4.1.17 -> 4.2.0 YOLO
2015-03-04 17:17:26 -08:00
William A. Kennington III
c5dce2def0
uid_wrapper: Add derivation
2015-03-04 16:48:52 -08:00
William A. Kennington III
88c01c5647
socket_wrapper: Add derivation
2015-03-04 16:48:52 -08:00
William A. Kennington III
3e4fa69a90
nss_wrapper: Add derivation
2015-03-04 16:48:51 -08:00
Remy Goldschmidt
7648cb2456
Added Numix GTK theme, removed unnecessary ls -lah in Numix/Numix-Circle icon themes
2015-03-04 18:00:25 -06:00
Vladimír Čunát
7e042659b7
plymouth: hacky fix build (automake-related)
2015-03-04 22:02:09 +01:00
Vladimír Čunát
856d1ff27f
more build fixups concerning automake defaults
2015-03-04 22:01:11 +01:00
Vincent Laporte
651a4c4e6e
Adds ocaml-fileutils
...
ocaml-fileutils is a library of pure OCaml functions to manipulate real
files and filenames.
Homepage: http://ocaml-fileutils.forge.ocamlcore.org/
2015-03-04 13:15:53 +01:00
Domen Kožar
768594a1e1
teamviewer: add 10, set it as default
2015-03-04 10:44:28 +01:00
Remy Goldschmidt
3876279b10
Added Numix/Numix-Circle icon theme
2015-03-03 20:15:30 -06:00
Dan Peebles
0e752c9427
Add preliminary hologram
2015-03-03 20:03:50 -05:00
Dan Peebles
d8d6551321
Add goamz
2015-03-03 20:03:50 -05:00
Dan Peebles
7c0788531a
Add rgbterm
2015-03-03 20:03:50 -05:00
Dan Peebles
2f0597b4f3
Add sets
2015-03-03 20:03:50 -05:00
Dan Peebles
0ef91cc0d5
Add slices
2015-03-03 20:03:50 -05:00
Dan Peebles
d769ee4013
Add raw
2015-03-03 20:03:49 -05:00
Dan Peebles
1767e28bde
Add ldap
2015-03-03 20:03:49 -05:00
Dan Peebles
f5725d813f
Add go-ini
2015-03-03 20:03:49 -05:00
Dan Peebles
f7bf541276
Add go-homedir
2015-03-03 20:03:49 -05:00
Dan Peebles
8154129876
Add gox
2015-03-03 20:03:49 -05:00
Dan Peebles
babc8c12fa
Add g2s
2015-03-03 20:03:49 -05:00
Dan Peebles
ecb804c505
Add asn1-ber
2015-03-03 20:03:48 -05:00
Dan Peebles
d7c7b3bea0
Modernize go crypto
2015-03-03 20:03:48 -05:00
Dan Peebles
57250fc2cc
Enable cgo on darwin
2015-03-03 20:03:48 -05:00
Vincent Laporte
c6d31ad722
Adds ocaml-base64
...
Base64 encoding and decoding in OCaml
Homepage: https://github.com/mirage/ocaml-base64
2015-03-03 17:10:49 +01:00
Jan Malakhovski
6e59fa4941
add meta descriptions to a bunch of emacs packages
2015-03-03 16:02:19 +00:00
Jan Malakhovski
380389bc0b
update and convert {apel, flim, semi, wanderlust} to emacs packages
2015-03-03 16:02:18 +00:00
Jan Malakhovski
8dd923a2e4
add smex emacs package
2015-03-03 16:02:18 +00:00
Jan Malakhovski
59ebcccc59
add nyan-mode emacs package
2015-03-03 16:02:17 +00:00
Jan Malakhovski
34e69a2572
add ido-ubiquitous emacs package
2015-03-03 16:02:17 +00:00
Jan Malakhovski
e7061857c1
add browse-kill-ring emacs package
2015-03-03 16:02:16 +00:00
Jan Malakhovski
de6e14f331
add anzu emacs package
2015-03-03 16:02:16 +00:00
Jan Malakhovski
e3f6e475b7
add agda emacs package wrapper
2015-03-03 16:02:15 +00:00
Jan Malakhovski
e4a4e109ba
refactor Emacs packages'/modes' builders
...
This simplifies melpa builder by merging with it my old emacs modes builder,
adds better instructions and support for overrides in emacs-packages.nix,
and renames some emacs-related stuff in all-packages.nix for sanity reasons.
I declare this backwards compatible since direct uses of emacsPackages in
configuration.nix are very unlikely.
2015-03-03 16:02:15 +00:00
Thomas Strobel
f431f73964
Update: Enlightenment + EFL
...
EFL: 1.12.3 -> 1.13.1
Enlightenment: 1.19.3 -> 1.19.4
2015-03-03 11:29:12 +01:00
Jan Malakhovski
a444eff3f2
reorganize emacs related files
2015-03-03 05:31:38 +00:00
Jan Malakhovski
2c32576a91
add emacs-modes/{apel, flim, semi, wanderlust}
2015-03-03 05:31:38 +00:00
Georges Dubus
9e59c9ad84
Merge pull request #6623 from woehr/master
...
Upgrade Rust compiler
2015-03-02 21:38:29 +01:00
Peter Simons
5341196f01
Merge branch 'master' into staging.
2015-03-02 21:10:36 +01:00
Jordan Woehr
5821e91bd1
Restructure rustc derivations for ease of updating.
...
Update racerRust to use new rustcMaster and upgrade cargoSnapshot so racer builds.
2015-03-02 12:40:55 -07:00
Arseniy Seroka
7ce77b5752
slurm: add pkg
2015-03-02 22:10:58 +03:00
Vincent Laporte
7365907de5
Adds ocaml-io-page
...
This OCaml library implements support for efficient handling of I/O
memory pages on Unix and Xen.
Homepage: https://github.com/mirage/io-page
2015-03-02 11:26:03 +01:00
Eelco Dolstra
ea0d6a7fc0
Add CUDA toolkit 6.5
2015-03-02 00:24:00 +01:00
Vincent Laporte
d8912db092
ocsigen-deriving: update from 0.6.2 to 0.7
2015-03-01 17:53:51 +01:00
Tobias Geerinckx-Rice
b7b54b0539
pgcli 0.15.4 -> 0.16.0
2015-03-01 14:08:54 +01:00
Matthias Beyer
90b74276cb
Add package: khal
2015-03-01 13:39:23 +01:00
lethalman
186765e0e3
Merge pull request #6590 from iand675/noip2
...
Add noip package
2015-03-01 12:30:37 +01:00
Robert Scott
7476de722b
luabind: add patch to allow us to discover a provided luajit
2015-02-28 22:37:16 +00:00
Domen Kožar
362ba73ac6
vlc: 2.1.5 -> 2.2.0
2015-02-28 23:24:10 +01:00
codyopel
6ed1d9f525
ffmpeg: refactor to generic
...
* migrate some branches from ffmpeg.config.<optional>, now allows version specific configuration
* Added optionals for most features
* Added qt-faststart executable
* Licensing corrections
* Added dependencies
+ celt
+ faad2
+ flite
+ frei0r-plugins
+ fribidi
+ game-music-emu
+ gsm
+ jack2
+ ladspa-sdk
+ libavc1394
+ libbluray
+ libbs2b
+ libcaca
+ libmodplug
+ libogg
+ libraw1394
+ libssh
+ libwebp
+ libxcb
+ lzma
+ openal
+ opencl
+ opengl
+ openh264
+ openjpeg
+ openssl
+ pulseaudio
+ rtmpdump
+ samba
+ soxr
+ v4l-utils
+ vid.stab
+ wavpack
+ libX11
+ libXv
+ wavpack
+ x265
+ xavs
+ xvidcore
+ zeromq
* Outlines support for: (unpackaged/broken dependencies)
+ aacplus
+ avisynth
+ crystalhd
+ blackmagic-design-desktop-video
+ flite
+ ilbc
+ libavc1394
+ libcdio-paranoia
+ libiec61883
+ libmfx
+ libnut
+ nvenc (nvidia)
+ opencl
+ opencore-amr
+ openh264
+ oss
+ libquvi
+ schroedinger
+ shine
+ twolame
+ utvideo
+ vo-aacenc
+ vo-amrwbenc
+ zvbi
2015-02-28 12:12:25 -05:00
Jaka Hudoklin
63caf0538c
Merge pull request #6588 from mbakke/rofi
...
New package: rofi
2015-02-28 12:23:35 +01:00
Rok Garbas
f54a63ed32
pythonPackages.py3status: requests2 is needed for many plugins
2015-02-28 01:24:35 +01:00
Vincent Laporte
f57163265b
Adds ocaml-erm_xmpp
...
OCaml based XMPP implementation
Homepage: https://github.com/ermine/xmpp
2015-02-27 18:37:20 +01:00
Marius Bakke
fe1243cc8e
Rofi: update to 0.15.2
...
requires >=automake-1.14
2015-02-27 16:06:35 +00:00
Marius Bakke
dd29e43add
new package: rofi
2015-02-27 15:37:12 +00:00
lethalman
452107dd7c
Merge pull request #6573 from desiderius/master
...
python-packages: updates for existing packages and new ones
2015-02-27 13:22:56 +01:00
desiderius
053122def0
python-packages: disables the test phase for elasticsearch-dsl
...
The test fails with:
ImportError: No module named test_elasticsearch_dsl
2015-02-27 12:42:05 +01:00
Luca Bruno
a7879236bd
mysql-workbench: fix build using libctemplate 2.2
2015-02-27 12:10:25 +01:00
Arseniy Seroka
2f674d85af
Merge pull request #6555 from ts468/xpra
...
Fix/update Xpra
2015-02-27 14:07:21 +03:00
Luca Bruno
adba4b5fad
fusesmb: use samba3
2015-02-27 10:59:13 +01:00
Ian Duncan
71ab1792c4
Add noip2 package
2015-02-27 04:30:08 +00:00
Vladimír Čunát
fefe6d6983
trustedGrub: fix build by using older automake (again)
2015-02-26 20:24:09 +01:00
lethalman
f91fbe3117
Merge pull request #6570 from prikhi/fix-pillow-33
...
python pillow: fix expression for python3.3
2015-02-26 17:27:35 +01:00
desiderius
a80e6b0eca
python-packages: add elasticsearch-dsl-0.0.3
2015-02-26 17:25:28 +01:00
desiderius
70eb7cf012
python-packages: add pytest-cov-1.8.1
2015-02-26 17:17:01 +01:00
Pavan Rikhi
eacaba303f
python pillow: fix expression for python3.3
2015-02-26 11:07:01 -05:00
desiderius
37a90efc45
python-packages: update cov-core-1.7 to 1.15.0
2015-02-26 17:05:53 +01:00
Tobias Geerinckx-Rice
e071b6d71b
python-packages: pygments 2.0.1 -> 2.0.2
2015-02-26 16:13:40 +01:00
desiderius
486ee6e252
python-packages: update coverage-3.6 to 3.7
2015-02-26 16:08:21 +01:00
lethalman
69d3adbf3d
Merge pull request #6425 from grwlf/siptools
...
Siptools
2015-02-26 15:00:17 +01:00
desiderius
94024b4c7d
python-packages: add elasticsearch-1.4.0
2015-02-26 14:58:09 +01:00
desiderius
d480e06262
python-packages: add pyaml-15.02.1
2015-02-26 14:33:50 +01:00
desiderius
4607e0711c
python-packages: add nosexcover-1.0.10
2015-02-26 14:04:33 +01:00
desiderius
1fe1f73089
python-packages: add falcon-0.2
2015-02-26 13:41:43 +01:00
desiderius
56a8ab137c
python-packages: add ddt-1.0.0
2015-02-26 13:39:42 +01:00
desiderius
3970bfdd29
python-packages: add python3-pika-0.9.14
2015-02-26 11:54:35 +01:00
lethalman
dd8c7afcf0
Merge pull request #6565 from rushmorem/cassandra-2.0
...
Add cassandra 2.0
2015-02-26 11:52:36 +01:00
rushmorem
925f5798f5
Add cassandra 2.0
...
According to the project website (http://cassandra.apache.org )
version 2.0 is the most stable version. It's the one that's
recommended if you are already in production or going into
production soon.
Cassandra 2.0 is also the version that's officially supported
by Titan (http://thinkaurelius.github.io/titan ), a distributed
graph database that uses cassandra as one of it's backends.
2015-02-26 12:38:53 +02:00
Eelco Dolstra
6177710ac7
Merge pull request #6046 from ts468/xen
...
Update: Xen 4.5 + NixOS Xen modules
2015-02-26 10:15:05 +01:00
lethalman
92bbf0f76c
Merge pull request #6412 from olavks/lua-cjson
...
Add lua package for json module written in C
2015-02-26 10:01:58 +01:00
lethalman
c0b75a5785
Merge pull request #6443 from bstrik/master
...
dockapps for windowmaker
2015-02-26 10:00:01 +01:00
lethalman
222725d062
Merge pull request #6495 from psibi/python-wtf-patch
...
new package: wtforms
2015-02-26 09:46:39 +01:00
lethalman
3f38be2f10
Merge pull request #6482 from auntieNeo/nkf-master
...
Packaged nkf (network kanji filter)
2015-02-26 09:44:53 +01:00
lethalman
d791335ac2
Merge pull request #6518 from ehmry/u9fs
...
U9fs
2015-02-26 09:41:18 +01:00
Vincent Laporte
de3924a1a8
Adds ocaml-asn1-combinators
...
An OCaml library of combinators for expressing ASN.1 grammars.
Homepage: https://github.com/mirleft/ocaml-asn1-combinators
2015-02-26 08:35:05 +01:00
Thomas Strobel
3d4fbb874c
Update: add new Xen versions + update NixOS Xen modules
...
Versions of XEN:
- Xen 4.5
- Xen 4.5 + XenServer patches
- Xen 4.4.1
2015-02-25 23:30:44 +01:00
William A. Kennington III
961ea0f492
mongodb: Support boost 1.57
2015-02-25 11:28:42 -08:00
Peter Simons
d6c295e469
Merge remote-tracking branch 'origin/master' into staging.
2015-02-25 20:18:28 +01:00
Eelco Dolstra
9788cbb2de
Re-enable Darwin builds
2015-02-25 19:27:30 +01:00
vbgl
8db9bd23fa
Merge pull request #6423 from DamienCassou/update-requests2
...
requests2 2.4.3 -> 2.5.1
2015-02-25 14:59:47 +01:00
Domen Kožar
6919be40bd
Merge pull request #6549 from desiderius/python-sphinx-contrib
...
python-packages: update sphinxcontrib
2015-02-25 09:29:15 +01:00
Domen Kožar
9214859fd2
Revert "Mark many packages (mostly python) broken because of broken dependencies."
...
This reverts commit bf86758a42
.
See 71a9aa10ca25f5659a657d8910e11f36c3439a36
2015-02-25 09:23:31 +01:00
Domen Kožar
67f9edc98e
Revert "python-packages.nix: updated 'disabled' attributes to reduce the number of evaluation errors in http://hydra.nixos.org/jobset/nixpkgs/trunk#tabs-errors "
...
This reverts commit a250e9b908
.
See 71a9aa10ca25f5659a657d8910e11f36c3439a36
2015-02-25 09:23:31 +01:00
Mateusz Kowalczyk
cc4a5073e2
Resurrect openjpeg 2.0.x and use it for mupdf
...
mupdf doesn't compile with 2.1 due to API changes
cc @codyopel who made the openjpeg update
2015-02-25 01:50:06 +00:00
Arseniy Seroka
ae8eb54c8b
Merge pull request #6499 from avnik/xkbcomp-fix
...
Proper default path for XKB config files
2015-02-25 04:46:59 +03:00
Thomas Strobel
c6ef0727c3
Fix/update Xpra
2015-02-25 01:09:39 +01:00
Thomas Tuegel
030eed8307
Merge branch 'dropbox'
2015-02-24 15:59:14 -06:00
Rok Garbas
d378324166
pythonPackages.py3status: new package, status bar for i3 window manager
2015-02-24 22:05:05 +01:00
William A. Kennington III
dbaf941212
Merge pull request #6422 from codyopel/libinput
...
libinput: refactor & add optional dependencies
2015-02-24 11:47:45 -08:00
Alexander V. Nikolaev
a1ca3dbd08
Fix build for perl-Alien-Wx and friends
...
This should fix at least one problem, preventing build master on
Travis-CI.
2015-02-24 21:38:29 +02:00
desiderius
e32643d7cb
python-packages: add sphinxcontrib-plantuml-0.5
...
- Tested with Python 2.6, 2.7, 3.3 and 3.4.
- Fails with pypy due to issue #6548 .
2015-02-24 16:33:14 +01:00
Peter Simons
a250e9b908
python-packages.nix: updated 'disabled' attributes to reduce the number of evaluation errors in http://hydra.nixos.org/jobset/nixpkgs/trunk#tabs-errors
2015-02-24 15:23:45 +01:00
desiderius
22f365d654
python-packages: update sphinxcontrib-httpdomain-1.1.9 to 1.3.0
...
- Tested with Python 2.6, 2.7, 3.3 and 3.4.
- Fails with pypy due to issue #6548 .
2015-02-24 15:18:10 +01:00
Thomas Tuegel
32643c010e
dropbox: update to 3.2.6 (fixed)
2015-02-24 06:51:13 -06:00
Lluís Batlle i Rossell
dfe8d7ecd8
Adding ddar, unix de-duplicating archiver.
...
(cherry picked from commit d93c6ffa10d778782ec774b51e5814917e600a5e)
2015-02-24 12:54:21 +01:00
codyopel
ac2ed3818c
libinput: refactor & add optional dependencies
2015-02-24 02:39:31 -05:00
William A. Kennington III
ee41f35c40
Merge pull request #6490 from codyopel/openjpegbr
...
openjpeg: refactor to generic, add 1.x & 2.0.0 -> 2.1.0
2015-02-23 22:02:56 -08:00
Nicolas B. Pierron
7699f34c52
Merge pull request #6242 from nbp/issue-6161
...
Issue #6161 - Add tests for NixOS modules.
2015-02-23 12:12:01 -08:00
Nathaniel Baxter
aa91480f45
pythonPackages.libvirt: fix python executable path
2015-02-23 20:09:54 +01:00
Nathaniel Baxter
0be8418275
libvirt: update from 1.2.9 to 1.2.12
...
libvirt-glib: update from 0.1.9 to 0.2.0
pythonPackages.libvirt: update from 1.2.9 to 1.2.12
Potentially fixes CVE-2014-7823 CVE-2015-0236
2015-02-23 20:09:54 +01:00
Edward Tjörnhammar
a46065ce80
idea.android-studio: 1.1.0b2 -> 1.1.0
...
add androidsdk as dependency
set ANDROID_HOME for android-studio wrapper
2015-02-23 19:51:18 +01:00
Arseniy Seroka
82c280c5b5
xkblayout-state: add pkg
2015-02-23 20:49:04 +03:00
Arseniy Seroka
2550304bb6
Merge pull request #6524 from fkz/master
...
add edbrowse to all packages
2015-02-23 19:43:39 +03:00
Domen Kožar
8e4a8494be
Merge pull request #6494 from psibi/new-python-sibi-patch
...
new package: passlib
2015-02-23 15:56:43 +00:00
Sibi
fcc379070f
new package: wtforms
2015-02-23 19:02:44 +05:30
Peter Simons
bf86758a42
Mark many packages (mostly python) broken because of broken dependencies.
2015-02-23 14:06:24 +01:00
Jaka Hudoklin
d84a4f5699
nodePackages: add a few packages, remove deprecated, regenerate, fix them
2015-02-23 13:29:50 +01:00
Jaka Hudoklin
a869c8351c
Merge pull request #6475 from rushmorem/marathon-fix
...
Fix marathon package
2015-02-23 13:09:12 +01:00
Jaka Hudoklin
284046cebc
Merge pull request #6510 from offlinehacker/pkgs/libsass/add
...
Add libsass
2015-02-23 13:07:11 +01:00
lethalman
6b71d166aa
Merge pull request #6529 from jcbrand/lpty
...
Add new lua package: lpty
2015-02-23 11:24:38 +01:00
lethalman
ff98a8c24c
Merge pull request #6513 from valeriangalliat/nodejs-iojs-libuv-shared
...
Shared libuv in io.js and Node.js
2015-02-23 11:10:05 +01:00
JC Brand
263e530b6e
Add new lua package: lpty
...
http://www.tset.de/lpty/
2015-02-23 10:44:17 +01:00
Lluís Batlle i Rossell
781666da50
octave: generate the documentation
...
I find octave quite unusable, without its help pages. Recently it started to
require gnuplot to generate them (even the text-only).
I also enabled parallel building. A comment from 2012 said about spurious
failures if it were enabled, but I don't know if these happen again. Let's
enable it to see.
(cherry picked from commit a6f1024b1f2235825d7b441125db2e0d42febdd1)
Conflicts:
pkgs/top-level/all-packages.nix
2015-02-23 10:29:42 +01:00
Vincent Laporte
176e38f6f2
Adds ocaml-cstruct
...
Cstruct is a library and syntax extension to make it easier to access
C-like structures directly from OCaml. It supports both reading and
writing to these structures, and they are accessed via the Bigarray
module.
Homepage: https://github.com/mirage/ocaml-cstruct
2015-02-23 09:57:31 +01:00
Fabian Schmitthenner
8a74fa7723
add edbrowse to all packages
2015-02-22 23:11:01 +00:00
Eduard Bachmakov
0e9a0c9913
mesa: big update, and related improvements ( close #6367 )
...
* Remove upstreamed patch
* EGL driver dirs are no longer a thing, see mesa commit
407450eb84f5a1b466a2eff19b85cdee7ac15dfb
Patching runtime search dir in sources instead (by vcunat).
* static-gallium patch dropped as it causes visibility issues with
nouveau
* rtti patch dropped as it the relevant configuration has been removed
upstream; properly fixed by an LLVM flag now
* Checks disabled. This is known and solved upstream. Checks will be
re-enabled in a future commit when updating to a version containing
the fixes
* Use llvm-3.5 now (by vcunat).
2015-02-22 20:08:08 +01:00
Eduard Bachmakov
c0def4a169
llvm-3.5: enable RTTI to support mesa
...
Extracted from #6367 .
2015-02-22 20:03:14 +01:00
Vladimír Čunát
a112709b02
automake: use 1.14.* as the default
...
I see 1.15 has been released recently,
but that's probably too new to be the default.
2015-02-22 20:01:02 +01:00
Emery Hemingway
3f02885d06
u9fs: initial package
2015-02-22 12:13:14 -05:00
Shaun Bruce
c2c561ad4d
Added pymongo-2.8 python package
2015-02-22 08:03:45 -07:00
Robert Scott
4147050550
add a (slightly naive) packaging of osrm-backend and its missing dependencies
2015-02-22 14:34:24 +00:00
cillianderoiste
d44573e16f
Merge pull request #6469 from rushmorem/jshon-package
...
Add jshon package
2015-02-22 14:10:08 +01:00
cillianderoiste
3440039769
Merge pull request #6493 from bcdarwin/teyjus
...
new package: teyjus 2.0-b2
2015-02-22 13:58:11 +01:00
Valérian Galliat
43f02f27a0
Shared libuv in io.js and Node.js
2015-02-22 12:41:33 +01:00
lethalman
fb41f0302e
Merge pull request #6234 from valeriangalliat/iojs
...
Add io.js
2015-02-22 12:26:22 +01:00
Ambroz Bizjak
dd4e1d4225
avr-gcc-with-avr-libc: Update to latest versions.
...
Also modernize the Nix expression.
2015-02-22 12:17:35 +01:00
Jaka Hudoklin
8de806ebd4
Add libsass
2015-02-22 12:03:06 +01:00
Ben Darwin
63d61cee7f
teyjus: 2.0-b2
2015-02-21 19:55:24 -05:00
Ambroz Bizjak
11fce52c7c
gcc-arm-embedded: Update to 4.9-2014q4.
2015-02-21 23:48:58 +01:00
Arseniy Seroka
c71f19f8c0
Merge pull request #6502 from ehmry/makebootfat
...
makebootfat: initial package at version 1.4
2015-02-22 01:17:38 +03:00
Emery Hemingway
142a5ce2b3
makebootfat: initial package at version 1.4
...
http://advancemame.sourceforge.net/boot-readme.html
2015-02-21 16:56:02 -05:00
Arseniy Seroka
f54a3a462e
Merge pull request #6489 from benley/mesos-dns
...
New package: mesos-dns
2015-02-22 00:26:20 +03:00
Arseniy Seroka
cbac300134
Merge pull request #6464 from suvash/add-mosquitto-broker
...
Add Mosquitto MQTT server package
2015-02-22 00:25:14 +03:00
Thomas Tuegel
ac2c57ea2c
poppler_qt5: use Qt 5.4
2015-02-21 13:54:22 -06:00
Thomas Tuegel
8cf78bf5f4
update various packages to use Qt 5.4
2015-02-21 11:39:20 -06:00
Thomas Tuegel
95b13b1155
add media-player-info
2015-02-21 11:39:19 -06:00
Thomas Tuegel
2e7bf4ff60
remove kde-frameworks-5.5 and kde-frameworks-5.6
2015-02-21 11:39:19 -06:00
Thomas Tuegel
5dcab4fcf3
add kde-frameworks-5.7
2015-02-21 11:39:19 -06:00
Thomas Tuegel
2e38240c95
add qt-5.4
2015-02-21 11:39:18 -06:00
Thomas Tuegel
69ff7ab541
remove plasma-5.1
2015-02-21 11:39:18 -06:00
Suvash Thapaliya
81588746aa
Add Mosquitto MQTT server package
...
as of now it is just built and copied to the right place so that
the server can be run. hopefully i will be tweaking with the
configuration files in the future and tweak this a bit more
2015-02-21 11:38:51 +01:00
Sibi
c8ae0b77f3
new package: passlib
2015-02-21 15:09:21 +05:30
Valérian Galliat
c56256709b
Add io.js
2015-02-21 09:06:24 +01:00
codyopel
f10a8f8501
openjpeg: refactor to generic, add 1.x & 2.0.0 -> 2.1.0
2015-02-20 22:20:19 -05:00
Benjamin Staffin
d382667537
New package: mesos-dns
2015-02-20 17:11:49 -08:00
Benjamin Staffin
2290dbb843
Update goPackages.dns to a more recent commit
...
Old: 2014-07-15
New: 2015-02-20, with many bugfixes and improvements and test coverage.
2015-02-20 17:11:48 -08:00
Carles Pagès
1aed33f68b
homebank: update to 5.0.0
2015-02-20 23:16:29 +01:00
Bjørn Forsman
c22435e70d
clang-analyzer: align attrname with pkgname
2015-02-20 22:30:51 +01:00
Bjørn Forsman
97875ac175
bridge-utils: align attrname with pkgname
2015-02-20 22:30:51 +01:00
Jonathan Glines
30061d3971
Packaged nkf (network kanji filter)
2015-02-20 14:23:08 -07:00
Domen Kožar
d67ba6c5ab
Merge pull request #6431 from psibi/new-python-sibi-patch
...
new package: pybcrypt
2015-02-20 12:49:13 -08:00
William A. Kennington III
29fc0daa27
protobuf: Mark as disabled on py3k and fix python executable references
2015-02-20 11:17:08 -08:00
William A. Kennington III
a959cc91cf
google_apputils: Keep disabled on py3k
2015-02-20 11:16:44 -08:00
William A. Kennington III
c21991d478
google_apputils: Update to 0.4.1
2015-02-20 11:14:41 -08:00
William A. Kennington III
f58c96149d
protobuf: Fix python build
2015-02-20 10:36:16 -08:00
rushmorem
b0277e5b0d
Fix marathon package
2015-02-20 18:28:11 +02:00
Luca Bruno
cc837a974b
sqlalchemy9: disable for pypy
2015-02-20 14:15:35 +01:00
Luca Bruno
7620fdb3ac
sympy: disable for pypy
2015-02-20 14:11:25 +01:00
Luca Bruno
3225bf25b9
more-itertools: disable for py3k
2015-02-20 14:10:54 +01:00
Luca Bruno
1d09c1fd34
audiotools: disable for py3k
2015-02-20 14:10:49 +01:00
Luca Bruno
e0703e0d67
seeks: use protobuf 2.5
2015-02-20 14:07:58 +01:00
Shea Levy
830c76d6ba
Merge branch 'xen_kernel' of git://github.com/ts468/nixpkgs
...
Add kernel config form dom0 of Xen
2015-02-20 07:49:46 -05:00
Peter Simons
9e4166328c
Merge pull request #6458 from fpletz/package/screen-message
...
Add new package screen-message
2015-02-20 13:27:51 +01:00
Vincent Laporte
49114dec1f
Adds ocaml-ocplib-endian
...
This OCaml library provides optimised functions to read and write
int16/32/64 from strings, bytes and bigarrays, based on primitives added
in version 4.01.
Homepage: https://github.com/OCamlPro/ocplib-endian
2015-02-20 11:37:32 +01:00
Rickard Nilsson
43c6f913a5
Merge pull request #6442 from 4z3/exim
...
exim: add version 4.85 incl. nixos module
2015-02-20 11:07:06 +01:00
tv
86cb16965a
exim: add version 4.85 incl. nixos module
2015-02-20 10:49:15 +01:00
Damien Cassou
bc58f50eab
Merge pull request #6338 from DamienCassou/plm-2.5
...
New package PLM: Programmer's Learning Machine
2015-02-20 09:17:27 +01:00
rushmorem
fa24a296be
Add jshon package
...
Jshon is a JSON parser designed for maximum convenience within the
shell (http://kmkeen.com/jshon ).
2015-02-20 10:10:43 +02:00
Domen Kožar
a76b53b06b
Merge pull request #6339 from psibi/pythonmagick-fix
...
Integrate mailchimp.
2015-02-20 07:22:15 +01:00
Sibi
af7c1baf95
new package: Mailchimp python module
2015-02-20 04:31:25 +05:30
Vladimír Čunát
7d129a88a5
merge #5333 : altcoins: a new category of applications
...
Conflicts (openssl override moved to pkgs/applications/altcoins/default.nix):
pkgs/top-level/all-packages.nix
2015-02-19 23:36:41 +01:00
Fedor Pakhomov
0738edc1fd
added ddccontrol package
2015-02-20 00:49:31 +03:00
Arseniy Seroka
f5ee15d694
Merge pull request #6453 from k0ral/prosody
...
prosody: added luaevent dependency
2015-02-19 23:42:01 +03:00
koral
a57ec23d55
prosody: added luaevent dependency.
2015-02-19 21:07:23 +01:00
Franz Pletz
6265123f7a
Add new package screen-message
2015-02-19 19:19:33 +01:00
William A. Kennington III
e574da83de
wayland: Always build documentation
2015-02-19 09:57:16 -08:00
William A. Kennington III
2cbd639b2a
graphviz-nox: Actually build without any deps on mesa or x11
2015-02-19 09:56:50 -08:00
Jaka Hudoklin
77235e24bf
Merge pull request #6454 from rushmorem/mesos-marathon-squashed
...
New package: Mesos marathon framework (updated)
2015-02-19 14:12:25 +01:00
Benno Fünfstück
e47675db6a
cutecom: new expression
2015-02-19 13:34:31 +01:00
rushmorem
74b40e9a43
Add marathon mesos framework
2015-02-19 13:30:00 +02:00
William A. Kennington III
47f9a276c3
graphviz: Add a no x dependency version
2015-02-18 18:15:51 -08:00
William A. Kennington III
f94d0c3aa7
ctl: Update to 1.5.2
2015-02-18 18:03:34 -08:00
Vincent Laporte
324324b024
Adds ocaml-erm_xml
...
XML Parser for discrete data
Homepage: https://github.com/ermine/xml
2015-02-18 22:21:53 +01:00
bstrik
6920d4fbeb
dockapps for windowmaker
2015-02-18 21:53:47 +01:00
Joel Taylor
1b0409896e
add fetch-bower to node-packages
2015-02-18 11:38:33 -08:00
Arseniy Seroka
4880416b31
Merge pull request #6439 from mvcisback/uncertainties
...
Add uncertainties python package
2015-02-18 22:31:26 +03:00
Marcell Vazquez-Chanlatte
7e4e671c54
Add uncertainties python package
2015-02-18 11:29:40 -06:00
tv
61f074028b
qprint: add version 1.1
2015-02-18 18:22:44 +01:00
lethalman
ee612198e7
Merge pull request #6400 from puffnfresh/package/consul-template
...
Add consul-template package
2015-02-18 15:29:42 +01:00
Sibi
efbd73dc4c
new package: pybcrypt
2015-02-18 18:08:13 +05:30
Sergey Mironov
0a006c78bf
dhcpdump: add the tool
2015-02-18 11:52:20 +03:00
Sergey Mironov
b7adfe0e7d
sipp: add the package
2015-02-18 11:52:14 +03:00
Sergey Mironov
4fea283349
sipcmd: add the command-line SIP client
2015-02-18 11:52:05 +03:00
Sergey Mironov
ef3dbaa69a
utf8proc: add the library
2015-02-18 11:51:11 +03:00
Damien Cassou
3ae27db166
requests2 2.4.3 -> 2.5.1
2015-02-18 08:51:41 +01:00
Damien Cassou
ae0263f960
Merge pull request #6420 from DamienCassou/deactivate-simpleparse-on-python3
...
Disable simpleparse on python3 and pypy
2015-02-18 07:38:03 +01:00
Damien Cassou
6938b79de8
Disable simpleparse on python3 and pypy
2015-02-18 07:35:54 +01:00
Dan Peebles
ecf662efc6
Flip cctools and cctools cross
2015-02-18 00:24:33 -05:00
Eric Seidel
9f84592160
Merge pull request #6250 from gridaphobe/emacs-melpa
...
add package.el-based emacs package builder
2015-02-17 20:32:28 -08:00
Eric Seidel
d2a987d6e3
fix travis evaluation by providing explicit libiconv for the rare cases
...
that need it, like uclibc
2015-02-17 20:10:26 -08:00
Olav
3904d5445d
Add lua package for cjson
2015-02-18 00:40:14 +00:00
Eric Seidel
76a501acdb
reorganize emacs packages and add some meta info
2015-02-17 15:08:55 -08:00
Eric Seidel
39c647c218
add package.el-based emacs package builder
2015-02-17 13:21:12 -08:00
Arseniy Seroka
0e63ac0acf
Merge pull request #6402 from codyopel/xavs
...
xavs: add package
2015-02-17 23:42:01 +03:00
Bjørn Forsman
ea6a9a2281
speedtest-cli: align attrname with pkgname
2015-02-17 20:14:10 +01:00
Shea Levy
2f061ff16b
Merge remote-tracking branch 'origin/staging'
...
Darwin and haskell fixes.
2015-02-17 13:52:37 -05:00
codyopel
be0b4050aa
xavs: add package
2015-02-17 13:29:48 -05:00
Brian McKenna
69e75d0bfb
Add consul-template package
2015-02-17 11:19:14 -07:00
Arseniy Seroka
e13b0a8bb1
Merge pull request #6396 from codyopel/wavpack
...
wavpack: add package
2015-02-17 16:05:21 +03:00
Damien Cassou
453c26abe7
Merge pull request #6397 from DamienCassou/simpleparse
...
Add the simpleparse python package
2015-02-17 13:43:38 +01:00
Damien Cassou
a45acf1b29
Add the simpleparse python package
2015-02-17 13:42:31 +01:00
codyopel
1435e69758
wavpack: add package
2015-02-17 07:29:04 -05:00
lethalman
e24004fea9
Merge pull request #6377 from ehmry/mawk
...
mawk: initial package at 1.3.4-20141206
2015-02-17 12:06:21 +01:00
Domen Kožar
3dbde25855
Merge pull request #6381 from olavks/numpyfix
...
Numpy: remove slow building and little used math library for more commonly used openblas
2015-02-17 11:13:58 +01:00
Damien Cassou
8be35e6efe
Merge pull request #6391 from DamienCassou/update-pylint-astroid
...
update pylint, astroid, six, and logilab-common
2015-02-17 11:08:37 +01:00
Damien Cassou
c9b4cb56ae
update pylint, astroid, six, and logilab-common
...
pylint 1.4.0 -> 1.4.1
astroid 1.3.2 -> 1.3.4
six 1.8.0 -> 1.9.0
logilab-common 0.61.0 -> 0.63.2
2015-02-17 11:02:31 +01:00
William A. Kennington III
aeb0db3def
Merge pull request #6383 from codyopel/vid-stab
...
vid-stab: add package
2015-02-16 21:59:16 -08:00
codyopel
534332eaf7
vid-stab: add package
2015-02-17 00:54:23 -05:00
Marcell Vazquez-Chanlatte
7ad16801b0
moreItertools package had typo
2015-02-16 23:41:22 -06:00
William A. Kennington III
7dda2b30dd
Merge pull request #6373 from mvcisback/moreItertools
...
Added more-itertools-2.2 python package
2015-02-16 20:47:53 -08:00
Tobias Geerinckx-Rice
a8ddd89f82
all-packages: move my first packages to correct ### SECTIONs
2015-02-17 05:33:40 +01:00
Olav
380bd3f48a
Numpy: Replace ATLAS and liblapack with openblas (that has blas and lapack).
...
Was previously with ATLAS [Automatically Tuned Linear Algebra Software].
This takes ages and has little to no performance benefit over openblas+lapack.
And if you need this performance, you should really built it against your own hardware.
2015-02-17 03:59:27 +00:00
Marcell Vazquez-Chanlatte
5e328ef690
fix indentation
2015-02-16 21:30:21 -06:00
Emery Hemingway
71ad263151
mawk: initial package at 1.3.4-20141206
2015-02-16 18:57:57 -05:00
Antoine R. Dumont
172d78923b
Add microscheme derivation
...
(A Scheme subset for Atmel microcontrollers.)
Use of the actual git HEAD because the actual tarball compiles but
segfault at runtime.
Upload the BLINK.ms sample on arduino board (/dev/ttyACM0):
```sh
$ sudo ./result/bin/microscheme -m UNO -d /dev/ttyACM0 -auc ~/repo/perso/microscheme/examples/BLINK.ms
Microscheme 0.8, (C) Ryan Suchocki
>> Treeshaker: After 4 rounds: 84 globals purged! 22 bytes will be
reserved.
>> 18 lines compiled OK
>> Assembling...
>> Uploading...
avrdude: AVR device initialized and ready to accept instructions
Reading | ################################################## | 100%
0.00s
avrdude: Device signature = 0x1e950f
avrdude: reading input file
"/home/tony/repo/perso/microscheme/examples/BLINK.hex"
avrdude: writing flash (2080 bytes):
Writing | ################################################## | 100%
0.35s
avrdude: 2080 bytes of flash written
avrdude: safemode: Fuses OK (E:00, H:00, L:00)
avrdude done. Thank you.
>> Cleaning Up...
>> Finished.
```
2015-02-16 23:09:48 +01:00
James Cook
6daf9aa922
Merge pull request #5995 from ts468/qemu-vm
...
Update QEMU Nixos Virtual Machine
2015-02-16 13:13:26 -08:00
Marcell Vazquez-Chanlatte
3c06b41c26
Added more-itertools-2.2 python package
2015-02-16 13:57:44 -06:00
Thomas Strobel
eb97dc0013
Add kernel config for dom0 of Xen
2015-02-16 20:52:06 +01:00
Thomas Strobel
80afabd5b5
Update QEMU Nixos Virtual Machine
...
The Nixos Qemu VM that are used for VM tests can now start without
boot menu even when using a bootloader.
The Nixos Qemu VM with bootloader can emulate a EFI boot now.
2015-02-16 20:07:42 +01:00
Vincent Laporte
f31d4b6adb
Adds ocaml-top
...
OCaml-Top is a simple cross-platform OCaml code editor built for
top-level evaluation.
Homepage: http://www.typerex.org/ocaml-top.html
2015-02-16 13:31:13 +01:00
Marcell Vazquez-Chanlatte
5c62f143c1
Added python package funcy-1.4
2015-02-16 00:50:50 -06:00
William A. Kennington III
c295e51728
Merge pull request #6362 from mvcisback/parsimonious
...
Add python package parsimonoius 0.6.0
2015-02-15 22:47:17 -08:00
Marcell Vazquez-Chanlatte
dbcbe712dd
Add python package parsimonoius 0.6.0
2015-02-16 00:41:30 -06:00
Cillian de Róiste
16bc8564c3
Add ttfautohint: an automatic hinter for TrueType fonts
2015-02-15 22:32:15 +01:00
AndersonTorres
f19ed980a2
Sawfish (git): New Package
...
Sawfish is a versatile, Lisp-based window manager
In that commit I include all Sawfish stack:
- librep, a lisp system;
- rep-gtk, bindings for gtk
- sawfish, the window manager
2015-02-15 19:42:53 +03:00
Arseniy Seroka
750c09c967
Merge pull request #6356 from AndersonTorres/lolcode
...
LOLcode(version 0.10.5): New Package
2015-02-15 17:05:08 +03:00
Domen Kožar
765c8f4dff
Merge pull request #6355 from nathanielbaxter/dev/flexget
...
pythonPackages.flexget: update to 1.2.278
2015-02-15 12:20:44 +01:00
AndersonTorres
71299b9120
LOLcode(version 0.10.5): New Package
...
LOLcode is an esoteric programming language, composed of LOLspeaks.
2015-02-15 08:58:42 -02:00
Nathaniel Baxter
b3a866fd24
pythonPackages.flexget: update to 1.2.278
2015-02-15 21:51:34 +11:00
Wout Mertens
2e4b5ba1ea
Merge pull request #6346 from wmertens/rdfind
...
rdfind: Add new package
2015-02-15 08:27:29 +01:00
codyopel
b03ded550f
lame: move to libraries & fix license
2015-02-14 19:06:38 -05:00
Wout Mertens
f80ae41a7d
rdfind: Add new package
...
refined is a very fast duplicate file finder/remover/hardlinker.
2015-02-14 23:19:46 +01:00
William A. Kennington III
69a277e2cc
iwlegacy: Remove since it is already in linux-firmware-nonfree
2015-02-13 14:27:47 -08:00
William A. Kennington III
58a04a9359
kernel: 3.14.32 -> 3.14.33
2015-02-13 13:42:20 -08:00