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

23030 Commits

Author SHA1 Message Date
Eelco Dolstra
843f21fd6a nss: Update to 3.17.4 2015-02-24 18:50:04 +01:00
Eelco Dolstra
3facd6b66d sqlite: Update to 3.8.7.4 2015-02-24 18:42:16 +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
codyopel
ac2ed3818c libinput: refactor & add optional dependencies 2015-02-24 02:39:31 -05:00
Michel Kuhlmann
3e87b82fe2 gdal: enabling geos 
In order to use ogr2ogr for clipping, this options needs to be
enabled.
 2015-02-24 08:35:34 +01: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
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
Bjørn Forsman
6afc1907c8 Fix eval 
Fixes this:

$ nix-env -f . -qa \* --meta --xml --drv-path --show-trace >/dev/null
...
error: while querying the derivation named ‘pypy2.5-graph-tool-2.2.36’:
while evaluating the attribute ‘preConfigure’ of the derivation ‘pypy2.5-graph-tool-2.2.36’ at "/home/bfo/nixpkgs/pkgs/development/python-modules/graph-tool/2.x.x.nix":5:3:
attribute ‘sitePackages’ missing, at "/home/bfo/nixpkgs/pkgs/development/python-modules/graph-tool/2.x.x.nix":22:54
 2015-02-23 19:45:05 +01:00
Jaka Hudoklin
97ea4ab54e nodePackages: add namePrefix parameter to override package name prefix 2015-02-23 14:27:38 +01:00
Peter Simons
bf86758a42 Mark many packages (mostly python) broken because of broken dependencies. 2015-02-23 14:06:24 +01:00
Peter Simons
524e184c68 haskell-ng: fix crf-chain1-constrained and crf-chain2-tiers 2015-02-23 13:46:04 +01:00
Peter Simons
921eadb2ad haskell-hspec-webdriver does not compile. 2015-02-23 13:46:04 +01:00
Peter Simons
ad56a5c124 haskell-haxr doesn't compile. 2015-02-23 13:46:04 +01:00
Peter Simons
347969c671 haskell-buffer-builder and haskell-language-lua have been fixed. 2015-02-23 13:46:04 +01:00
Peter Simons
b1dd0a0db5 haskell-dbmigrations: build has been has been fixed 
But the test suite requires a running PostgreSQL server.
 2015-02-23 13:46:04 +01:00
Peter Simons
a88d2eeb3a hackage-packages.nix: re-generate from Hackage 2015-02-23T11:43:03+0100 2015-02-23 13:46:04 +01:00
lethalman
a5a424bbce Merge pull request #6530 from sheganinans/master 
Ur/Web version bump
 2015-02-23 13:31:32 +01:00
Jaka Hudoklin
b2fdcf801c nodePackages: add platform support, fix a lot of bugs 2015-02-23 13:29:50 +01:00
Jaka Hudoklin
60993d7716 nodePackages: prefix packages based on interpreter name 2015-02-23 13:29:50 +01:00
Jaka Hudoklin
284046cebc Merge pull request #6510 from offlinehacker/pkgs/libsass/add 
Add libsass
 2015-02-23 13:07:11 +01:00
Nikolay Amiantov
68ed035798 Merge pull request #6506 from nathanielbaxter/dev/libbluray 
libbluray: fix aacs support
 2015-02-23 14:17:41 +03:00
Peter Simons
b1d056324a Merge pull request #6527 from joelteon/7.10-packages 
Fixes and patches for a lot of packages for GHC 7.10
 2015-02-23 11:53:50 +01:00
Aistis Raulinaitis
9adb387327 Ur/Web version bump 2015-02-23 02:40:27 -08:00
Michel Kuhlmann
0c22975cb2 gdal: update to 1.11.2 2015-02-23 11:29:14 +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
vbgl
6668a05abc Merge pull request #6521 from lostdj/ltp/upstream-master/emscripten1.29.10 
emscripten: update from 1.29.3 to 1.29.10.
 2015-02-23 11:03:54 +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
lethalman
78e0e8e556 Merge pull request #6516 from valeriangalliat/update-iojs 
Update io.js
 2015-02-23 10:19:28 +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
Vladimír Čunát
bc51573f8a dragonegg-3.5: fix by dropping included patch 
It seems to compile a hello-world fine.
 2015-02-23 09:37:07 +01:00
Mateusz Kowalczyk
6a6cc70978 Merge pull request #6505 from nathanielbaxter/dev/ffmpeg 
ffmpeg: update 2.5.3 to 2.5.4
 2015-02-23 07:30:50 +00:00
Joel Taylor
1a255fed58 more patches 2015-02-22 20:51:22 -08:00
Joel Taylor
8bfa1a2efc Patches for a lot of packages for GHC 7.10 2015-02-22 17:33:10 -08:00
Tobias Geerinckx-Rice
841905e1ea coan: skip checks; they work locally but fail on Hydra 
This reverts commit 607cc808d8.
 2015-02-23 01:45:08 +01:00
Valérian Galliat
63f7dc60ff Update io.js 2015-02-22 22:36:35 +01:00
Peter Simons
c0db1fec7c haskell-system-canonicalpath: test suite has been fixed 2015-02-22 22:17:10 +01:00
Peter Simons
d67a076707 haskell-descriptive test suite has been disabled upstream. 2015-02-22 22:13:10 +01:00
Peter Simons
001d4d07cd haskell-wai-middleware-throttle fails its test suite. 2015-02-22 22:13:10 +01:00
Peter Simons
e33b739401 haskell-c2hs: the test suite errors have been fixed 
See https://github.com/NixOS/nixpkgs/issues/6343 for details.
 2015-02-22 22:13:10 +01:00
