Commit Graph

1903 Commits

Author SHA1 Message Date
Peter Simons
c0d742110f haskell-threadscope: update to version 0.2.3 2014-05-03 20:03:32 +02:00
Peter Simons
0cb0810c96 haskell-hslogger: update to version 1.2.4 2014-05-03 20:03:32 +02:00
Peter Simons
0e4d6747ee haskell-HaRe: update to version 0.7.2.3 2014-05-03 20:03:32 +02:00
Austin Seipp
59528d9f0e clang-analyzer: respect $NIX_CFLAGS_COMPILE
When using scan-build, you're often going to want to use it in the
context of a Nix expression with buildInputs, and the default wrapper
scripts will put things like include locations for those inputs
$NIX_CFLAGS_COMPILE. Thus, scan-build also needs to pass them to the
analyzer - while the link flags aren't relevant, the include flags are.

This is because the analyzer executable that gets run by scan-build is
*not* clang-wrapper, but the actual clang executable, so it doesn't
implicitly add such arguments. The build is two-stage - it runs the real
clang wrapper once, and then the analyzer once.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-02 14:07:37 -05:00
Austin Seipp
f21d619558 nixpkgs: move frama-c to a more appropriate directory
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-01 19:14:08 -05:00
Peter Simons
baa1543dbc cabal-bounds: re-generate with cabal2nix 2014-05-01 23:38:20 +02:00
Peter Simons
979520396e Merge pull request #2311 from bennofs/haskell-cabal-bounds
haskell-cabal-bounds: New expression
2014-05-01 14:53:10 +02:00
Austin Seipp
628e914f2b frama-c: overhaul, upgrade to 20140301-Neon
This massively upgrades the frama-c package to be far more useful,
including support for a lot more plugins, including Jessie.

Jessie unfortunately requires that its plugin is installed alongside
frama-c, so we install why2 (where it lives) along with frama-c now.
This increases the size, but makes it much more useful.

In the future, it may be possible to split out the build such that why2
is a separate expression and frama-c only installs the plugin, rather
than all of why2. However, right now this is fine.

Furthermore, why3 is now a dependency - the Jessie plugin can use
either, and defaults to Why3 now. Per the design, Frama-C can also go
from Why2->Why3 as well.

We also make Coq and Alt-Ergo dependencies, so that out-of-the-box users
get at least one SMT solver and a prover for support.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-01 02:42:34 -05:00
Austin Seipp
5f702d52f4 ocamlgraph: upgrade to 1.8.5
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-01 02:30:39 -05:00
Austin Seipp
3c3256e4a8 nixpkgs: clang-analyzer 3.4
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-29 19:36:43 -05:00
Austin Seipp
1d3b5874ad nixpkgs: cov-build 7.0.2
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-29 16:00:34 -05:00
Benno Fünfstück
3685bf378f haskell: new expression cabal-bounds 2014-04-29 19:19:10 +02:00
Peter Simons
1a06bcc109 haskell-packunused: update to version 0.1.1.2 2014-04-29 01:35:50 +02:00
Oliver Charles
5de0ca50d7 Merge pull request #2389 from bennofs/haskell-ghc-gc-tune
haskell-ghc-gc-tune: new expression
2014-04-25 12:12:57 +01:00
Benno Fünfstück
027319708e haskell-ghc-gc-tune: new expression 2014-04-25 12:33:07 +02:00
Oliver Charles
61d74e4c8c Merge pull request #2345 from vbmithr/master
Updated OCaml package findlib
2014-04-25 10:31:04 +01:00
Mathijs Kwik
d2edc329e1 neoload: upgrade to 4.1.4 and fix mem issues 2014-04-24 08:05:44 +02:00
Eelco Dolstra
dbd332d147 Fix meta.maintainer -> meta.maintainers 2014-04-23 14:26:32 +02:00
Peter Simons
0753d64478 haskell-hlint: update to version 1.8.61 2014-04-23 11:17:11 +02:00
Peter Simons
4d765a4565 haskell-cabal-meta: re-generate with cabal2nix 2014-04-23 11:17:07 +02:00
Vincent Bernardoff
ce422b4553 Updated OCaml package findlib 2014-04-21 23:06:35 +02:00
aszlig
625d7b9043
Merge pull request #1928 from 'cross-win-osx'.
This includes a lot of fixes for cross-building to Windows and Mac OS X
and could possibly fix things even for non-cross-builds, like for
example OpenSSL on Windows.

