Commit graph

17854 commits

Author SHA1 Message Date
Yury G. Kudryashov 043000cf35 Fix eval
svn path=/nixpkgs/trunk/; revision=32130
2012-02-07 21:03:20 +00:00
Yury G. Kudryashov a8dba7888b Move gtkLibs3x to top-level namespace, gtk+-3.2.3
Cherry-pick /nixpkgs/branches/glib-2.30@32044

svn path=/nixpkgs/trunk/; revision=32129
2012-02-07 21:03:16 +00:00
Yury G. Kudryashov acd9d6b42e pango-1.29: use fetchurl
cherry-pick /nixpkgs/branches/glib-2.30@32043

svn path=/nixpkgs/trunk/; revision=32128
2012-02-07 21:03:12 +00:00
Peter Simons 07a925d08a nbd: re-enable the test suite to see what happens
svn path=/nixpkgs/trunk/; revision=32127
2012-02-07 19:54:31 +00:00
Peter Simons 1451109c95 nbd: linking with -lrt is no longer necessary because we don't link glib statically anymore
svn path=/nixpkgs/trunk/; revision=32126
2012-02-07 19:54:28 +00:00
Peter Simons a62fa4480a nbd: updated to version 2.9.25
svn path=/nixpkgs/trunk/; revision=32125
2012-02-07 19:54:25 +00:00
Peter Simons 4afaf0be23 emacs-w3m: updated the SHA256 hash
Thanks Ludo!

svn path=/nixpkgs/trunk/; revision=32124
2012-02-07 17:45:47 +00:00
Florian Friesdorf 2f7102afc0 emacs 24.0.93
svn path=/nixpkgs/trunk/; revision=32123
2012-02-07 17:40:05 +00:00
Florian Friesdorf df12f0bd01 emacs js2-mode
svn path=/nixpkgs/trunk/; revision=32122
2012-02-07 17:40:02 +00:00
Florian Friesdorf af8aceb847 notmuch cosmetical change
svn path=/nixpkgs/trunk/; revision=32121
2012-02-07 17:39:59 +00:00
Florian Friesdorf 58bd562e28 python-matplotlib-1.1.0
svn path=/nixpkgs/trunk/; revision=32120
2012-02-07 17:39:56 +00:00
Florian Friesdorf f3b60febd3 calfw-1.3-5-ga9b6615 for fix in combination with org-mode
svn path=/nixpkgs/trunk/; revision=32119
2012-02-07 17:39:54 +00:00
Florian Friesdorf 4e3afe1b8d emacs mode calfw-1.3
svn path=/nixpkgs/trunk/; revision=32118
2012-02-07 17:39:51 +00:00
Peter Simons 29869899a8 ikiwiki: updated to version 3.20120202
svn path=/nixpkgs/trunk/; revision=32116
2012-02-07 14:01:05 +00:00
Peter Simons f57a6512b8 perl-packages.nix: strip trailing whitespace
svn path=/nixpkgs/trunk/; revision=32115
2012-02-07 14:01:03 +00:00
Peter Simons c9201bdf53 YAML-LibYAML: added version 0.38
svn path=/nixpkgs/trunk/; revision=32114
2012-02-07 14:01:00 +00:00
Eelco Dolstra c303784a89 * Debian 6.0.4.
svn path=/nixpkgs/trunk/; revision=32112
2012-02-07 13:19:03 +00:00
Eelco Dolstra 78ab1dd995 * Added Fedora 16 images.
svn path=/nixpkgs/trunk/; revision=32110
2012-02-07 13:14:25 +00:00
Eelco Dolstra b22276deea * Add disk images for Ubuntu 11.10.
svn path=/nixpkgs/trunk/; revision=32109
2012-02-07 12:38:32 +00:00
Eelco Dolstra e4ee3e2c9b * svn2git updated to 2.2.0.
svn path=/nixpkgs/trunk/; revision=32108
2012-02-07 12:22:48 +00:00
Peter Simons 6789ec0c84 haskell-cpphs: updated to version 1.13.3
svn path=/nixpkgs/trunk/; revision=32107
2012-02-07 10:34:43 +00:00
Peter Simons 77f1415102 haskell-wxdirect: updated to version 0.13.1.2
svn path=/nixpkgs/trunk/; revision=32106
2012-02-07 10:34:40 +00:00
Peter Simons a3cab4b496 haskell-wxcore: updated to version 0.13.2.1
svn path=/nixpkgs/trunk/; revision=32105
2012-02-07 10:34:38 +00:00
Peter Simons 99e9375631 haskell-wx: updated to version 0.13.2.1
svn path=/nixpkgs/trunk/; revision=32104
2012-02-07 10:34:35 +00:00
Peter Simons 572260e237 haskell-system-filepath: updated to version 0.4.6
svn path=/nixpkgs/trunk/; revision=32103
2012-02-07 10:34:33 +00:00
Peter Simons d5d4995b03 haskell-pandoc: updated to version 1.9.0.5
svn path=/nixpkgs/trunk/; revision=32102
2012-02-07 10:34:30 +00:00
Peter Simons a2df0e09ff haskell-zlib: added version 0.5.3.3
svn path=/nixpkgs/trunk/; revision=32101
2012-02-07 10:34:28 +00:00
Peter Simons 6704a7379b haskell-test-framework: dropped version 0.4.2.2
Pandoc updated to 0.5.