Peter Simons
d88ae678c3 haskell-lambdabot doesn't build with monad-control 1.x. 2015-02-22 22:13:10 +01:00
Peter Simons
aeadb16444 ghcWithPackages: don't re-generate the packages.conf.d cache if there are no actual libraries added to the environment 
This change resolves https://github.com/NixOS/nixpkgs/issues/6419.
 2015-02-22 22:13:10 +01:00
Peter Simons
5d5b51dfc0 haskell-generic-builder: add a passthru attribute 'isHaskellLibrary' to every derivation 
The presence of this attribute allows us to recognize Haskell derivations.
Furthermore, we can use it to distinguish libraries from executables (which is
useful for the code that's generating the wrapper).
 2015-02-22 22:13:10 +01:00
Peter Simons
a3c351b98a haskell-jose-jwt has been fixed. 2015-02-22 22:13:10 +01:00
Peter Simons
e8fbc94939 hackage-packages: re-generate from Hackage 2015-02-22T21:05:07+0100 2015-02-22 22:13:10 +01:00
Vladimír Čunát
c8f2a31de3 libav-11: maintenance update, including security 
CVE-2014-{8541,8542,8543,8547,8548,8549}
 2015-02-22 21:32:31 +01:00
Peter Simons
f898ca1a2e haskell-ng: clean up some obsolete overrides 2015-02-22 19:47:24 +01:00
Peter Simons
3c86d74489 haskell-hmidi: build is broken 2015-02-22 19:47:24 +01:00
Peter Simons
64837d218c haskell-crf-chain2-tiers does not compile. 2015-02-22 19:47:24 +01:00
Peter Simons
b45700ecb7 haskell-lhc: doesn't compile 2015-02-22 19:47:24 +01:00
Peter Simons
eab82da9b9 More broken Haskell builds. 2015-02-22 19:47:24 +01:00
Peter Simons
7dd6baa3d4 haskell-ersatz cannot compile its test suite. 2015-02-22 19:47:24 +01:00
Peter Simons
ee698e5de8 haskell-crf-chain1-constrained does not compile. 2015-02-22 19:47:24 +01:00
Peter Simons
4fdea33a77 haskell-language-lua: missing build tool "alex" 2015-02-22 19:47:24 +01:00
Peter Simons
73691256d9 haskell-descriptive fails its test suite 2015-02-22 19:47:24 +01:00
Peter Simons
1034d81326 Users of haskell-purescript won't compile with ghc-7.8.x either. 2015-02-22 19:47:24 +01:00
Peter Simons
87426b718c haskell-buffer-builder-aeson doesn't compile. 2015-02-22 19:47:24 +01:00
Peter Simons
8e92c1fcbe haskell-descriptive: update to version 0.9.1 to fix build errors 2015-02-22 19:47:23 +01:00
Peter Simons
2b8b3cc147 haskell-buffer-builder does not compile. 2015-02-22 19:47:23 +01:00
Peter Simons
64480bd6b8 haskell-ArrowVHDL doesn't compile with recent versions of base. 2015-02-22 19:47:23 +01:00
Peter Simons
e7180dde72 haskell-dbmigrations cannot compile its test suite. 2015-02-22 19:47:23 +01:00
Peter Simons
3f487c14f8 haskell-highlighter2 does not compile with ghc-7.8.x. 2015-02-22 19:47:23 +01:00
Peter Simons
0961557f8f haskell-karakuri is broken; haskell-jose-jwt fails its test suite. 2015-02-22 19:47:23 +01:00
Peter Simons
4c124c4a02 haskell-purescript does not compile with ghc-7.8.x. 2015-02-22 19:47:23 +01:00
Peter Simons
95c321e0f7 Mark more users of haskell-test-sandbox broken. 2015-02-22 19:47:23 +01:00
Peter Simons
31073f367e haskell-configuration-tools: build succeeds with GHC 7.8.x now 
Test suite is broken, though.
 2015-02-22 19:47:23 +01:00
Peter Simons
3cfa24338d haskell-QuickCheck: add support for version 1.x to fix various builds 2015-02-22 19:47:23 +01:00
Peter Simons
411d3dcb61 haskell-elevator: build is fixed 2015-02-22 19:47:23 +01:00
Peter Simons
9c3da4e723 Cabal: update overrides for version 1.22.1.0 2015-02-22 19:47:22 +01:00
Peter Simons
f28a690bed hackage-packages.nix: re-generate from Hackage 2015-02-22T13:31:37+0100 2015-02-22 19:47:22 +01:00
lostdj
bca50ddb7d emscripten: update from 1.29.3 to 1.29.10. 2015-02-22 21:35:38 +03:00
Peter Simons
80101c8329 Disable some broken R packages. 2015-02-22 18:22:35 +01: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
cillianderoiste
ba4cb54297 Merge pull request #6507 from nathanielbaxter/dev/quazip 
quazip: update from 0.7 to 0.7.1
 2015-02-22 13:56:23 +01:00
Valérian Galliat
43f02f27a0 Shared libuv in io.js and Node.js 2015-02-22 12:41:33 +01:00
Bjørn Forsman
6e070cb9d9 avr-gcc-with-avr-libc: remove unused gcc-4.6 patch 
Unused since dd4e1d4225 (avr-gcc-with-avr-libc: Update to latest versions.)
 2015-02-22 12:41:14 +01:00
Valérian Galliat
ef86e3c1b5 libuv: version 1.4.0 2015-02-22 12:41:03 +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
Valérian Galliat
62b17c8bf1 io.js: shared libraries 
@lethalman courtesy <https://github.com/NixOS/nixpkgs/pull/6234#issuecomment-75429850>.
 2015-02-22 12:00:34 +01:00
Nathaniel Baxter
e149afe3a1 quazip: update from 0.7 to 0.7.1 2015-02-22 15:16:39 +11:00
Nathaniel Baxter
89f4507c5c libbluray: fix aacs support 2015-02-22 14:39:37 +11:00
Nathaniel Baxter
798a42a3ee ffmpeg: update 2.5.3 to 2.5.4 2015-02-22 11:58:48 +11:00
Ben Darwin
63d61cee7f teyjus: 2.0-b2 2015-02-21 19:55:24 -05:00
Arseniy Seroka
8887ad850f Merge pull request #6487 from ftrvxmtrx/openal-soft-1.16.0 
openal-soft 1.15.1 -> 1.16.0
 2015-02-22 00:25:55 +03:00
Thomas Tuegel
1254a6478d Merge branch 'kde5-split-qt' 2015-02-21 13:49:49 -06:00
Peter Simons
05b97395ae haskell-hmm does not compile. 2015-02-21 18:53:35 +01:00
Peter Simons
5b475709c8 haskell-elevator doesn't compile. 2015-02-21 18:53:35 +01:00
Peter Simons
79c33623a5 haskell-apiary: test suite depends on obsolete QuickCheck 1.x 2015-02-21 18:53:35 +01:00
Peter Simons
862d224c69 haskell-wxc: fix build 
Our 'wxGTK' attribute refers to wxwidgets 2.8 by default, but haskell-wxc needs
version 2.9 or later.

Resolves https://github.com/NixOS/nixpkgs/issues/6478.
 2015-02-21 18:53:35 +01:00
Peter Simons
14fe149551 haskell-types-compat: Haddock fails with an internal error 2015-02-21 18:53:35 +01:00
Peter Simons
b4ed8845a9 haskell-uhc-light: Haddock syntax errors have been fixed 2015-02-21 18:53:35 +01:00
Peter Simons
81082affeb haskell-c2hs fails its test suite on Linux/i686 2015-02-21 18:53:34 +01:00
Peter Simons
aa8b539611 haskell-asn1-encoding fails its test suite on Linux/i686 2015-02-21 18:53:34 +01:00
Peter Simons
8051e87848 hackage-packages.nix: re-generate from Hackage 2015-02-20T13:19:54+0100 2015-02-21 18:53:34 +01:00
Thomas Tuegel
8cf78bf5f4 update various packages to use Qt 5.4 2015-02-21 11:39:20 -06:00
Thomas Tuegel
0cf073627c remove split qt-5.3 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
Valérian Galliat
7fcac2e8e1 Update iojs 2015-02-21 09:06:24 +01:00
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
Siarhei Zirukin
61b8aa26f2 openal-soft 1.15.1 -> 1.16.0 2015-02-21 00:44:18 +01:00
Ryan Scheel
f2f3c5b4ef Update Elixir to v.1.0.3 
Tested locally and it works. :D
 2015-02-20 14:23:04 -08:00
William A. Kennington III
1dd647eba6 protobuf: Remove v as it is unneeded now 2015-02-20 10:42:14 -08:00
William A. Kennington III
f58c96149d protobuf: Fix python build 2015-02-20 10:36:16 -08:00
Aycan iRiCAN
494fb2deb2 Updated haskellPackages.{rest-wai, rest-snap} 2015-02-20 16:13:49 +02:00
Peter Simons
7afe039842 pkgs/development/r-modules: fix evaluation errors 2015-02-20 15:08:18 +01:00
Luca Bruno
3391728c63 dragonegg: fix sha256 2015-02-20 14:51:24 +01:00
Luca Bruno
97f9150a56 wml: mark as broken, don't know why it broke 2015-02-20 14:07:59 +01:00
Luca Bruno
332c32b772 Revert "v8: 3.26.31.15 -> 3.31.1" 
This reverts commit 098ed10f39.
 2015-02-20 14:07:59 +01:00
Luca Bruno
fb4fc507ef Revert "v8: Properly update to 4.1.0.15" 
This reverts commit 1570cb501c.
 2015-02-20 14:07:59 +01:00
Peter Simons
eb500e9945 Merge pull request #6432 from abbradar/r-update 
Regenerate R modules and update mirrors
 2015-02-20 13:22:45 +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
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
Sebastián Bernardo Galkin
8a7097972e Postgis requires json_c to provide GeoJson support 
This change adds the needed build dependency and configuration to postgis
 2015-02-19 18:05:49 -08:00
Nikolay Amiantov
8450ff3ab8 rPackages: fix broken packages 2015-02-19 23:53:36 +03:00
Nikolay Amiantov
3e6531c174 rPackages: add packagesWithRDepends 2015-02-19 23:51:24 +03:00
Nikolay Amiantov
88ab59eb73 rPackages: nicer override* functions 2015-02-19 23:50:42 +03:00
Nikolay Amiantov
0f9c0348af rPackages: remove Xvfb where it's not needed 2015-02-19 23:49:41 +03:00
Franz Pletz
22bfa41033 Update libressl to 2.1.3 2015-02-19 19:33:41 +01:00
William A. Kennington III
e574da83de wayland: Always build documentation 2015-02-19 09:57:16 -08:00
codyopel
a53da93b2b wayland: 1.6.0 -> 1.7.0 & add optionals 
All non-essential dependencies are now optional, with exception
to wayland-scanner which if not enabled causes wayland to fail to build
 2015-02-19 09:47:40 -08:00
Jim Garrison
66097d8f4f julia: 0.3.5 -> 0.3.6 2015-02-19 00:07:20 -08:00
Dan Peebles
e25150bb10 No need for this hack anymore 2015-02-18 22:18:57 -05:00
William A. Kennington III
524e815af1 krb5: 1.13 -> 1.13.1 2015-02-18 18:20:53 -08:00
William A. Kennington III
f94d0c3aa7 ctl: Update to 1.5.2 2015-02-18 18:03:34 -08:00
William A. Kennington III
e9c1a56f97 ilmbase: Update to openexr version 2015-02-18 18:03:34 -08:00
William A. Kennington III
51cc9612b7 openexr: 1.7.1 -> 2.2.0 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
Vladimír Čunát
a9e4fc1079 poppler-qt4: fix rendering, fixes #6366 
The subpixel patches seem to cause trouble in recent versions.
 2015-02-18 21:38:23 +01:00
Peter Simons
01d06e8ed8 Merge pull request #6428 from joachifm/more-haskell-updates 
Fix some haskellPackages build failures
 2015-02-18 20:37:44 +01:00
Nikolay Amiantov
d9d0771769 Merge pull request #6434 from abbradar/bundler-checksum 
bundler and gitlab; fix checksums
 2015-02-18 20:08:59 +03:00
Nikolay Amiantov
aa878ffe94 bundler: fix hash 2015-02-18 19:06:30 +03:00
Nikolay Amiantov
7791a5362d libtirpc: adopt 2015-02-18 19:00:54 +03:00
Nikolay Amiantov
6c2a607112 R: update archive url 2015-02-18 15:41:46 +03:00
Nikolay Amiantov
75ce44a95c r-modules: regenerate 2015-02-18 15:41:46 +03:00
Arseniy Seroka
4c125ceddc Merge pull request #6310 from ikervagyok/usb-modeswitch 
Update: usb-modeswitch 2.2.0 -> 2.2.1
 2015-02-18 14:20:16 +03:00
Domen Kožar
b7c3afa674 Merge pull request #5926 from benmos/postgis 
Postgis 2.1.4 support
 2015-02-18 12:08:59 +01:00
Wout Mertens
1a6b92bb71 Merge pull request #6421 from Havvy/patch-1 
Update Node stable to v.0.12.0
 2015-02-18 10:36:40 +01:00
Sergey Mironov
b7adfe0e7d sipp: add the package 2015-02-18 11:52:14 +03:00
Sergey Mironov
ef3dbaa69a utf8proc: add the library 2015-02-18 11:51:11 +03:00
Dan Peebles
c6ce6460c4 Rearrange llvm dependencies slightly to avoid unnecessary dependencies on darwin (binutils is only used for gold integration, which doesn't apply on darwin) 2015-02-18 02:05:56 -05:00
Joachim Fasting
baba36ce27 haskell-rest-happstack 
Fixes build
 2015-02-18 06:53:13 +00:00
Joachim Fasting
c2f216b8e1 haskell-rest-types: version bump 2015-02-18 06:53:13 +00:00
Joachim Fasting
233cc55dc4 haskell-rest-core: version bump 2015-02-18 06:53:08 +00:00
Ryan Scheel
ffc1a595e4 Update Node stable to v.0.12.0 
Patch is from ewemoa on IRC and claims it built successfully. User didn't want to create a Github account. Original patch is at https://pastee.org/zx45s
 2015-02-17 22:44:58 -08:00
Joachim Fasting
b3bacd4d0c haskell-pool-conduit: mark as broken 
Fails to build, deprecated.
 2015-02-18 06:41:09 +00:00
Joachim Fasting
45b9432f82 haskell-happstack-lite: version bump 
Fixes build
 2015-02-18 06:39:02 +00:00
Joachim Fasting
fbe66014ab haskell-happstack-hamlet: mark as broken 
No upstream version supports happstack-server >= 7.4
 2015-02-18 06:37:52 +00:00
William A. Kennington III
ad0277fbdc Merge pull request #6386 from codyopel/xvidcore 
xvidcore: refactor & 1.3.2 -> 1.3.3
 2015-02-17 22:29:40 -08:00
Dan Peebles
3a423e4405 It doesn't appear to be necessary to force the libc++abi rpath in libc++, and removing it helps disentangle the upcoming darwin stdenv from its bootstrap tools 2015-02-17 22:39:31 -05:00
Dan Peebles
a68484a0ac Minor fix for broken ruby evaluation and libiconv 2015-02-17 21:39:29 -05:00
Joel Taylor
695136db1c Temporarily fix build of x509-system on Darwin. 
Introduces a nasty impurity but what can you do :(
 2015-02-17 16:58:42 -08:00
Peter Simons
953466fcba libsigsegv: disable test suite to avoid crashes with certain kernel versions 
Further details are at:

 - https://lists.gnu.org/archive/html/bug-libsigsegv/2015-01/msg00001.html
 - http://lists.opensuse.org/opensuse-factory/2015-01/msg00408.html

Resolves https://github.com/NixOS/nixpkgs/issues/6028, kind of.
 2015-02-17 23:36:14 +01:00
Arseniy Seroka
0e63ac0acf Merge pull request #6402 from codyopel/xavs 
xavs: add package
 2015-02-17 23:42:01 +03: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
lethalman
6be3ffb0d4 Merge pull request #6394 from codyopel/libwebp 
libwebp: refactor & 0.4.1 -> 0.4.2
 2015-02-17 15:28:35 +01:00
Peter Simons
519c696bcf haskell-configuration-common.nix: fix evaluation 2015-02-17 14:35:25 +01:00
Aycan iRiCAN
60cbac103e Merge branch 'httpStreamsFix' of github.com:aycanirican/nixpkgs into httpStreamsFix 
Conflicts:
	pkgs/development/haskell-modules/configuration-common.nix
 2015-02-17 15:28:33 +02:00
Aycan iRiCAN
2d54eb7693 disable tests for haskellngPackages.http-streams since it doesn't include test modules 2015-02-17 15:26:56 +02:00
Aycan iRiCAN
c723352d77 disable tests for haskellngPackages.http-streams since it doesn't include test modules 2015-02-17 15:23:15 +02:00
Rob Vermaas
8495c101dc Fixes #6374. Now for real, dohhh. 2015-02-17 13:10:13 +00:00
Rob Vermaas
1a0e6f0039 Fixes #6374. 2015-02-17 13:07:54 +00:00
Arseniy Seroka
e13b0a8bb1 Merge pull request #6396 from codyopel/wavpack 
wavpack: add package
 2015-02-17 16:05:21 +03:00
Peter Simons
ad01e9dfbb haskell-language-lua fails its test suite. 2015-02-17 13:51:19 +01:00
Peter Simons
3f2513ddbc haskell-vcache: doesn't compile because of broken dependencies 2015-02-17 13:51:19 +01:00
Peter Simons
29e3bc30b3 haskell-digestive-foundation-lucid does not compile. 2015-02-17 13:51:19 +01:00
codyopel
1435e69758 wavpack: add package 2015-02-17 07:29:04 -05:00
codyopel
67f82fe49c libwebp: refactor & 0.4.1 -> 0.4.2 2015-02-17 06:05:40 -05:00
Peter Simons
0145793b92 hackage-packages.nix: re-generate from Hackage 2015-02-17T11:57:38+0100 2015-02-17 11:57:38 +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
vbgl
82312e3b7b Merge pull request #6388 from nathanielbaxter/dev/gecode 
gecode: update from 4.3.0 to 4.3.3
 2015-02-17 11:05:53 +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
Nathaniel Baxter
b19da5ba23 gecode: update from 4.3.0 to 4.3.3 2015-02-17 18:50:48 +11:00
Joel Taylor
4b6d83199a Fix temp directory paths for GHC 7.0.4 on Darwin 
This is a remnant of https://github.com/NixOS/nixpkgs/pull/6268
 2015-02-16 23:42:59 -08:00
codyopel
1b26e25845 xvidcore: refactor & 1.3.2 -> 1.3.3 2015-02-17 02:01:10 -05:00
codyopel
534332eaf7 vid-stab: add package 2015-02-17 00:54:23 -05:00
Tobias Geerinckx-Rice
607cc808d8 coan: run checks 2015-02-17 05:13:40 +01:00
Benjamin Staffin
fbeae50296 rbtools: update to 0.7.1 
Change-Id: Ib41400507447564375a2ec61467b2ceb148e663c
 2015-02-16 16:41:31 -08:00
Lengyel Balázs
c42bcab582 Update: usb-mdeswitch 2.2.0 -> 2.2.1 2015-02-17 01:33:28 +01: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
Antoine R. Dumont
9b81fa284f Fix avr-gcc url 
New releases have been made and the current one is now an old one.
 2015-02-16 23:08:05 +01:00
Aristid Breitkreuz
6aa43976a7 update http-types 2015-02-16 21:06:29 +01:00
vbgl
0c4ac4b936 Merge pull request #6349 from gfxmonk/ounit2 
Update OUnit to version 2.0.0
 2015-02-16 15:15:04 +01:00
Vincent Laporte
9128cf6944 ocaml-lwt: update from 2.4.5 to 2.4.6 2015-02-16 13:31:13 +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
Peter Simons
85e2076a0b haskell-amazonka-ecs: fix build with ghc 7.8.x 2015-02-16 10:43:36 +01:00
Peter Simons
92934f386e haskell-hypher does not compile with GHC 7.8.x due to mtl 2.2.x requirement. 2015-02-16 10:42:11 +01:00
Peter Simons
ce7b7c51e3 haskell-scotty-binding-play: test suite requires network access 2015-02-16 10:12:33 +01:00
Peter Simons
8e4a473fd7 haskell-amazonka-glacier: fix build with GHC 7.8.x 2015-02-16 10:10:06 +01:00
Peter Simons
d2322bca84 haskell-lucid-foundation does not compile. 2015-02-16 10:06:13 +01:00
Peter Simons
98476e9c51 haskell-mp does not compile. 2015-02-16 10:04:33 +01:00
Peter Simons
b548adf58d haskell-hwsl2 does not compile. 2015-02-16 10:01:17 +01:00
Peter Simons
6ba8720a56 haskell-configuration-tools: the Cabal issue has been fixed, but the library still depends on mtl 2.2.x 2015-02-16 10:00:49 +01:00
Peter Simons
a2a87c9126 hackage-packages.nix: re-generate from Hackage 2015-02-16T09:28:28+0100 2015-02-16 09:28:28 +01:00
Peter Simons
04c21a89a6 haskell-mtl-compat: fix build with GHC 7.8.x 2015-02-15 22:42:10 +01:00
Peter Simons
e46030f144 structured-haskell-mode supports recent versions of haskell-src-exts now. 2015-02-15 22:35:28 +01:00
Peter Simons
cd27ebeb58 haskell-lowgl does not compile. 2015-02-15 22:35:28 +01:00
Peter Simons
a9f09f619b haskell-configuration-tools does not compile. 2015-02-15 22:35:28 +01:00
Peter Simons
5ab272bf1e Haskell packages wiring, ihaskell-parsec, and simple-conduit don't compile 2015-02-15 22:35:28 +01:00
Peter Simons
dccb2921ff haskell-test-sandbox cannot be built by GHC 7.8.x. 2015-02-15 22:35:28 +01:00
Peter Simons
2a8c78322c haskell-temporal-csound is broken. haskell-heroku can't compile its test suite. 2015-02-15 22:35:28 +01:00
Peter Simons
ccf7442be4 haskell-paypal-adaptive-hoops: don't try to run the network-related part of the test suite in our chroot environment 
Resolves https://github.com/NixOS/nixpkgs/issues/6350.
 2015-02-15 22:35:28 +01:00
Peter Simons
8d737e3f0c hackage-packages: re-generate from Hackage 2015-02-15T20:03:28+0100 2015-02-15 22:35:28 +01:00
Eelco Dolstra
2ba9ae0129 Fix bad licenses on CUDA packages 
They were marked as "nonfree" rather than "unfree", causing them to be
allowed with allowUnfree = false.
 2015-02-15 22:29:47 +01:00
Peter Simons
af768c15e5 haskell-OpenGLRaw21: build has been fixed 2015-02-15 19:50:14 +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
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
Tim Cuthbertson
65152acbae Update OUnit to version 2.0.0 
The existing URL looks like version 2.0.0, but actually
downloads the contents of ounit-1.2.0.tar.gz into a file named
ounit-2.0.0.tar.gz
 2015-02-15 14:44:35 +11:00
William A. Kennington III
b1fef78b8f Merge pull request #6347 from codyopel/lamebr 
lame: move to libraries & fix license
 2015-02-14 16:08:34 -08:00
codyopel
b03ded550f lame: move to libraries & fix license 2015-02-14 19:06:38 -05:00
William A. Kennington III
c6642675b9 Merge pull request #6336 from codyopel/gsm 
gsm: seperate phases & fix shared library
 2015-02-14 13:55:52 -08:00
Peter Simons
795681d6f9 haskell-exceptions: can't compile its test suite 
* pkgs/development/haskell-modules/configuration-common.nix:
 2015-02-14 19:41:49 +01:00
Peter Simons
1bb43ea027 hackage-packages.nix: re-generate from Hackage 2015-02-14T10:41:17+0100 2015-02-14 19:41:49 +01:00
Peter Simons
c0e7951de9 haskell-x509-system: don't add Darwin-related patch unconditionally 2015-02-14 19:41:49 +01:00
Peter Simons
155e926274 ghc: disable parallel building for older versions again 
This change accidentally crept in with the recent Darwin changes.
 2015-02-14 19:41:49 +01:00
Joel Taylor
2dc7059230 Some Haskell package overrides for Darwin and explanations 2015-02-14 19:41:49 +01:00
Joel Taylor
fd18936a32 Add purity to GHC builds on Darwin 2015-02-14 19:41:49 +01:00
codyopel
fc27383909 gsm: seperate phases & fix shared library 2015-02-13 21:04:03 -05:00
Peter Simons
9db348d7f9 ghc-7.10.x: compile Setup.hs with -threaded to avoid hanging test suites 
Closes https://github.com/NixOS/nixpkgs/issues/6259.
 2015-02-13 22:24:32 +01:00
Peter Simons
4e82b03f29 haskell-mtl-compat: broken with ghc-7.8.x 2015-02-13 22:24:32 +01:00
Peter Simons
26faa326cd hackage-packages.nix: re-generate from Hackage 2015-02-13T12:48:35+0100 2015-02-13 22:24:32 +01:00
Peter Simons
f2a376f52a Enable static libraries in "gmp" to allow static linking of Haskell programs. 
Haskell programs depend on gmp to implement the unbounded Integer type. Without
static variants of gmp we cannot build statically linked Haskell programs, what
some users have found desirable in the past. So far, we've used an override to
derive our own copy of gmp in the Haskell ecosystem, but this patch ends the
dichotomy between Haskell and the rest of Nixpkgs by enabling static gmp
libraries in the default build default.
 2015-02-13 22:18:27 +01:00
Peter Simons
600135bba5 Merge remote-tracking branch 'master' into staging. 2015-02-13 22:17:12 +01:00
Peter Simons
54ce1a1810 Merge remote-tracking branch 'origin/master' into staging. 
Conflicts:
      pkgs/development/compilers/ghc/head.nix
      pkgs/top-level/haskell-ng.nix
 2015-02-13 22:13:25 +01:00
Peter Simons
c6ed2aa203 Merge pull request #5968 from jkarni/jkarni/servant-server-0.2.3 
I'll merge blindly, assuming that those changes have been tested by the submitter. If these updates cause any trouble, please don't hesitate to revoke if necessary.
 2015-02-13 15:39:32 +01:00
Peter Simons
afaa01c957 Merge pull request #6009 from nkaretnikov/yesod-1.4.1.4 
I'll merge blindly, assuming that those changes have been tested by the submitter. If these updates cause any trouble, please don't hesitate to revoke if necessary.
 2015-02-13 15:38:41 +01:00
Pascal Wittmann
f393521630 libasr: fixed description 2015-02-13 14:29:11 +01:00
Pascal Wittmann
d7b01c8526 Merge pull request #6325 from k0ral/opensmtpd 
opensmtpd: 5.4.2p1 -> 5.4.4p1
 2015-02-13 13:28:04 +00:00
Damien Cassou
b1e0124cd9 Merge pull request #6328 from DamienCassou/pharo-launcher-0.2.4 
Pharo launcher 0.2.1 --> 0.2.4
 2015-02-13 12:54:36 +01:00
Damien Cassou
120cc5a65a Pharo launcher 0.2.1 --> 0.2.4 2015-02-13 12:48:32 +01:00
koral
3bc7dfdf22 opensmtpd: 5.4.2p1 -> 5.4.4p1 2015-02-13 12:38:21 +01:00
Peter Simons
7e07916f91 haskell-clac: disable builds with ghc-7.8.x 2015-02-13 10:37:47 +01:00
Peter Simons
a04e2e06f9 haskell-gstreamer: fix dependencies 2015-02-13 10:37:47 +01:00
Joel Taylor
2a5dacbf6b patch shebangs in boot script 2015-02-13 10:37:47 +01:00
Joel Taylor
dcafdf47ea Revert "Revert "Build GHC HEAD from git checkout"." 
This reverts commit 15416dd2ec.
 2015-02-13 10:37:47 +01:00
Peter Simons
95814c7ef1 haskell-file-location: test suite is now fixed 2015-02-13 10:37:47 +01:00
Peter Simons
5d707670a5 hackage-packages.nix: re-generate from Hackage 2015-02-12T23:09:28+0100 2015-02-13 10:37:47 +01:00
Peter Simons
8b64ee52f8 haskell-file-location: test suite doesn't compile 2015-02-13 10:37:47 +01:00
Peter Simons
d51a083896 haskell-blaze-builder: downgrade to version < 0.4 
Many builds can't deal with the new version yet.
 2015-02-13 10:37:47 +01:00
Peter Simons
8c0d54e46a haskell-bloomfilter: disable broken 32 bit build 
Fixes https://github.com/NixOS/nixpkgs/issues/6292.
 2015-02-13 10:37:46 +01:00
Peter Simons
095a7f8cd6 haskell-blaze-markup: disable failing test suite 2015-02-13 10:37:46 +01:00
Peter Simons
60cb74e6d6 haskell-CHXHtml: disable Hydra builds because of excessive build time 2015-02-13 10:37:46 +01:00
Peter Simons
27b57469e8 python-generic: cosmetic 2015-02-13 10:37:46 +01:00
Peter Simons
6c3e44c040 haskell-rasterific: the broken test suite has been removed 2015-02-13 10:37:46 +01:00
Peter Simons
e4037ae913 hackage-packages.nix: re-generate from Hackage 2015-02-12T20:00:15+0100 2015-02-13 10:37:46 +01:00
Vincent Laporte
cbc58da3f0 ocaml-sqlite3: update from 2.0.8 to 2.0.9 2015-02-13 06:46:23 +01:00
Domen Kožar
b2d17156bb Merge pull request #6324 from codyopel/x265br 
X265br
 2015-02-13 01:22:16 +01:00
William A. Kennington III
4dfd6cdfb7 Merge pull request #6323 from codyopel/libvpxbr 
libvpx-git: bump commit & disable high bitdepth builds on i686
 2015-02-12 14:58:33 -08:00
codyopel
3f22fdf7b0 x265: refactor & add optionals 2015-02-12 17:55:23 -05:00
codyopel
b60f5a004a x265-hg: bump commit 2015-02-12 17:53:48 -05:00
codyopel
90ea935252 x265: 1.4 -> 1.5 2015-02-12 17:53:07 -05:00
codyopel
3269e202b1 libvpx-git: bump commit & disable high bitdepth builds on i686 2015-02-12 16:08:33 -05:00
John Wiegley
68c6ca44e6 sbcl_1_2_0: port over joelteon's change to 1.2.8 2015-02-12 15:05:37 -06:00
John Wiegley
1dea4e5297 Merge pull request #6321 from joelteon/sbcl 
Linker flags for sbcl on Darwin
 2015-02-12 15:54:05 -05:00
Joel Taylor
b43fc565f1 linker flags for sbcl 2015-02-12 12:14:35 -08:00
Vladimír Čunát
8afa77cb07 vala-0.26: minor update to fix CVE-2014-8154 
@lethalman: it seems strange to me to have the 0.23.* version as
the default, as it's even an unstable release.
 2015-02-12 20:43:55 +01:00
Peter Simons
15416dd2ec Revert "Build GHC HEAD from git checkout". 
This reverts commit 52c8d7c4ab. The new
expression doesn't compile: http://hydra.nixos.org/build/19594431/nixlog/1/raw.
 2015-02-12 20:15:56 +01:00
Peter Simons
79a5fec9c0 python-generic: set meta.broken for disabled packages instead of raising an error during evaluation 
We have tons of evaluation errors on Hydra because it tries to build
known broken packages. Re-using meta.broken makes sure these packages
aren't evaluated in the first place.
 2015-02-12 20:07:56 +01:00
Jaka Hudoklin
9060376bcd buildNodePackage: patch shebangs only in text files 2015-02-12 19:09:09 +01:00
Vincent Laporte
3a17654b71 ocp-build: update source and website URLs 2015-02-12 06:59:28 +01:00
Shea Levy
127efcd6f6 Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging 
Took "ours" for the conflict and changed libiconvOrEmpty to libiconv

Conflicts:
	pkgs/applications/audio/ncmpcpp/default.nix
 2015-02-11 19:37:22 -05:00
Peter Simons
6b16a7fbd7 Merge pull request #6309 from joelteon/ghc-head-git 
Build GHC HEAD from git checkout
 2015-02-12 00:13:44 +01:00
Eric Seidel
a86fd94ecc only link libsodium against libssp when building with gcc 2015-02-11 14:37:30 -08:00
Joel Taylor
52c8d7c4ab Build GHC HEAD from git checkout 2015-02-11 14:32:54 -08:00
Vincent Laporte
5cd15f8cc0 ocaml-cmdliner: update from 0.9.6 to 0.9.7 2015-02-11 17:51:38 +01:00
Domen Kožar
2024e08564 partially fix pythonPackages.protobuf 2015-02-11 10:21:51 +01:00
Tobias Geerinckx-Rice
54397283b0 Add include-what-you-use 3.5: static C/C++ #include analyser 2015-02-11 00:14:16 +01:00
Joel Taylor
db4cb021c0 Add purity to GHC builds on Darwin. 2015-02-10 22:08:01 +01:00
codyopel
0f18322026 libvpx: refactor & add git (close #6213) 2015-02-10 19:52:58 +01:00
Luca Bruno
fd6e830aa3 gsm: compile with -fPIC to fix build in mediastreamer for ZHF 2015-02-10 18:52:02 +01:00
lethalman
e7762c55bb Merge pull request #6281 from ehmry/nim 
nim: initial package at 0.10.2
 2015-02-10 16:08:07 +01:00
Emery Hemingway
e65e8983d9 nim: initial package at 0.10.2 2015-02-10 09:48:41 -05:00
Eelco Dolstra
815c2c7871 Merge pull request #6280 from codyopel/faacbr 
faac: revert licensing change
 2015-02-10 15:37:54 +01:00
codyopel
80dd1aa437 faac: revert licensing change 2015-02-10 09:32:51 -05:00
Vincent Laporte
1d137ebfdf ocaml-re: update from 1.2.2 to 1.3.0 2015-02-10 14:03:33 +01:00
Vincent Laporte
b73ce293fb ocaml-ezjsonm: update from 0.3.1 to 0.4.1 2015-02-10 14:03:32 +01:00
Vincent Laporte
8850692609 ocaml-sqlite3: update from 2.0.7 to 2.0.8 2015-02-10 14:03:32 +01:00
William A. Kennington III
376dd19a79 Merge pull request #6270 from codyopel/fdkaac 
fdk-aac: disable example encoder by default
 2015-02-09 17:09:34 -08:00
William A. Kennington III
973b736c17 ldb: 1.1.19 -> 1.1.20 2015-02-09 17:05:57 -08:00
codyopel
9e60224efb fdk-aac: disable example encoder by default 2015-02-09 15:18:20 -05:00
William A. Kennington III
88d508ae40 Merge pull request #6262 from codyopel/gsm 
gsm: fix include directory
 2015-02-09 11:14:53 -08:00
William A. Kennington III
22718678b6 Merge pull request #6263 from codyopel/libass 
libass: refactor & 0.11.1 -> 0.12.1
 2015-02-09 11:13:36 -08:00
Ben Moseley
926e5aa70a Remove old PostGis versions. 2015-02-09 15:57:19 +00:00
Peter Simons
7b99c149a4 Merge branch 'master' into staging. 2015-02-09 16:51:10 +01:00
codyopel
700f04b8da gsm: fix include directory 2015-02-09 10:30:10 -05:00
codyopel
ac726eb2dd libass: refactor & 0.11.1 -> 0.12.1 2015-02-09 10:27:10 -05:00
Peter Simons
a81cfcc475 hackage-packages.nix: re-generate from Hackage 2015-02-09T15:36:30+0100 2015-02-09 15:58:47 +01:00
Peter Simons
c0a0f90a32 gnulib: update Git repository snapshot 2015-02-09 12:58:19 +01:00
Luca Bruno
10e7572d17 Use go1.4 instead of go-1.4 in derivation names. Closes #6243 
I chose meta.branch because go 1.1 and 1.2 had this already.
 2015-02-09 10:16:14 +01:00
Peter Simons
441e297fb7 Merge pull request #6256 from aycanirican/haskellngPackages_distributedprocessplatform 
haskellngPackages.distributed-process-platform disable tests and haddock...
 2015-02-09 09:07:43 +01:00
Aycan iRiCAN
c37a69f60c haskellngPackages.distributed-process-platform disable tests and haddock, rename literate file. 2015-02-09 09:04:51 +02:00
Daniel Peebles
f864b95dca Merge pull request #6232 from maun/sdl2 
Modified SDL2 derivation to work on Mac OSX darwin
 2015-02-09 02:01:09 -05:00
Dan Peebles
b0e1db1159 Fix boost 1.55 on clang (1.56 onwards already have the fix) 
See https://trac.macports.org/ticket/42282 for more.
 2015-02-08 22:19:04 -05:00
William A. Kennington III
c165f24208 Merge pull request #6253 from codyopel/gsm 
gsm: refactor
 2015-02-08 17:21:04 -08:00
codyopel
c951d7d449 gsm: refactor 2015-02-08 20:16:54 -05:00