The main reason for merging this in 14.04 already is that we already
have runInWindowsVM in master and it doesn't work until we actually
cross-build Cygwin's setup binary as the upstream version is a fast
moving target which gets _overwritten_ on every new release.

Conflicts:
	pkgs/top-level/all-packages.nix
2014-04-21 10:00:35 +02:00
Vladimír Čunát
cb83796abb elfutils: update 0.155 -> 0.158 2014-04-20 18:24:11 +02:00
Vladimír Čunát
b4df087f14 elfutils: fix CVE-2014-0172
Patch taken from upstream mailing-list.
2014-04-20 18:24:11 +02:00
Matt Whiteley
552d66cd9e Add swig-3.x 2014-04-20 11:30:31 +01:00
Jaka Hudoklin
d0c0132fb0 node_webkit: fix hash for i686-linux 2014-04-19 10:45:03 +01:00
Domen Kožar
85992ec738 Merge pull request #1507 from offlinehacker/pkgs/node_webkit/add
Add node-webkit, app runtime based on Chromium and node.js
2014-04-19 05:35:20 +02:00
Peter Simons
d4097e4e0e Merge pull request #2273 from jwiegley/cabal-delete
Add expression for cabal-delete
2014-04-16 10:17:29 +02:00
Peter Simons
d510eea7b0 Merge pull request #2277 from jwiegley/flex
Fix flex for building on darwin systems
2014-04-16 10:16:04 +02:00
John Wiegley
bc08fa99f1 Fix flex for building on darwin systems 2014-04-15 05:04:27 -05:00
John Wiegley
f2690384c9 Three new Haskell tools: rehoo, una, cabal-meta 2014-04-15 04:32:06 -05:00
John Wiegley
00d5f3ab79 Add expression for cabal-delete 2014-04-15 04:16:55 -05:00
Bjørn Forsman
5c2d17780d uhd: update 3.5.4 -> 3.7.0
Build tested (with gnuradio).
2014-04-15 07:11:41 +02:00
Bjørn Forsman
9878bb47a4 buildbot{,slave}: bump 0.8.7p1 -> 0.8.8
Build and run tested.
2014-04-13 21:11:49 +02:00
Bjørn Forsman
6989b9a3f9 babeltrace: update from 1.1.1 to 1.2.1 2014-04-13 10:47:17 +02:00
Bjørn Forsman
d1f875c6af lttng project: update from 2.3.0 to 2.4.1
(And update liburcu to 0.8.4 according to release notes for lttng 2.4.x.)