svn path=/nixpkgs/trunk/; revision=32100
2012-02-07 10:34:25 +00:00
Lluís Batlle i Rossell a21457ffa8 Updating crypto++ to 5.6.1
svn path=/nixpkgs/trunk/; revision=32098
2012-02-07 09:18:04 +00:00
Arie Middelkoop 3f5643417a linux-firmware-nonfree 0.33 -> 0.35
svn path=/nixpkgs/trunk/; revision=32097
2012-02-07 09:14:34 +00:00
Arie Middelkoop f1a6497357 Linux kernel 3.2.2 -> 3.2.4.
svn path=/nixpkgs/trunk/; revision=32096
2012-02-07 09:13:45 +00:00
Michael Raskin b340f86ba2 Low priority for ff11b
svn path=/nixpkgs/trunk/; revision=32095
2012-02-07 08:57:42 +00:00
Yury G. Kudryashov a41d989a1e svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32093
2012-02-06 23:08:11 +00:00
Yury G. Kudryashov 215a07c1a9 svn merge ^/nixpkgs/trunk
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Yury G. Kudryashov 3312baae82 lcms2-2.3
svn path=/nixpkgs/trunk/; revision=32088
2012-02-06 22:08:04 +00:00
Peter Simons 4e3dcd9254 esniper: updated to version 2.27.0
svn path=/nixpkgs/trunk/; revision=32087
2012-02-06 21:26:46 +00:00
Peter Simons febe726020 duplicity: updated to version 0.6.17
svn path=/nixpkgs/trunk/; revision=32086
2012-02-06 19:45:18 +00:00
Peter Simons 796f0ad5bc i7z: better cpu frequency/turbo boost checker for intel core i{3,5,7}
svn path=/nixpkgs/trunk/; revision=32082
2012-02-06 19:09:04 +00:00
Peter Simons 5a34b4f9a1 uhc: upgraded to 1.1.3
svn path=/nixpkgs/trunk/; revision=32081
2012-02-06 19:09:01 +00:00
Peter Simons ace1095639 upgraded emacs-w3m
svn path=/nixpkgs/trunk/; revision=32080
2012-02-06 19:08:58 +00:00
Peter Simons 66a1330589 v8/nodejs: upgraded to 3.6.6.20 and 0.6.9
svn path=/nixpkgs/trunk/; revision=32079
2012-02-06 19:08:56 +00:00
Peter Simons 4bfbdda332 frandom: very fast random number generator kernel module
nixos support via services.frandom.enable

svn path=/nixpkgs/trunk/; revision=32078
2012-02-06 19:08:52 +00:00
Peter Simons 1b85da5ae3 ghc-mod: upgraded to 1.0.8
svn path=/nixpkgs/trunk/; revision=32077
2012-02-06 19:08:48 +00:00
Vladimír Čunát e6c4bcf8fb Patched broadcom_sta with for kernels 2.6.39 and 3.2
Patches taken from Gentoo, builds OK now.

svn path=/nixpkgs/trunk/; revision=32076
2012-02-06 19:06:47 +00:00
Peter Simons fd12c85a33 haskell-hakyll: updated to version 3.2.6.0
svn path=/nixpkgs/trunk/; revision=32075
2012-02-06 18:28:22 +00:00
Peter Simons bb5f77cfaa haskell-pandoc: updated to version 1.9.0.3
svn path=/nixpkgs/trunk/; revision=32074
2012-02-06 18:28:19 +00:00
Peter Simons efa830e5c4 haskell-temporary: updated meta section
svn path=/nixpkgs/trunk/; revision=32073
2012-02-06 18:28:16 +00:00
Peter Simons 14e803ff8a haskell-test-framework: added version 0.4.2.2 (required by pandoc)
svn path=/nixpkgs/trunk/; revision=32072
2012-02-06 18:28:12 +00:00
Peter Simons 31298a29ae haskell-hlint: updated to version 1.8.23
svn path=/nixpkgs/trunk/; revision=32069
2012-02-06 14:28:02 +00:00
Peter Simons ad07ce6e67 haskell-vector-algorithms: updated to version 0.5.4
svn path=/nixpkgs/trunk/; revision=32068
2012-02-06 14:27:59 +00:00
Peter Simons 066cd10d99 haskell-texmath: updated to version 0.6.0.1
svn path=/nixpkgs/trunk/; revision=32067
2012-02-06 14:27:57 +00:00
Peter Simons 9a2922dec5 haskell-system-filepath: updated to version 0.4.5
svn path=/nixpkgs/trunk/; revision=32066
2012-02-06 14:27:54 +00:00
Peter Simons 84bfd464d0 haskell-system-fileio: updated to version 0.3.4
svn path=/nixpkgs/trunk/; revision=32065
2012-02-06 14:27:52 +00:00
Peter Simons 1eb5674ebf haskell-parsimony: updated to version 1.3
svn path=/nixpkgs/trunk/; revision=32064
2012-02-06 14:27:49 +00:00
Peter Simons f11b58a1b1 haskell-pandoc: updated to version 1.9.0.2
svn path=/nixpkgs/trunk/; revision=32063
2012-02-06 14:27:47 +00:00
Peter Simons 6b7de9b5fc haskell-pandoc-types: updated to version 1.9.0.2
svn path=/nixpkgs/trunk/; revision=32062
2012-02-06 14:27:44 +00:00
Peter Simons 9cacf79ac0 haskell-highlighting-kate: updated to version 0.5.0.1
svn path=/nixpkgs/trunk/; revision=32061
2012-02-06 14:27:42 +00:00
Peter Simons 84a2bcfb26 haskell-OpenGLRaw: updated to version 1.2.0.0
svn path=/nixpkgs/trunk/; revision=32060
2012-02-06 14:27:40 +00:00
Peter Simons a1cd71b5af haskell-HaskellForMaths: updated to version 0.4.3
svn path=/nixpkgs/trunk/; revision=32059
2012-02-06 14:27:37 +00:00
Peter Simons eb53508829 haskell-Graphalyze: updated to version 0.12.0.0
svn path=/nixpkgs/trunk/; revision=32058
2012-02-06 14:27:35 +00:00
Peter Simons 6494e9a2c4 haskell-GLURaw: updated to version 1.2.0.0
svn path=/nixpkgs/trunk/; revision=32057
2012-02-06 14:27:32 +00:00
Peter Simons c682f95d63 haskell-temporary: added version 1.1.2.3
svn path=/nixpkgs/trunk/; revision=32056
2012-02-06 14:27:30 +00:00
Peter Simons 12dfa773aa haskell-haskell-src: 7.4.1 build was fixed by happy update
svn path=/nixpkgs/trunk/; revision=32055
2012-02-06 14:27:27 +00:00
Peter Simons 269b4776ce haskell: added OpenGL 5.0.0 and GLUT 2.3.0.0
svn path=/nixpkgs/trunk/; revision=32054
2012-02-06 14:27:24 +00:00
Peter Simons df0f103e86 haskell-http-conduit: downgrade to version 1.2.0
The latest version has requirements version that we cannot fulfill
without duplicating a lot of packages.

svn path=/nixpkgs/trunk/; revision=32053
2012-02-06 14:27:21 +00:00
Peter Simons 20f8c35e07 haskell-happy: added version 1.18.9
svn path=/nixpkgs/trunk/; revision=32052
2012-02-06 14:27:18 +00:00
Michael Raskin 8bae3c51ff Add Firefox 11beta
svn path=/nixpkgs/trunk/; revision=32048
2012-02-06 08:28:24 +00:00
Michael Raskin bc851612c9 A kludge to avoid removal of zlib from RPATH -- needed for LilyPond build
svn path=/nixpkgs/trunk/; revision=32046
2012-02-06 05:49:27 +00:00
Alexander Tsamutali 109068c605 applications/misc/goldendict: New nixpkg.
svn path=/nixpkgs/trunk/; revision=32045
2012-02-05 21:02:27 +00:00
Arie Middelkoop 2d7fe30288 Improved the expression for intel microcode.
svn path=/nixpkgs/trunk/; revision=32042
2012-02-05 20:44:19 +00:00
Yury G. Kudryashov c81e27f1f7 Move gtkLibs to top-level namespace
Earlier there was a strict correspondence between versions of gtkLibs.* but now
upstream moves to gtk-3.x, and there is no simple rule anymore. Thus it is
easier to override particular libs on a case-by-case basis than using gtkLibs2x.

svn path=/nixpkgs/trunk/; revision=32040
2012-02-05 18:29:42 +00:00
Yury G. Kudryashov 06a8db81ca qhull-2012.1
svn path=/nixpkgs/trunk/; revision=32039
2012-02-05 09:26:15 +00:00
Yury G. Kudryashov ba50fa3ad2 Whitespace
svn path=/nixpkgs/trunk/; revision=32038
2012-02-05 09:26:11 +00:00
Yury G. Kudryashov 33f14fc3cf enblend-enfuse-4.0
svn path=/nixpkgs/trunk/; revision=32037
2012-02-05 09:26:06 +00:00
Arie Middelkoop 3f1054b1ec Added 'bumblebee', a package that facilitates NVidia Optimus graphics with X11.
Note: it relies heavily on 'virtualgl'. This also makes the approach taken
by bumblebee not very effective.
So, this package is actually mainly useful for shutting down your card so that
it does not consume power/produce heat.

See the comments in bumblebee/default.nix

svn path=/nixpkgs/trunk/; revision=32036
2012-02-05 00:51:35 +00:00
Arie Middelkoop b4d5957ac4 Version bumb of 'xf86-synaptics' module, which fixes a cpu-stealing bug when using syndaemon.
svn path=/nixpkgs/trunk/; revision=32035
2012-02-05 00:43:54 +00:00
Ludovic Courtès d15738aca5 GnuTLS: Get Hydra to build the Guile-less variants.
svn path=/nixpkgs/trunk/; revision=32034
2012-02-04 23:21:33 +00:00
Shea Levy b59eac3bfc Add autotest-rails gem
svn path=/nixpkgs/trunk/; revision=32033
2012-02-04 15:04:04 +00:00
Peter Simons 60c8201514 analog: install images directory, too
svn path=/nixpkgs/trunk/; revision=32030
2012-02-04 10:48:48 +00:00
Peter Simons 282449afe8 analog: added version 6.0
svn path=/nixpkgs/trunk/; revision=32029
2012-02-04 10:32:07 +00:00
Peter Simons b69d6bf7e0 Moved all LaTeX expressions into tools/typesetting hierarchy.
svn path=/nixpkgs/trunk/; revision=32028
2012-02-04 09:31:07 +00:00
Peter Simons dbafd99a0a Moved python debugger into development/tools hierarchy.
svn path=/nixpkgs/trunk/; revision=32027
2012-02-04 09:30:53 +00:00
Peter Simons ce1ce28f96 haskell-yap: updated to version 0.2
svn path=/nixpkgs/trunk/; revision=32026
2012-02-04 08:38:09 +00:00
Peter Simons 49009f72ce haskell-hakyll: updated to version 3.2.5.1
svn path=/nixpkgs/trunk/; revision=32025
2012-02-04 08:38:04 +00:00
Peter Simons 2286dd1f51 haskell-packages.nix: updated configurations for older GHC versions to prefer a more modern DeepSeq
svn path=/nixpkgs/trunk/; revision=32023
2012-02-03 21:06:28 +00:00
Yury G. Kudryashov 4a5673f520 graphicsmagick: add meta.platforms
svn path=/nixpkgs/trunk/; revision=32022
2012-02-03 21:02:00 +00:00
Peter Simons 868d8c2d9c haskell-cabal2nix: updated to version 1.25
svn path=/nixpkgs/trunk/; revision=32021
2012-02-03 21:00:32 +00:00
Peter Simons 038a3e5b2e haskell-vty: updated to version 4.7.0.10
svn path=/nixpkgs/trunk/; revision=32020
2012-02-03 21:00:30 +00:00
Peter Simons 56230f309e haskell-nixos-types: updated to version 1.3
svn path=/nixpkgs/trunk/; revision=32019
2012-02-03 21:00:27 +00:00
Peter Simons 88f110cb75 haskell-ieee754: updated to version 0.7.3
svn path=/nixpkgs/trunk/; revision=32018
2012-02-03 21:00:24 +00:00
Peter Simons c77c727641 haskell-hackage-db: updated to version 1.2
svn path=/nixpkgs/trunk/; revision=32017
2012-02-03 21:00:21 +00:00
Peter Simons 2a10a4d967 haskell-bytestring-lexing: updated to version 0.4.0
svn path=/nixpkgs/trunk/; revision=32016
2012-02-03 21:00:18 +00:00
Peter Simons 412e5dd87d haskell-hledger-interest: updated to version 1.4
svn path=/nixpkgs/trunk/; revision=32015
2012-02-03 21:00:16 +00:00
Peter Simons 74e822d76a haskell-packages.nix: GHC 7.4.1 should use the latest version of regexPosix
svn path=/nixpkgs/trunk/; revision=32014
2012-02-03 21:00:13 +00:00
Peter Simons 69d6b66571 haskell-packages.nix: the latest regexPosix must use a matching regexBase in order to compile with older versions of GHC, i.e. 6.10.4
svn path=/nixpkgs/trunk/; revision=32013
2012-02-03 21:00:09 +00:00
Sander van der Burg 133e2db3de Upgraded broadcom-sta driver to version 5_100_82_112
svn path=/nixpkgs/trunk/; revision=32012
2012-02-03 20:51:06 +00:00
Sander van der Burg 37346e00a3 Enable IPv6 by default
svn path=/nixpkgs/trunk/; revision=32011
2012-02-03 20:50:33 +00:00
Peter Simons 875b61eeb9 haskell-cabal-file-th: patch cabal file to fix build with GHC 7.4.1
svn path=/nixpkgs/trunk/; revision=32010
2012-02-03 19:10:14 +00:00
Peter Simons 0861eb5a3d haskell-packages.nix: updated 'haskellPlatformArgs_future' configuration to reflect the current state of affairs for GHC 7.4.1
* DeepSeq has been removed because it's now a core package.
 * XHTML and network have been updated to the latest version.
 * The comments that state whether a package builds or not have been updated.