In addition to new features and bug fixes, version 2.4.x is needed to build
against Linux 3.12 (our new stable kernel).
2014-04-13 10:47:16 +02:00
John Wiegley
010132e302 Change several package constraints from linux to unix
They all build on Darwin.
2014-04-12 16:01:16 -05:00
John Wiegley
b296895abe Allow lsof to build on darwin (fixes #2219)
Closes #2219, closes #2223

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-12 11:14:18 -05:00
Peter Simons
f32be2da85 haddock: update to version 2.14.2 2014-04-11 22:33:11 +02:00
Peter Simons
f741be954c Offer consistently named attributes for the two available flex versions. 2014-04-11 10:06:18 +02:00
Aristid Breitkreuz
5d12cbf1c2 add back old version of flex for grub2 2014-04-09 20:42:08 +02:00
Peter Simons
fd9ea0f639 ltrace: fix build with latest gcc (by disabling -Werror) 2014-04-09 12:41:11 +02:00
Peter Simons
b7d0a9a614 ltrace: update from 0.5.3 to 0.7.3 2014-04-09 12:41:10 +02:00
Peter Simons
44e8fe67d0 flex: update from 2.5.35 to 2.5.39 2014-04-09 12:41:10 +02:00
Peter Simons
bdc3361515 haskell-keter: update to version 1.3.0 2014-04-07 17:06:37 +02:00
Peter Simons
6876e696b4 haskell-HaRe: update to version 0.7.2.2 2014-04-07 17:06:37 +02:00
Peter Simons
db1a390d9d haskell-hlint: update to version 1.8.60 2014-04-06 21:53:17 +02:00
Vladimír Čunát
10147beecf Merge branch vcunat@NixOS:p/stdenv (close #1840)
This branch contains a collection of stdenv-changing updates.
There's glibc 2.18 -> .19 bump and many non-intrusive PRs.

The grsecurity branch #1187 got removed at Eelco's request,
see https://github.com/NixOS/nixpkgs/issues/1840#issuecomment-39327023
2014-04-04 21:33:55 +02:00
Evgeny Egorochkin
bf8991175a global: update from 6.2.9 to 6.2.12 2014-04-03 10:22:59 +03:00
Vladimír Čunát
457fdb3842 texinfo: move ncurses support into texinfoInteractive
This, for example, drops the stdenv dependency on ncurses.
2014-04-02 19:05:56 +02:00
Vladimír Čunát
11d4c257c1 Merge branch glibc-2.19, see #1840 2014-04-02 19:03:49 +02:00
Peter Simons
1237886a91 haskell-cabal2nix: update to version 1.61 2014-04-02 18:17:02 +02:00
Vladimír Čunát
6445ac90ad Merge master into x-updates 2014-04-01 10:49:31 +02:00
Peter Simons
68409a0981 haskell-cake3: update to version 0.4.0.0 2014-03-31 21:39:27 +02:00
Peter Simons
c6da40c42f haskell-haddock: add version 2.14.1 2014-03-31 21:39:24 +02:00
Peter Simons
e825c6ac38 haskell-cake3: add version 0.3.0.1 2014-03-30 23:26:21 +02:00
Peter Simons
aaebdb7b1e haskell-keter: update to version 1.2.1 2014-03-27 23:23:20 +01:00
Vladimír Čunát
576e9289dd Merge master into x-updates 2014-03-27 21:34:06 +01:00
Peter Simons
ae2cb475c9 haskell-cpphs: update to version 1.18.4 2014-03-27 13:12:54 +01:00
Peter Simons
b692096f9d haskell-timeplot: update to version 1.0.24 2014-03-27 13:12:54 +01:00
Peter Simons
b27ddc3d05 haskell-HaRe: update to version 0.7.2.0 2014-03-27 13:12:54 +01:00
Mathijs Kwik
5943227a26 neoload: fix for the new jdk/jre location 2014-03-27 11:29:26 +01:00
Peter Simons
284ea5859b BNFC: fix build with GHC 7.8.1 2014-03-27 10:48:32 +01:00
Peter Simons
a5e408dbf8 haskell-HaRe: update to version 0.7.1.6 2014-03-22 09:04:45 +01:00
Peter Simons
357f61b3fa haskell-HaRe: update to version 0.7.1.5 2014-03-22 09:04:42 +01:00
Vladimír Čunát
65155c20d5 automake: update from 1.12.4 to 1.12.6 2014-03-21 10:34:20 +01:00
Lluís Batlle i Rossell
ae3a1519e4 gdb: adding a patch to handle well the edit cmd + SIGWINCH.
It's reported to upstream since two years ago, through
their patches mailing list.
2014-03-20 11:09:39 +01:00
Lluís Batlle i Rossell
d4bf329dde Updating gdb to 7.7. 2014-03-20 10:47:36 +01:00
Peter Simons
745a35c130 haskell-hlint: update to version 1.8.59 2014-03-17 18:33:55 +01:00
Cillian de Róiste
b57ee8c331 nixpkgs-lint: add the platforms meta attr for most of my packages 2014-03-16 12:08:26 +01:00
Shea Levy
80ed0ff85f Merge branch 'ocaml-oasis' of git://github.com/maggesi/nixpkgs
Ocaml oasis
2014-03-15 13:14:14 -04:00
Jaka Hudoklin
58e0383d93 Add node-webkit, app runtime based on Chromium and node.js 2014-03-15 09:43:56 +00:00
Corey O'Connor
4b6e67f6c4 add platform and license to package metadata. 2014-03-13 13:01:49 -07:00
Corey O'Connor
9b79d5b298 Add jenkins continuous integration server and user.
By default the jenkins server is executed under the user "jenkins". Which can be configured using
users.jenkins.* options. If a different user is requested by changing services.jenkins.user then
none of the users.jenkins options apply.

This patch does not include jenkins slave configuration. Some config options will probably change
when this is implemented.

Aspects like the user and environment are typically identical between slave and master. The service
configs are different. The design is for users.jenkins to cover the shared aspects while
services.jenkins and services.jenkins-slave cover the master and slave specific aspects,
respectively.

Another option would be to place everything under services.jenkins and have a config that selects
master vs slave.
2014-03-13 13:01:49 -07:00
Domen Kozar
059e8e179b set all licenses to be attributes (and wait for Nix 1.7) 2014-03-12 21:20:43 +01:00
Peter Simons
238a98fcbe Merge pull request #1927 from iyzsong/noweb
noweb: some fixes
2014-03-12 19:01:48 +01:00
宋文武
37e74d8cc0 noweb: some fixes
install libs to $out/lib/noweb
don't sed on binaries, eg markup
2014-03-12 18:54:50 +08:00
aszlig
c7bac81c66
Merge 'mingw-w64' and 'darwin' into cross-win-osx.
Both branches have quite a lot in common, so it's time for a merge and
do the cleanups with respect to both implementations and also generalize
both implementations as much as possible.

This also closes #1876.

Conflicts:
	pkgs/development/interpreters/lua-5/5.2.nix
	pkgs/development/libraries/SDL/default.nix
	pkgs/development/libraries/glew/default.nix
	pkgs/top-level/all-packages.nix
2014-03-12 10:16:51 +01:00
aszlig
5eb3dd8a1b
cmake: Add patch for fixing Darwin cross-builds.
This is an upstream patch and will eventually get into the next release.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:00:49 +01:00
Peter Simons
d765d5ddbb haskell-keter: update to version 1.2.0 2014-03-11 13:50:50 +01:00
Peter Simons
2273294b50 haskell-HaRe: update to version 0.7.1.4 2014-03-11 13:50:50 +01:00
Michael Raskin
6cfbc75bc1 Fix CL-Launch source link 2014-03-09 12:47:33 +04:00
Bjørn Forsman
b9d7780ced saleae-logic: install udev rules
So that they can easily be activated in NixOS:

  services.udev.packages = [ pkgs.saleae-logic ];
2014-03-08 21:46:13 +01:00
Bjørn Forsman
12e00b5eeb openocd: install udev rules
So that they can easily be activated in NixOS:

  services.udev.packages = [ pkgs.openocd ];
2014-03-08 21:46:13 +01:00
Michael Raskin
4376d70c61 Update CL-Launch to 4.0.2.2 2014-03-08 21:13:00 +04:00
Michael Raskin
dc4d698e22 Update LuaRocks 2014-03-08 21:13:00 +04:00
Peter Simons
f521a47663 haskell-cpphs: update to version 1.18.3 2014-03-08 11:27:41 +01:00
Peter Simons
56e0e7492c haskell-HaRe: update to version 0.7.1.3 2014-03-08 11:27:40 +01:00
Bjørn Forsman
34caf106da swig: add meta.platforms (set to linux)
So that Hydra will build swig. This provides binary packages to users
and build breakage detection.
2014-03-07 23:59:30 +01:00
Moritz Ulrich
be64949688 leiningen: Hardcode path to java.
...by setting JAVA_CMD in the wrapper.
2014-03-07 13:32:10 +01:00
Moritz Ulrich
29a906b2d8 dfu-programmer: New package. 2014-03-07 13:28:33 +01:00
Domen Kožar
2f77de37d3 Merge pull request #1825 from iyzsong/gradle
gradle: update to 1.11
2014-03-07 13:20:00 +01:00
Domen Kožar
6d1ca3bc6c Merge pull request #1887 from berdario/vagrant
Updated vagrant to 1.4.3
2014-03-06 22:52:32 +01:00
Peter Simons
a2f90518a9 cppcheck: update from 1.63 to 1.64 2014-03-05 15:32:15 +01:00
Peter Simons
bc3008846d scons: update from 2.3.0 to 2.3.1 2014-03-03 11:10:26 +01:00
Evgeny Egorochkin
399269e6e0 help2man: update from 1.43.3 to 1.44.1 2014-03-01 05:26:44 +02:00
Eelco Dolstra
6c77e15f19 doxygen: Remove 1.7
Current 1.8 seems to generate LaTeX output fine.
2014-02-28 18:33:45 +01:00
Eelco Dolstra
ed4fd067bc doxygen: Update to 1.8.6 2014-02-28 16:18:31 +01:00
Domen Kožar
c23ec33c77 Add selenium-server-standalone (submitted by coreyoconnor) 2014-02-27 13:06:33 +01:00
Eelco Dolstra
db9d204d33 Merge remote-tracking branch 'origin/master' into glibc-2.19 2014-02-26 12:42:03 +01:00
Eelco Dolstra
77a49e5813 valgrind: Support Glibc 2.19 2014-02-26 12:39:46 +01:00
Peter Simons
ec09c7d34e haskell-cpphs: update to version 1.18.2 2014-02-25 00:25:28 +01:00
Song Wenwu
3db6fc36f6 gradle: update to 1.11 2014-02-24 17:30:40 +08:00
Peter Simons
0b290b03e2 Merge pull request #1805 from bennofs/new-ghc-events-analyze
New expression: ghc-events-analyze
2014-02-24 09:59:29 +01:00
aszlig
ba8b0e8af9
binutils-cross: Remove unreferenced package.
This package wasn't imported by anything in the package tree and also
isn't used for cross-builds. So in order to avoid confusion, it's better
to remove it as it is outdated as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-02-24 07:26:22 +01:00
Malcolm Matalka
83c5d12d4c Add opam 1.1.1 2014-02-22 19:08:54 +01:00
Benno Fünfstück
9ad8ce91a3 New expression: ghc-events-analyze 2014-02-22 00:55:26 +01:00
Vladimír Čunát
ae5d8f6768 Merge master into x-updates 2014-02-20 20:55:31 +01:00
Peter Simons
2a1f4c82b2 haskell-cabal2nix: update to version 1.60 2014-02-19 16:07:35 +01:00
Peter Simons
029967dca6 haskell-cpphs: update to version 1.18.1 2014-02-18 19:56:13 +01:00
Dario Bertini
4247a34463
Updated vagrant to 1.4.3 2014-02-18 15:23:16 +01:00
Evgeny Egorochkin
c67f562d5e add branch info 2014-02-18 04:13:45 +02:00
Moritz Ulrich
53b6744646 teensy-loader: New package
Firmware uploader for the teensy microcontroller board family.
2014-02-18 01:02:47 +01:00
Peter Simons
ba9cc84ad0 gnulib: update to version 0.1-83-g8008cac 2014-02-17 17:11:58 +01:00
Vladimír Čunát
96f07fa74e Merge master into x-updates 2014-02-16 11:45:02 +01:00
Petr Rockai
abd8059802 cmake: Update to latest upstream (2.8.12.2). 2014-02-15 10:27:38 +01:00
Cillian de Róiste
25a7190336 Chromedriver: fix download URL, update from 2.0 to 2.9, add a required lib 2014-02-14 23:37:08 +01:00
Evgeny Egorochkin
cf3d2e0a17 add repositories.git to several packages 2014-02-14 09:34:30 +02:00
Rok Garbas
671a369634 add phantomjs to darwin platform 2014-02-12 00:51:11 +00:00
Peter Simons
f687687e7d haskell-cpphs: update to version 1.18 2014-02-10 20:54:55 +01:00
Vladimír Čunát
dfdf164f87 Merge master into x-updates
Conflicts (trivial):
	pkgs/games/spring/default.nix
2014-02-10 19:15:58 +01:00
Moritz Ulrich
18a03d7285 Leiningen: Update to 2.3.4 2014-02-08 21:48:50 +01:00
Moritz Ulrich
93f45ad2e5 Rebar: update to 2.2.0 2014-02-08 18:54:34 +01:00
Vladimír Čunát
9b69117fec Merge master into x-updates 2014-02-08 09:12:51 +01:00
Peter Simons
190a01eb43 haskell-hlint: update to version 1.8.57 2014-02-05 20:40:27 +01:00
Peter Simons
8cefbfcb1f haskell-hasktags: update to version 0.68.7 2014-02-05 20:40:27 +01:00
Eelco Dolstra
eed3c8a6ec lcov: Don't warn about missing source files
Another upstream patch for compatibility with current GCCs.
2014-02-05 20:17:01 +01:00
Eelco Dolstra
d7cb2f5712 lcov: Apply upstream patch for GCC >= 4.7 compatibility 2014-02-05 19:46:48 +01:00
Vladimír Čunát
be70104a3a Merge master into x-updates
Conflicts (taken master):
	pkgs/development/compilers/llvm/3.4/llvm.nix
2014-02-04 22:00:09 +01:00
Peter Simons
422eda499e haskell-hlint: update to version 1.8.56 2014-02-02 22:36:13 +01:00
Bjørn Forsman
662039802a lttng-tools: use absolute path to modprobe
Instead of relying on it being available in $PATH.
2014-02-02 14:00:09 +01:00
Vladimír Čunát
6e2d3b9847 Merge master into x-updates 2014-02-02 10:05:25 +01:00
Marco Maggesi
f3a49abf08 Add OCaml Oasis
OCaml Oasis is a configure/build/install system for OCaml proget (like
Cabal for Haskell).

This commit also add a few small dependencies that where missing

  -  OCaml Data Notation (odn)
  -  ocamlify
  -  ocamlmod
2014-01-31 12:01:32 +01:00
Vladimír Čunát
5888f27c56 automake-1.10: remove, probably vulnerable CVE-2012-3386
The only user was xorg ATM, which I would remove from anyway.
2014-01-30 13:49:22 +01:00
Peter Simons
557b14bc89 haskell-HaRe: update to version 0.7.1.2 2014-01-29 20:04:02 +01:00
Petr Rockai
4124bb9ff5 Adopt more packages. 2014-01-28 18:11:00 +01:00
Petr Rockai
6f5be260b4 Adopt packages. 2014-01-28 17:31:17 +01:00
Peter Simons
134d52cb5f haskell-HaRe: update to version 0.7.1.1 2014-01-28 14:59:47 +01:00
Peter Simons
dc354b0beb haskell-HaRe: update to version 0.7.1.0 2014-01-28 14:59:46 +01:00
Eelco Dolstra
d92dc9bb3e gdb: Build on Darwin
Note that it doesn't actually work unless you run it as root, because
the Darwin kernel disallows unsigned debuggers (you'll get an error
message "please check gdb is codesigned").
2014-01-28 11:03:01 +01:00
Rok Garbas
8741ff387d phantomjs: update to 1.9.7 2014-01-28 00:39:20 +00:00
Eelco Dolstra
1b598da460 Drop unnecessary setting of java.home 2014-01-25 03:04:46 +01:00
Eelco Dolstra
e07ce3314d Fix some "meta.licenses" attributes 2014-01-25 03:04:46 +01:00
Eelco Dolstra
230a00f644 findbugs: Clean up packaging
Most stuff is now hidden under $out/libexec/findbugs, with only a few
JARs exported via $out/share/java.  Also, the setup hook sets
FINDBUGS_HOME.
2014-01-23 14:17:44 +01:00
Vladimír Čunát
ac6761c908 Merge master into stdenv-updates
Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix
2014-01-20 19:39:28 +01:00
Peter Simons
f0740ac2bc happy: add version 1.19.3 2014-01-20 18:28:02 +01:00
Peter Simons
5333854aa4 haskell-cabal2nix: re-generate with cabal2nix 2014-01-20 18:06:05 +01:00
Peter Simons
c6be3dbf1d scons: add pythonPath attribute to ensure that the python-wrapper recognizes this package as providing a python library 2014-01-20 13:29:36 +01:00
Mathijs Kwik
9878037603 haskell-hasktags: upgrade to 0.68.6 2014-01-19 16:06:18 +01:00
Marco Maggesi
389da8b64c Update camlp5 to version 6.11 2014-01-18 20:56:44 +00:00