svn path=/nixpkgs/trunk/; revision=32009
2012-02-03 19:06:50 +00:00
Peter Simons 83c6e41b15 haskell-xhtml: added version 3000.2.0.5
svn path=/nixpkgs/trunk/; revision=32008
2012-02-03 19:06:47 +00:00
Peter Simons dd28867e4f haskell-network: added version 2.3.0.10
svn path=/nixpkgs/trunk/; revision=32007
2012-02-03 19:06:44 +00:00
Peter Simons 351627cb88 haskell-extensible-exceptions: added version 0.1.1.4
svn path=/nixpkgs/trunk/; revision=32006
2012-02-03 19:06:41 +00:00
Peter Simons 49ca209cd2 haskell-deepseq: added version 1.3.0.0
svn path=/nixpkgs/trunk/; revision=32005
2012-02-03 19:06:38 +00:00
Peter Simons 8cba75ac34 haskell-ieee754: added version 0.7.3
svn path=/nixpkgs/trunk/; revision=32004
2012-02-03 19:06:35 +00:00
Peter Simons 4d25e699a1 haskell-socks: updated to version 0.4.1
svn path=/nixpkgs/trunk/; revision=32003
2012-02-03 19:06:32 +00:00
Peter Simons f7889c850c haskell-language-javascript: updated to version 0.4.7
svn path=/nixpkgs/trunk/; revision=32002
2012-02-03 19:06:29 +00:00
Peter Simons d9546f6165 haskell-http-conduit: updated to version 1.2.3
svn path=/nixpkgs/trunk/; revision=32001
2012-02-03 19:06:26 +00:00
Peter Simons 77625e49e5 haskell-hjsmin: updated to version 0.0.15
svn path=/nixpkgs/trunk/; revision=32000
2012-02-03 19:06:23 +00:00
Peter Simons 65ad5c83ef haskell-hastache: updated to version 0.3.3
svn path=/nixpkgs/trunk/; revision=31999
2012-02-03 19:06:20 +00:00
Peter Simons 7851600fcf haskell-filepath: updated to version 1.3.0.0
svn path=/nixpkgs/trunk/; revision=31998
2012-02-03 19:06:18 +00:00
Peter Simons 51d6cf8c90 haskell-binary: updated to version 0.5.1.0
svn path=/nixpkgs/trunk/; revision=31997
2012-02-03 19:06:15 +00:00
Peter Simons ade99756f9 haskell-idris: updated to version 0.9.1
svn path=/nixpkgs/trunk/; revision=31996
2012-02-03 19:06:12 +00:00
Lluís Batlle i Rossell cf2591c5ec Updating rdesktop to 1.7.1
svn path=/nixpkgs/trunk/; revision=31993
2012-02-03 16:16:18 +00:00
Peter Simons 4aac439f00 redis: added version 2.4.7
Patch submitted by Phil Hagelberg <technomancy@gmail.com>.

svn path=/nixpkgs/trunk/; revision=31992
2012-02-03 13:12:07 +00:00
Andres Löh f2d6ca5d02 Added haskell-{bitarray,containers-deepseq,gd}.
svn path=/nixpkgs/trunk/; revision=31991
2012-02-03 12:15:00 +00:00
Karn Kallio cdf1a3a3c6 Racket version 5.2.1
svn path=/nixpkgs/trunk/; revision=31990
2012-02-02 22:41:21 +00:00
Andres Löh b66db5ca13 Add ghc-7.4.1. Remove Hydra building for the 7.2.* series.
svn path=/nixpkgs/trunk/; revision=31989
2012-02-02 21:08:30 +00:00
Ludovic Courtès f113ee27ad LZO 2.06.
svn path=/nixpkgs/trunk/; revision=31988
2012-02-02 20:49:42 +00:00
Yury G. Kudryashov 9758857fbe libdevil: pick a couple of debian patches
svn path=/nixpkgs/trunk/; revision=31986
2012-02-02 20:30:55 +00:00
Peter Simons 798890b819 haskell-zlib: drop version 0.5.3.2 again; it's causing lots of trouble
This change affects only GHC 7.2 or later.

svn path=/nixpkgs/trunk/; revision=31985
2012-02-02 17:03:01 +00:00
Eelco Dolstra 9d9e33b98d * Added Firefox 10.0. P.S. it seems that Firefox 10 no longer needs
--enable-official-branding to get a browser that calls itself
  "Firefox".  But I'll leave the flag in for the moment.
* Removed Firefox 8.0.

svn path=/nixpkgs/trunk/; revision=31984
2012-02-02 15:44:22 +00:00
Peter Simons bd2c29d553 haskell-persistent-sqlite: added version 0.6.2.1
svn path=/nixpkgs/trunk/; revision=31983
2012-02-02 14:54:56 +00:00
Peter Simons e11c942238 haskell-yesod-default: added version 0.5.0
svn path=/nixpkgs/trunk/; revision=31982
2012-02-02 14:54:53 +00:00
Peter Simons 0ff6866501 haskell-crypto-api: updated to version 0.9
svn path=/nixpkgs/trunk/; revision=31981
2012-02-02 13:33:58 +00:00
Peter Simons 57c1279ce8 haskell-clientsession: updated to version 0.7.4
svn path=/nixpkgs/trunk/; revision=31980
2012-02-02 13:33:54 +00:00
Eelco Dolstra 7b5db94b5f * Updated Adobe Reader to 9.4.7.
svn path=/nixpkgs/trunk/; revision=31978
2012-02-02 12:19:17 +00:00
Peter Simons 0f5ff15cb9 haskell-http-conduit: updated to version 1.2.0
svn path=/nixpkgs/trunk/; revision=31977
2012-02-02 10:52:15 +00:00
Peter Simons c9a9d81471 haskell-conduit: updated to version 0.1.1.1
svn path=/nixpkgs/trunk/; revision=31976
2012-02-02 10:52:12 +00:00
Peter Simons e3e09ea617 haskell-packages.nix: disabled hledger-vty and hledger-chart
These packages don't build with current versions of hledger-lib. I'll ask
upstream about an update.

svn path=/nixpkgs/trunk/; revision=31975
2012-02-02 10:38:08 +00:00
Peter Simons 9aae354adf haskell-zlib-bindings: updated to version 0.0.3.1
svn path=/nixpkgs/trunk/; revision=31974
2012-02-02 10:38:06 +00:00
Peter Simons de4350af7d haskell-test-framework: updated to version 0.5
svn path=/nixpkgs/trunk/; revision=31973
2012-02-02 10:38:03 +00:00
Peter Simons 36f7262ef3 haskell-socks: updated to version 0.4.0
svn path=/nixpkgs/trunk/; revision=31972
2012-02-02 10:38:01 +00:00
Peter Simons 3170847b13 haskell-hledger: updated to version 0.17
svn path=/nixpkgs/trunk/; revision=31971
2012-02-02 10:37:58 +00:00
Peter Simons c7f15bf35e haskell-hledger-web: updated to version 0.17
svn path=/nixpkgs/trunk/; revision=31970
2012-02-02 10:37:56 +00:00
Peter Simons a4eebff1d2 haskell-hledger-lib: updated to version 0.17
svn path=/nixpkgs/trunk/; revision=31969
2012-02-02 10:37:53 +00:00
Peter Simons 02ef8dd73f haskell-citeproc-hs: updated to version 0.3.4
svn path=/nixpkgs/trunk/; revision=31968
2012-02-02 10:37:51 +00:00
Peter Simons 8c1822d2d8 haskell-socks: added version 0.4.0
svn path=/nixpkgs/trunk/; revision=31967
2012-02-02 10:37:48 +00:00
Peter Simons d7b739d9a5 haskell-cmdargs: deleted obsolete 0.8 version
svn path=/nixpkgs/trunk/; revision=31966
2012-02-02 10:37:45 +00:00
Rob Vermaas d52b0c377f rpmclosure, remove exit
svn path=/nixpkgs/trunk/; revision=31965
2012-02-02 09:54:16 +00:00
Rob Vermaas 6a3feaa3dc rpmclosure, also take into account rel attribute when versions are the same
svn path=/nixpkgs/trunk/; revision=31964
2012-02-02 09:53:45 +00:00
Lluís Batlle i Rossell f53c231cc4 Updating truecrypt to 7.1.
I pick the tarball not from the mainsite, but we checked that the hash
corresponds with that of the main site.


svn path=/nixpkgs/trunk/; revision=31963
2012-02-02 08:54:54 +00:00
Yury G. Kudryashov 2b3fb5a824 Merge two nix exprs for links2, upgrade to 2.5
svn path=/nixpkgs/trunk/; revision=31962
2012-02-01 22:33:35 +00:00
Yury G. Kudryashov 75262bcbed zip, unzip: add NLS support
svn path=/nixpkgs/trunk/; revision=31961
2012-02-01 22:32:16 +00:00
Yury G. Kudryashov 89de1150d5 Add libnatspec
svn path=/nixpkgs/trunk/; revision=31960
2012-02-01 22:32:12 +00:00
Arie Middelkoop cc145f2ae9 Update of skype expression: make the use of pulse audio optional based on the configuration setting for pulse audio (off by default).
Removing pulse audio from the build inputs when it is not used prevents the bug of Skype taking 100% cpu from showing up.
This demonstrates nicely nix' features: in other distributions the recomended solution was to remove read permission from the
pulse audio libs.

svn path=/nixpkgs/trunk/; revision=31959
2012-02-01 22:09:35 +00:00
Arie Middelkoop acda2c1967 Makes a .desktop startup item from a .desktop menu entry.
svn path=/nixpkgs/trunk/; revision=31958
2012-02-01 22:06:49 +00:00
Arie Middelkoop 4b45a0bfc3 Microcode for intel processors (put in firmware, and 'modprobe microcode')
svn path=/nixpkgs/trunk/; revision=31957
2012-02-01 22:05:21 +00:00
Marco Maggesi 7c90b6a9bc Update HOL Light to rev 122.
svn path=/nixpkgs/trunk/; revision=31956
2012-02-01 14:37:50 +00:00
Peter Simons eeeab81863 haskell-xml-conduit: updated to version 0.5.2
svn path=/nixpkgs/trunk/; revision=31955
2012-02-01 10:40:07 +00:00
Peter Simons ea46f84a54 haskell-web-routes: updated to version 0.26.3
svn path=/nixpkgs/trunk/; revision=31954
2012-02-01 10:40:04 +00:00
Peter Simons 128f2e48d1 haskell-skein: updated to version 0.1.0.5
svn path=/nixpkgs/trunk/; revision=31953
2012-02-01 10:40:02 +00:00
Peter Simons 349b073889 haskell-pool-conduit: updated to version 0.0.0.1
svn path=/nixpkgs/trunk/; revision=31952
2012-02-01 10:39:59 +00:00
Peter Simons 17fefff71d haskell-happstack-util: updated to version 6.0.3
svn path=/nixpkgs/trunk/; revision=31951
2012-02-01 10:39:57 +00:00
Peter Simons 8347954f58 haskell-fast-logger: updated to version 0.0.2
svn path=/nixpkgs/trunk/; revision=31950
2012-02-01 10:39:54 +00:00
Peter Simons 690be29797 haskell-data-object-yaml: updated to version 0.3.4.2
svn path=/nixpkgs/trunk/; revision=31949
2012-02-01 10:39:50 +00:00
Ludovic Courtès 7dc9366796 GNU help2man: Wrap the program to have a correct $PERL5LIB.
svn path=/nixpkgs/trunk/; revision=31948
2012-01-31 15:50:51 +00:00
Ludovic Courtès 27100c36c4 GNU help2man 1.40.5.
svn path=/nixpkgs/trunk/; revision=31947
2012-01-31 15:31:23 +00:00
Ludovic Courtès 38391383f0 GNU Guile 2.0.5.
svn path=/nixpkgs/trunk/; revision=31946
2012-01-31 15:02:38 +00:00
Eelco Dolstra f7626c1ddd * Unbreak icewm. Without -lfontconfig, it barfs with
icewm: error while loading shared libraries: libfontconfig.so.1:
    cannot open shared object file: No such file or directory

  This causes various NixOS tests to fail
  (e.g. http://hydra.nixos.org/build/1952097).

svn path=/nixpkgs/trunk/; revision=31945
2012-01-31 14:55:43 +00:00
Florian Friesdorf bf95f7fa3c Revert "sudo upgrade to 1.8.3p2 (security fix included)"
before was 1.7.2, which is not affected

svn path=/nixpkgs/trunk/; revision=31944
2012-01-31 14:09:54 +00:00
Florian Friesdorf 8565aba2cd sudo upgrade to 1.8.3p2 (security fix included)
svn path=/nixpkgs/trunk/; revision=31943
2012-01-31 13:49:53 +00:00
Peter Simons 3f5dc79546 haskell-string-combinators: updated to version 0.6.0.3
svn path=/nixpkgs/trunk/; revision=31942
2012-01-31 12:13:28 +00:00
Peter Simons 3dfbf75fff haskell-hmatrix: updated to version 0.13.1.0
svn path=/nixpkgs/trunk/; revision=31941
2012-01-31 12:13:26 +00:00
Peter Simons 325f8d0b28 haskell-email-validate: updated to version 0.2.8
svn path=/nixpkgs/trunk/; revision=31940
2012-01-31 12:13:22 +00:00
Eelco Dolstra 4fe11e8438 * OpenSSH updated to 5.9p1.
svn path=/nixpkgs/trunk/; revision=31939
2012-01-31 11:01:12 +00:00
Rob Vermaas 6cff3215f4 add meta attribute for cowsay
svn path=/nixpkgs/trunk/; revision=31938
2012-01-31 06:59:02 +00:00
Lluís Batlle i Rossell d341b2537c Updating ffmpeg/x264/vpx
svn path=/nixpkgs/trunk/; revision=31937
2012-01-30 21:02:08 +00:00
Rob Vermaas 37b404816a add cowsay
svn path=/nixpkgs/trunk/; revision=31936
2012-01-30 19:05:24 +00:00
Eelco Dolstra 399c575139 * Updated Spotify to 0.6.6.10.
svn path=/nixpkgs/trunk/; revision=31935
2012-01-30 16:44:56 +00:00
Peter Simons c5ecd1752c hardlink: initial version
Hardlink consolidates duplicate files in a directory hierarchy with hardlinks,
similar to "nix-store --optimise".

IHMO, this program should be run by the default builder after $out has been set
up, to remove redundancy in the generated closures.

svn path=/nixpkgs/trunk/; revision=31934
2012-01-30 11:40:20 +00:00
Peter Simons f1e16ea3c9 ikiwiki: updated to version 3.20120115
svn path=/nixpkgs/trunk/; revision=31933
2012-01-30 11:40:16 +00:00
Peter Simons b2bbcc7d5f haskell-cabal-ghci: updated to version 0.2.1
svn path=/nixpkgs/trunk/; revision=31932
2012-01-30 10:52:13 +00:00
Peter Simons b24279ff39 haskell-hledger-chart: updated to version 0.16.1
svn path=/nixpkgs/trunk/; revision=31931
2012-01-30 10:52:10 +00:00
Peter Simons 8b972e410c haskell-Chart: updated to version 0.15
svn path=/nixpkgs/trunk/; revision=31930
2012-01-30 10:52:07 +00:00
Peter Simons 9d693c2e4e haskell-cmdargs: added version 0.9.2
svn path=/nixpkgs/trunk/; revision=31929
2012-01-30 10:52:04 +00:00
Peter Simons 588da3fbf3 haskell-packages.nix: cosmetic
svn path=/nixpkgs/trunk/; revision=31928
2012-01-30 10:52:01 +00:00
Ludovic Courtès 010edf825c Add pthreads-w32.
svn path=/nixpkgs/trunk/; revision=31927
2012-01-30 09:53:45 +00:00
Ludovic Courtès 67a45c1d25 MinGW 3.20, and w32api 3.17-2.
svn path=/nixpkgs/trunk/; revision=31926
2012-01-30 09:53:39 +00:00
Alexander Tsamutali 55e74d5e9a games/oilrush: New nixpkg.
svn path=/nixpkgs/trunk/; revision=31925
2012-01-29 22:44:49 +00:00
Shea Levy 7fb6f58f99 Add the selenium-webdriver rubygem
svn path=/nixpkgs/trunk/; revision=31924
2012-01-29 20:40:32 +00:00
Shea Levy 32fcb78c1f Update rubygems
svn path=/nixpkgs/trunk/; revision=31923
2012-01-29 18:22:35 +00:00
Shea Levy c277a6bc53 Update ruby 1.8
This contains a fix for http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-4815.
All users of ruby 1.8 for web-facing apps should upgrade

svn path=/nixpkgs/trunk/; revision=31922
2012-01-29 18:00:22 +00:00
Peter Simons 086e9a090b haskell-cabal2nix: updated to version 1.24
svn path=/nixpkgs/trunk/; revision=31921
2012-01-29 16:24:14 +00:00
Peter Simons 293b72cf19 haskell-neither: updated to version 0.3.1
svn path=/nixpkgs/trunk/; revision=31920
2012-01-29 16:24:11 +00:00
Peter Simons cab0e0119d haskell-mime-mail: updated to version 0.4.1.1
svn path=/nixpkgs/trunk/; revision=31919
2012-01-29 16:24:08 +00:00
Peter Simons a11aaa99b2 haskell-explicit-exception: updated to version 0.1.6
svn path=/nixpkgs/trunk/; revision=31918
2012-01-29 16:24:05 +00:00
Peter Simons e83a85ed6d haskell-bytestring-lexing: updated to version 0.3.0
svn path=/nixpkgs/trunk/; revision=31917
2012-01-29 16:24:02 +00:00
Peter Simons bab857eb38 haskell-blaze-builder: updated to version 0.3.1.0
svn path=/nixpkgs/trunk/; revision=31916
2012-01-29 16:24:00 +00:00
Peter Simons 5792ce967f haskell-multiarg: added version 0.1.0.0
svn path=/nixpkgs/trunk/; revision=31915
2012-01-29 16:23:57 +00:00
Peter Simons 1bc0a60bf8 haskell-explicit-exception: added version 0.1.6
svn path=/nixpkgs/trunk/; revision=31914
2012-01-29 16:23:53 +00:00
Cillian de Roiste 467722ad1a Patching the prefix, since it is hardcoded. The application seems to work correctly now, although it does crash with my current gtk theme (oxygen) when adding a stream. Using the gnome gtk-icon-theme does work, but this is probably just a bug in the oxygen gtk theme and should be fixed there.
svn path=/nixpkgs/trunk/; revision=31913
2012-01-29 13:39:30 +00:00
Andres Löh a819ccf030 Updated GHC snapshot to ghc-7.4.1-rc2.
svn path=/nixpkgs/trunk/; revision=31910
2012-01-28 15:34:53 +00:00
Yury G. Kudryashov 71c28d0e33 Use meta.platforms
svn path=/nixpkgs/trunk/; revision=31909
2012-01-28 14:39:56 +00:00
Peter Simons 12e953b944 gmp: updated (unused) version 5.0.1 to 5.0.3
svn path=/nixpkgs/trunk/; revision=31908
2012-01-28 14:37:53 +00:00
Yury G. Kudryashov 9d67ff2a48 Remove glib-1.x and its reverse dependencies
Nobody told me that he uses generator or xmms, so I'm removing this old stuff.

svn path=/nixpkgs/trunk/; revision=31907
2012-01-28 13:06:07 +00:00
Yury G. Kudryashov 4b36b6132f Introduce libiconvOrNull and libiconvOrGlibc
One can use these attrs instead of custom 'if ... then libiconv else null'.
This way we can maintain the correct 'if ... then' check in one place.

NB: I don't know what is the correct condition, so I use stdenv.isLinux. Feel
free to fix this.

svn path=/nixpkgs/trunk/; revision=31906
2012-01-28 12:44:42 +00:00
Peter Simons 7d9442e2c3 Removed obsolete comment.
svn path=/nixpkgs/trunk/; revision=31904
2012-01-28 10:20:57 +00:00
Peter Simons 37d2e2e917 gmp: renamed nix files to conform with coding guidelines
svn path=/nixpkgs/trunk/; revision=31903
2012-01-28 10:20:50 +00:00
Yury G. Kudryashov 8c1f88549d fontforge-20100222
svn path=/nixpkgs/trunk/; revision=31902
2012-01-28 09:04:48 +00:00
Lluís Batlle i Rossell 415b2bb145 Adding cppnetlib 0.9.2. The last I found in their github.
svn path=/nixpkgs/trunk/; revision=31901
2012-01-27 20:40:44 +00:00
Peter Simons 999502f95c haskell-zlib-bindings: updated to version 0.0.3
svn path=/nixpkgs/trunk/; revision=31900
2012-01-27 20:31:20 +00:00
Peter Simons fb5c1e0687 haskell-test-framework: updated to version 0.4.2.1
svn path=/nixpkgs/trunk/; revision=31899
2012-01-27 20:31:17 +00:00
Peter Simons 8cc520bd88 haskell-test-framework-quickcheck2: updated to version 0.2.12
svn path=/nixpkgs/trunk/; revision=31898
2012-01-27 20:31:15 +00:00
Peter Simons 2be13ee004 haskell-test-framework-quickcheck: updated to version 0.2.8
svn path=/nixpkgs/trunk/; revision=31897
2012-01-27 20:31:12 +00:00
Peter Simons 45312449cc haskell-test-framework-hunit: updated to version 0.2.7
svn path=/nixpkgs/trunk/; revision=31896
2012-01-27 20:31:09 +00:00
Peter Simons c3883364c6 haskell-ansi-wl-pprint: updated to version 0.6.4
svn path=/nixpkgs/trunk/; revision=31895
2012-01-27 20:31:06 +00:00
Peter Simons 47c3e4b2a3 haskell-zlib: added version 0.5.3.2
This version is disabled for all versions of GHC older than 7.2, because
it won't build. Upstream has been notified.

svn path=/nixpkgs/trunk/; revision=31894
2012-01-27 20:31:03 +00:00
Peter Simons bbe935774d haskell-GLFW: added version 0.5.0.1
svn path=/nixpkgs/trunk/; revision=31893
2012-01-27 20:31:00 +00:00
Yury G. Kudryashov ed92080b8d icewm-1.3.7
svn path=/nixpkgs/trunk/; revision=31890
2012-01-27 18:56:31 +00:00
Yury G. Kudryashov b31c67e24d svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31887
2012-01-27 16:43:39 +00:00
Yury G. Kudryashov afc0aea6d1 kalzium: patch pushed upstream
svn path=/nixpkgs/trunk/; revision=31886
2012-01-27 16:31:54 +00:00
Lluís Batlle i Rossell 3c5fee5243 I revert the previous change to libreoffice.
svn path=/nixpkgs/trunk/; revision=31885
2012-01-27 15:14:29 +00:00
Lluís Batlle i Rossell 29ca4d272f Updating gdb. I did not update the 'bleeding edge' thing though. That should be
better named to "one git checkout" instead of bleeding edge.


svn path=/nixpkgs/trunk/; revision=31883
2012-01-27 15:11:17 +00:00
Ludovic Courtès 41445f89c3 TeXLive/ModernCV: Fix source hash.
svn path=/nixpkgs/trunk/; revision=31881
2012-01-27 14:40:58 +00:00
Eelco Dolstra 26bcec3897 * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=31880
2012-01-27 13:39:47 +00:00
Yury G. Kudryashov 3256c40575 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31878
2012-01-27 11:48:58 +00:00
Ludovic Courtès b793816a34 hwloc 1.4.
svn path=/nixpkgs/trunk/; revision=31877
2012-01-27 11:03:20 +00:00
Yury G. Kudryashov fdae7ad9f4 Pass stable/unstable to l10n
svn path=/nixpkgs/trunk/; revision=31876
2012-01-27 10:03:32 +00:00
Michael Raskin 345da504ea Update SBCL
svn path=/nixpkgs/trunk/; revision=31875
2012-01-27 07:26:21 +00:00
Arie Middelkoop c4fdb28b80 Stable kernel 3.2.2 released today.
svn path=/nixpkgs/trunk/; revision=31874
2012-01-26 23:25:39 +00:00
Arie Middelkoop 7c8ab92620 kwooty expression: slight improvement of the build inputs.
svn path=/nixpkgs/trunk/; revision=31873
2012-01-26 23:24:40 +00:00
Arie Middelkoop 2782836036 Bluetooth driver version bumb.
The previous version gave a runtime error. Perhaps this one works better...

svn path=/nixpkgs/trunk/; revision=31872
2012-01-26 23:23:32 +00:00
Yury G. Kudryashov 94372bc342 akonadi-1.7.0
svn path=/nixpkgs/trunk/; revision=31871
2012-01-26 20:07:54 +00:00
Michael Raskin 393f2479f8 Fix mismatch...
svn path=/nixpkgs/trunk/; revision=31870
2012-01-26 19:39:45 +00:00
Michael Raskin 51634c2137 Adding OpenSCAD - a 3D geometry interpreter
svn path=/nixpkgs/trunk/; revision=31869
2012-01-26 19:01:38 +00:00
Michael Raskin 53bcb2094f Adding CGAL: Computational Geometry Algorithms Library
svn path=/nixpkgs/trunk/; revision=31868
2012-01-26 18:28:53 +00:00
Michael Raskin 9f2be8d6b1 Update GLEW
svn path=/nixpkgs/trunk/; revision=31867
2012-01-26 18:04:02 +00:00
Sander van der Burg 4d266a5f56 Upgraded smack library to version 3.2.1
svn path=/nixpkgs/trunk/; revision=31865
2012-01-26 16:05:17 +00:00
Yury G. Kudryashov 5b132f6e96 svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00
Peter Simons d9de74edd6 haskell-hlint: updated to version 1.8.21
svn path=/nixpkgs/trunk/; revision=31862
2012-01-26 14:20:27 +00:00
Peter Simons bc7b6215eb haskell-pool: updated to version 0.1.2.1
svn path=/nixpkgs/trunk/; revision=31861
2012-01-26 14:20:25 +00:00
Peter Simons e63055f4de haskell-hakyll: updated to version 3.2.5.0
svn path=/nixpkgs/trunk/; revision=31860
2012-01-26 14:20:22 +00:00
Peter Simons 77b74105f6 haskell-fclabels: updated to version 1.1.0.2
svn path=/nixpkgs/trunk/; revision=31859
2012-01-26 14:20:20 +00:00
Peter Simons a5d419ea5a haskell-resource-pool: added version 0.2.1.0
svn path=/nixpkgs/trunk/; revision=31858
2012-01-26 14:20:17 +00:00
Peter Simons b968c011c6 haskell-pool-conduit: added version 0.0.0
svn path=/nixpkgs/trunk/; revision=31857
2012-01-26 14:20:14 +00:00
Peter Simons 4752d7201c haskell-ghc-mod: don't hard-code a specific version of emacsPackages into the expression itself
Instead, one of the available version is chosen in haskell-packages.nix, when
the expression is instantiated.

Also updated the meta section.

svn path=/nixpkgs/trunk/; revision=31856
2012-01-26 14:20:11 +00:00
Peter Simons adc8828c96 development/tools/parsing/ebnf2ps: added initial version 1.0.8
svn path=/nixpkgs/trunk/; revision=31855
2012-01-26 14:20:06 +00:00
Sander van der Burg b54d8fc58d Updated ejabberd to version 2.1.10
svn path=/nixpkgs/trunk/; revision=31854
2012-01-26 13:57:57 +00:00
Shea Levy df587970ce rubygems: bump
svn path=/nixpkgs/trunk/; revision=31853
2012-01-26 13:39:31 +00:00
Michael Raskin b9916f0fd9 Add K3D 3D editor
svn path=/nixpkgs/trunk/; revision=31850
2012-01-26 13:12:36 +00:00
Yury G. Kudryashov 2ac0c88674 Fix errors found by test-eval-release
svn path=/nixpkgs/trunk/; revision=31847
2012-01-26 10:07:00 +00:00
Yury G. Kudryashov ecea8900e7 KDE-4.8.0
svn path=/nixpkgs/trunk/; revision=31845
2012-01-26 08:36:28 +00:00
Yury G. Kudryashov 72116657d4 torcs-1.3.2, builds with libpng-1.5
svn path=/nixpkgs/trunk/; revision=31844
2012-01-26 08:36:23 +00:00
Yury G. Kudryashov eb59b98c26 vlc-1.1.13
svn path=/nixpkgs/trunk/; revision=31843
2012-01-26 08:36:18 +00:00
Shea Levy 7cc21234f6 mysql55: Get building on darwin
svn path=/nixpkgs/trunk/; revision=31842
2012-01-26 02:08:48 +00:00
Shea Levy e45f42bdf1 Update rubygems
svn path=/nixpkgs/trunk/; revision=31841
2012-01-26 01:35:43 +00:00
Arie Middelkoop 62e9429908 Added the 'bbswitch' module, which is a more conventient module for powering off/on nvidia graphics cards than possible via the acpi_call module.
svn path=/nixpkgs/trunk/; revision=31840
2012-01-26 01:02:22 +00:00
Lluís Batlle i Rossell 06548b79e9 Adding what I have for today of libreoffice. It still does not build.
svn path=/nixpkgs/trunk/; revision=31839
2012-01-25 23:04:34 +00:00
Lluís Batlle i Rossell 7fc001306c I add some little code to fetch the srcs of libreoffice.
svn path=/nixpkgs/trunk/; revision=31838
2012-01-25 19:12:27 +00:00
Peter Simons 6e4f0b6365 git-annex: updated to version 3.20120123
svn path=/nixpkgs/trunk/; revision=31836
2012-01-25 16:07:52 +00:00