Commit graph

7003 commits

Author SHA1 Message Date
Ludovic Courtès a80578b312 Propagate GDBM from PulseAudio to make hints from `.la' files work.
svn path=/nixpkgs/trunk/; revision=15556
2009-05-11 21:11:25 +00:00
Ludovic Courtès 777f805eba SDL: Add PulseAudio support.
svn path=/nixpkgs/trunk/; revision=15555
2009-05-11 19:57:42 +00:00
Lluís Batlle i Rossell 344712303d Fixing the name of vxl, which didn't reflect the proper version.
svn path=/nixpkgs/trunk/; revision=15554
2009-05-11 17:49:07 +00:00
Eelco Dolstra 5abb878393 svn path=/nixpkgs/trunk/; revision=15552 2009-05-11 15:22:22 +00:00
Eelco Dolstra abf71d5352 * textClosure: don't use uniqList, and don't rely on buggy behaviour
in the Nix expression evaluator (namely that comparison of attribute
  sets works properly).
* Removed some redundant parentheses in builder-defs.

svn path=/nixpkgs/trunk/; revision=15551
2009-05-11 15:21:42 +00:00
Eelco Dolstra 2f33cdec38 * Die tabs die. Also, renamed FullDepEntry and PackEntry to
fullDepEntry and packEntry for consistency.

svn path=/nixpkgs/trunk/; revision=15549
2009-05-11 11:55:05 +00:00
Eelco Dolstra 27152e987a * ldcpp in all-packages.nix still referred to 1.0.1.
svn path=/nixpkgs/trunk/; revision=15547
2009-05-11 11:22:26 +00:00
Marc Weber 57baa6617f fix eclipse start script
svn path=/nixpkgs/trunk/; revision=15546
2009-05-11 06:00:27 +00:00
Marc Weber fe62c65b59 update qgis so that it compiles again
svn path=/nixpkgs/trunk/; revision=15545
2009-05-11 06:00:23 +00:00
Michael Raskin d8e3181425 Update URLs for TeXLive
svn path=/nixpkgs/trunk/; revision=15544
2009-05-10 23:26:19 +00:00
Michael Raskin e420d8f5d4 Update kQemu source location
svn path=/nixpkgs/trunk/; revision=15543
2009-05-10 21:22:36 +00:00
Michael Raskin cd61acfa10 Update qemu
svn path=/nixpkgs/trunk/; revision=15542
2009-05-10 21:22:16 +00:00
Andres Löh 61a000b056 Added ghc-6.10.3.
svn path=/nixpkgs/trunk/; revision=15541
2009-05-10 21:04:58 +00:00
Michael Raskin e7bd899196 Fix gtksourceview dependencies
svn path=/nixpkgs/trunk/; revision=15540
2009-05-10 20:17:52 +00:00
Michael Raskin 370eb21986 Update yodl sources. Unofrtunately, old ones are unavailable. Icmake is still needed to build yodl
svn path=/nixpkgs/trunk/; revision=15539
2009-05-10 20:16:33 +00:00
Michael Raskin 9eff5ac580 Updating socat
svn path=/nixpkgs/trunk/; revision=15538
2009-05-10 20:10:12 +00:00
Michael Raskin 50d7f81d1d Io source update
svn path=/nixpkgs/trunk/; revision=15537
2009-05-10 19:42:43 +00:00
Michael Raskin 9771ef0e52 Update Monotone-Viz source
svn path=/nixpkgs/trunk/; revision=15536
2009-05-10 19:40:33 +00:00
Michael Raskin 648b4ccf0f Update Linux DC++
svn path=/nixpkgs/trunk/; revision=15535
2009-05-10 19:39:59 +00:00
Michael Raskin cd7837433a Update Opera
svn path=/nixpkgs/trunk/; revision=15534
2009-05-10 19:39:16 +00:00
Michael Raskin 0d0541458e Update SGT puzzles
svn path=/nixpkgs/trunk/; revision=15533
2009-05-10 19:38:26 +00:00
Michael Raskin a14cede3c2 Fix includes for construo
svn path=/nixpkgs/trunk/; revision=15532
2009-05-10 19:37:27 +00:00
Michael Raskin ab1d731733 Some more packages
svn path=/nixpkgs/trunk/; revision=15531
2009-05-10 12:35:12 +00:00
Michael Raskin 63d9ef7a99 Make fbterm build
svn path=/nixpkgs/trunk/; revision=15530
2009-05-10 12:29:36 +00:00
Sander van der Burg a8315aa241 Added desktop file generation function and desktop item for firefox
svn path=/nixpkgs/trunk/; revision=15529
2009-05-10 12:03:53 +00:00
Michael Raskin 52f61aa067 Fix Data Matrix compilation
svn path=/nixpkgs/trunk/; revision=15528
2009-05-10 11:51:54 +00:00
Michael Raskin bee4040300 Fix expect build
svn path=/nixpkgs/trunk/; revision=15527
2009-05-10 11:31:17 +00:00
Michael Raskin 607b018dbb Fix XFig installation
svn path=/nixpkgs/trunk/; revision=15526
2009-05-10 10:43:18 +00:00
Michael Raskin 1c43ab8b17 More archive types..
svn path=/nixpkgs/trunk/; revision=15525
2009-05-10 09:13:25 +00:00
Michael Raskin 3ea1d5b07a Update abiword. Unfortunately, it does not help to build it. The problem is with popt and gcc-g++-4.3
svn path=/nixpkgs/trunk/; revision=15524
2009-05-10 09:12:50 +00:00
Michael Raskin 2a82c141ec An attempt to add gcj-4.3. It fails not finding some GC-related symbols. I failed to understand the reason - for now
svn path=/nixpkgs/trunk/; revision=15523
2009-05-10 09:11:41 +00:00
Michael Raskin 38d6fbd9e4 Fix xchm compilation
svn path=/nixpkgs/trunk/; revision=15522
2009-05-10 06:24:44 +00:00
Michael Raskin d02609f7dc Fix includes in xxdiff
svn path=/nixpkgs/trunk/; revision=15521
2009-05-10 05:27:52 +00:00
Sander van der Burg 1facdc08c1 Upgraded VirtualBox to version 2.2.2
svn path=/nixpkgs/trunk/; revision=15520
2009-05-09 21:15:28 +00:00
Michael Raskin 28569219d8 Update hashes to match update of ucs-fonts
svn path=/nixpkgs/trunk/; revision=15518
2009-05-09 17:00:53 +00:00
Michael Raskin 1a4e6f01bf Updating Unifont
svn path=/nixpkgs/trunk/; revision=15517
2009-05-09 16:49:16 +00:00
Michael Raskin e29972b129 Update RedHat Liberation fonts
svn path=/nixpkgs/trunk/; revision=15516
2009-05-09 16:26:59 +00:00
Michael Raskin d54c4a8189 Fix old typo
svn path=/nixpkgs/trunk/; revision=15512
2009-05-09 15:37:50 +00:00
Michael Raskin f067828cdc Allow question marks in URL...
svn path=/nixpkgs/trunk/; revision=15507
2009-05-08 17:00:33 +00:00
Michael Raskin fb54c95889 Give a sane name to downloaded patch for cpio
svn path=/nixpkgs/trunk/; revision=15506
2009-05-08 17:00:08 +00:00
Rob Vermaas f1aa958c0a enabled static lib for aterm-2.5
svn path=/nixpkgs/trunk/; revision=15504
2009-05-08 08:21:35 +00:00
Michael Raskin 90b06b47bb tukaani.org is down...
svn path=/nixpkgs/trunk/; revision=15503
2009-05-08 03:47:08 +00:00
Michael Raskin 3e6102da68 Fix erroneous duplicate addition of apache httpd under wrong name
svn path=/nixpkgs/trunk/; revision=15502
2009-05-08 02:46:44 +00:00
Marc Weber 90344f9e1e use svn sources for ctgas.
The last release has a bug. I got "no end of file expected" while tagging

svn path=/nixpkgs/trunk/; revision=15501
2009-05-07 18:28:19 +00:00
Marc Weber aa037e3af6 also use gcc-4.2 for blender. gcc-4.3 is causing another segfault.
I haven't checked pre 2.49 though

svn path=/nixpkgs/trunk/; revision=15499
2009-05-07 14:51:29 +00:00
Eelco Dolstra f0e8c6aaef * Updated dblatex.
svn path=/nixpkgs/trunk/; revision=15495
2009-05-07 13:18:35 +00:00
Sander van der Burg 68ab70cbdf Fixed typo in version number
svn path=/nixpkgs/trunk/; revision=15493
2009-05-07 13:14:09 +00:00
Michael Raskin a8c30285e9 Add smbfs to Hydra jobs
svn path=/nixpkgs/trunk/; revision=15489
2009-05-07 12:06:30 +00:00
Michael Raskin 4ea3782b74 Add ocaml to Hydra jobs
svn path=/nixpkgs/trunk/; revision=15488
2009-05-07 11:54:42 +00:00
Sander van der Burg 0b259893e5 Upgraded KDE to version 4.2.3
svn path=/nixpkgs/trunk/; revision=15484
2009-05-07 11:20:30 +00:00
Michael Raskin d688b5f57e Fixing jfsrec
svn path=/nixpkgs/trunk/; revision=15483
2009-05-07 07:00:31 +00:00
Marc Weber 13080750d4 only use -O1 for php. Using -O2 causes some annoying segfaults. See comment
svn path=/nixpkgs/trunk/; revision=15482
2009-05-07 05:45:40 +00:00
Michael Raskin 3ec5f9c74e Add bc and xorg.xev to Hydra
svn path=/nixpkgs/trunk/; revision=15481
2009-05-07 04:26:35 +00:00
Lluís Batlle i Rossell 1804d2bf98 Adding a patch I forgot needed for the xvidcap expression
svn path=/nixpkgs/trunk/; revision=15479
2009-05-06 21:03:57 +00:00
Lluís Batlle i Rossell 166f375bd2 Fixing spin's references to cpp
svn path=/nixpkgs/trunk/; revision=15478
2009-05-06 21:03:49 +00:00
Marc Weber 5d9d28fb1f mend
svn path=/nixpkgs/trunk/; revision=15477
2009-05-06 16:06:49 +00:00
Marc Weber 3cf455286f adding ctags-wropped. A wrapper for ctags adding some language (more)
language support for .php .js .nix and .as files

svn path=/nixpkgs/trunk/; revision=15476
2009-05-06 16:06:45 +00:00
Marc Weber 8cc8965379 enhance escapeShellArg funtion. It should be pretty correct now
svn path=/nixpkgs/trunk/; revision=15475
2009-05-06 16:06:41 +00:00
Marc Weber 16ca65b0c2 blender update to 2.48
adding some patches to compile dependencies and gav

svn path=/nixpkgs/trunk/; revision=15474
2009-05-06 16:06:36 +00:00
Eelco Dolstra b5e67e699b * CUPS 1.3.10.
svn path=/nixpkgs/trunk/; revision=15472
2009-05-06 14:05:32 +00:00
Andres Löh f51b3b5550 Haskell platform is now released (different URI).
svn path=/nixpkgs/trunk/; revision=15465
2009-05-06 11:42:57 +00:00
Michael Raskin e65f6da644 Update DejaVu fonts
svn path=/nixpkgs/trunk/; revision=15463
2009-05-06 07:30:13 +00:00
Michael Raskin a5afc1dbd6 Add fontforge to Hydra builds
svn path=/nixpkgs/trunk/; revision=15462
2009-05-06 07:29:20 +00:00
Michael Raskin 9a317b1f3e Update fontforge
svn path=/nixpkgs/trunk/; revision=15461
2009-05-06 07:28:29 +00:00
Andres Löh 33b76a9312 added json Haskell package; improved gtk2hs
svn path=/nixpkgs/trunk/; revision=15460
2009-05-05 23:06:01 +00:00
Michael Raskin 3adcaa95c4 Jobs for buildfarm: some packages for an ideal RecoveryDVD
svn path=/nixpkgs/trunk/; revision=15458
2009-05-05 20:15:29 +00:00
Eelco Dolstra 571e12ead4 * Fix XML::DOM.
svn path=/nixpkgs/trunk/; revision=15457
2009-05-05 19:42:59 +00:00
Michael Raskin bd8bcf879d Some daemon packages
svn path=/nixpkgs/trunk/; revision=15456
2009-05-05 19:09:33 +00:00
Michael Raskin 637a08d52a Correcting priority for FF 3.5b4
svn path=/nixpkgs/trunk/; revision=15455
2009-05-05 18:39:14 +00:00
Michael Raskin 1f3d9cbd3f Some more jobs for buildfarm. Including FF 3.5b4
svn path=/nixpkgs/trunk/; revision=15454
2009-05-05 18:34:16 +00:00
Michael Raskin 2d24ee89da All-packages.nix: update firefox beta, erlang
svn path=/nixpkgs/trunk/; revision=15453
2009-05-05 15:46:24 +00:00
Michael Raskin 67066d1c56 Update erlang
svn path=/nixpkgs/trunk/; revision=15452
2009-05-05 15:46:03 +00:00
Michael Raskin 7bf1932fdb Adding Firefox 3.5b4
svn path=/nixpkgs/trunk/; revision=15451
2009-05-05 15:39:51 +00:00
Michael Raskin 4fb36441e2 Override xf86videoati version and make xkbcomp work from inside X server
svn path=/nixpkgs/trunk/; revision=15450
2009-05-05 12:38:04 +00:00
Michael Raskin 72b1cefae9 For xlaunch authority reset makes little sense
svn path=/nixpkgs/trunk/; revision=15449
2009-05-05 12:37:23 +00:00
Michael Raskin 01548fb7b9 xkeyboard-config update to 1.5
svn path=/nixpkgs/trunk/; revision=15448
2009-05-05 09:55:20 +00:00
Andres Löh 88ada9468b Version bump for Haskell Platform.
svn path=/nixpkgs/trunk/; revision=15447
2009-05-05 08:50:17 +00:00
Michael Raskin 6314e2f2ad Update cl-ppcre
svn path=/nixpkgs/trunk/; revision=15446
2009-05-05 03:05:10 +00:00
Andres Löh b6626b7aac Updated Haskell Platform to 2009.1.1.
svn path=/nixpkgs/trunk/; revision=15445
2009-05-04 23:29:38 +00:00
Andres Löh 39ec9d91f4 Added new version of wx package for Haskell.
svn path=/nixpkgs/trunk/; revision=15444
2009-05-04 13:33:04 +00:00
Andres Löh 393286fd47 Added Hipmunk (Haskell chipmunk binding).
svn path=/nixpkgs/trunk/; revision=15443
2009-05-04 13:33:01 +00:00
Andres Löh 9a216af770 Updating wxHaskell (in progress).
svn path=/nixpkgs/trunk/; revision=15442
2009-05-04 13:32:59 +00:00
Andres Löh ab6c19e6a3 Minor fix to xmonad-contrib expression.
svn path=/nixpkgs/trunk/; revision=15441
2009-05-04 13:32:56 +00:00
Michael Raskin c79984ec49 Build wireshark
svn path=/nixpkgs/trunk/; revision=15440
2009-05-04 11:03:09 +00:00
Michael Raskin 2eb7441069 Wireshark update
svn path=/nixpkgs/trunk/; revision=15439
2009-05-04 11:01:59 +00:00
Michael Raskin 464ca7f584 Some more jobs for the buildfarm
svn path=/nixpkgs/trunk/; revision=15438
2009-05-04 10:52:54 +00:00
Michael Raskin 65a87fefd5 Fix kernel builder - fails, depending on FS behavior
svn path=/nixpkgs/trunk/; revision=15437
2009-05-04 10:51:51 +00:00
Lluís Batlle i Rossell 3b3799f4c2 I forgot a file for the new tk. Here it is.
svn path=/nixpkgs/trunk/; revision=15435
2009-05-03 14:36:26 +00:00
Lluís Batlle i Rossell ef25944cdb Updating tcl/tk
svn path=/nixpkgs/trunk/; revision=15434
2009-05-03 14:35:56 +00:00
Lluís Batlle i Rossell 63c8ccf84c Adding spin
svn path=/nixpkgs/trunk/; revision=15433
2009-05-03 14:35:43 +00:00
Lluís Batlle i Rossell a5ebd913f3 Updating xvidcap.
svn path=/nixpkgs/trunk/; revision=15432
2009-05-03 13:24:31 +00:00
Michael Raskin 76863c4bf7 Pull one more part of the Debian patch. Now AUFS allows to boot LiveCD
svn path=/nixpkgs/trunk/; revision=15429
2009-05-03 11:29:08 +00:00
Michael Raskin f720a8186b Debian fixes for AUFS build on 2.6.29+
svn path=/nixpkgs/trunk/; revision=15426
2009-05-03 10:46:59 +00:00
Michael Raskin bc2257232b Update Theme-GNU location to something more reliable
svn path=/nixpkgs/trunk/; revision=15425
2009-05-03 03:52:49 +00:00
Michael Raskin 10b1740dab Copy all the headers already - problems with module building seem to be worse than hdd usage
svn path=/nixpkgs/trunk/; revision=15423
2009-05-02 14:18:22 +00:00
Marc Weber 75244dffaf update jdk because jdk-1.6.0_13 provides a mozilla plugin for x86_64
svn path=/nixpkgs/trunk/; revision=15422
2009-05-01 19:34:56 +00:00
Marc Weber 94a01668a1 cleaned up and fixed autofs v5
svn path=/nixpkgs/trunk/; revision=15419
2009-05-01 05:42:32 +00:00
Ludovic Courtès 28353f8440 GNU sed 4.2.
svn path=/nixpkgs/trunk/; revision=15418
2009-04-30 19:36:26 +00:00
Ludovic Courtès 39195f42ff GNU sed: Update/fix `meta'.
svn path=/nixpkgs/trunk/; revision=15417
2009-04-30 19:30:35 +00:00
Ludovic Courtès 5773834497 GnuTLS 2.6.6, with Guile bindings by default.
svn path=/nixpkgs/trunk/; revision=15416
2009-04-30 18:43:48 +00:00
Eelco Dolstra 2d1bcbeacf * Electric Sheep, a screensaver.
svn path=/nixpkgs/trunk/; revision=15415
2009-04-30 17:41:19 +00:00
Armijn Hemel 7445bc765c update python to 2.5.4
update scummvm to 0.13.1

svn path=/nixpkgs/trunk/; revision=15414
2009-04-30 14:01:25 +00:00
Nicolas Pierron b176d8541c Fix xlibs-wrapper infinite loop when python.full is set to true.
svn path=/nixpkgs/trunk/; revision=15411
2009-04-30 08:29:29 +00:00
Marc Weber fac6cc37f2 adding automount 5
svn path=/nixpkgs/trunk/; revision=15410
2009-04-30 02:37:00 +00:00
Lluís Batlle i Rossell 61c20f5a7e Adding Eagle Mode.
svn path=/nixpkgs/trunk/; revision=15404
2009-04-29 16:42:41 +00:00
Eelco Dolstra 210ba6316e * Urgh. Some files that had been deleted in the trunk came back
through the stdenv-updates merge (probably because they had been
  modified in the branch).

svn path=/nixpkgs/trunk/; revision=15403
2009-04-29 16:19:57 +00:00
Eelco Dolstra fc3e7b8f7c * Add to the channel.
svn path=/nixpkgs/trunk/; revision=15402
2009-04-29 16:12:10 +00:00
Eelco Dolstra 4c48605ede * Removed kde-4-old.
svn path=/nixpkgs/trunk/; revision=15401
2009-04-29 16:01:05 +00:00
Eelco Dolstra 3e3cc595b5 * KVM can use the default kernel headers now.
svn path=/nixpkgs/trunk/; revision=15400
2009-04-29 16:00:05 +00:00
Eelco Dolstra fe1d110fc2 * Firmware for the Intel 5000 wireless cards.
svn path=/nixpkgs/trunk/; revision=15395
2009-04-29 14:50:59 +00:00
Eelco Dolstra 16da00e64d * Doh! Since r15200, modules-closure.sh generated an empty set of
modules for the initial ramdisk if there were no additional kernel
  module packages (such as the NVIDIA driver or AUFS), leading to a
  kernel panic in the initrd.  This was because in that case modprobe
  would print paths referring to the kernel path rather than the
  module aggregation path, and then `sed "s^$kernel^$out^"' would
  silently fail.  Fixed.

* Also, use depmod here rather than doing sed hackery on modules.dep.

* Also, `allowMissing' was broken (missing "$" before the variable
  name).

svn path=/nixpkgs/trunk/; revision=15394
2009-04-29 14:32:04 +00:00
Eelco Dolstra 7d07afc2fa * Re-enable splashutils for x86_64-linux, they work again since we
have Glibc 2.9.

svn path=/nixpkgs/trunk/; revision=15393
2009-04-29 14:24:32 +00:00
Marc Weber 2eaae478af synergy patch making it compile again
svn path=/nixpkgs/trunk/; revision=15392
2009-04-29 13:04:01 +00:00
Eelco Dolstra 8eaf87a94d * Applied a patch that hopefully fixes the softlockups on our shiny
new servers.  Backported from 2.6.29.2.  Hopefully 2.6.28.10 will
  include this as well.  From http://patchwork.kernel.org/patch/19495/.

svn path=/nixpkgs/trunk/; revision=15390
2009-04-29 12:09:37 +00:00
Lluís Batlle i Rossell 7e53d1062f Adding mesa to compile the openchrome driver.
svn path=/nixpkgs/trunk/; revision=15386
2009-04-28 22:15:44 +00:00
Eelco Dolstra 0fc49de3cb * Added hal-info.
svn path=/nixpkgs/trunk/; revision=15385
2009-04-28 21:59:09 +00:00
Eelco Dolstra 1456344494 svn path=/nixpkgs/trunk/; revision=15384 2009-04-28 20:23:17 +00:00
Andres Löh 3202338268 Improved package config installation for gtk2hs (still not working completely).
svn path=/nixpkgs/trunk/; revision=15383
2009-04-28 18:58:34 +00:00
Marc Weber cd9c9a2431 fix broken myEnv
svn path=/nixpkgs/trunk/; revision=15382
2009-04-28 16:52:36 +00:00
Ludovic Courtès c4d720c3d1 Curl: Propagate Zlib and OpenSSL.
svn path=/nixpkgs/trunk/; revision=15381
2009-04-28 15:41:51 +00:00
Marc Weber 48216ba01a fix openvpn making it find ifonfig
svn path=/nixpkgs/trunk/; revision=15380
2009-04-28 15:37:52 +00:00
Eelco Dolstra 955b111f9a svn path=/nixpkgs/trunk/; revision=15378 2009-04-28 14:08:18 +00:00
Eelco Dolstra c718ec217b * X.org generator: specify overrides in a Nix expression rather than
in the generator script.  This makes it easier to change the X.org
  packages.
* Added xfs, twm.

svn path=/nixpkgs/trunk/; revision=15375
2009-04-28 13:58:35 +00:00
Ludovic Courtès 54d3ce4b61 Agg: Fix compilation.
svn path=/nixpkgs/trunk/; revision=15352
2009-04-28 12:37:09 +00:00
Rob Vermaas 42b9593bfd DBD-Pg
svn path=/nixpkgs/trunk/; revision=15351
2009-04-28 12:03:58 +00:00
Rob Vermaas 3f9e764096 DBD-Pg 2.13.1
svn path=/nixpkgs/trunk/; revision=15350
2009-04-28 11:57:34 +00:00
Lluís Batlle i Rossell 621b56e233 Radare version bump
svn path=/nixpkgs/trunk/; revision=15349
2009-04-28 10:31:16 +00:00
Lluís Batlle i Rossell 44f19bc1b4 Making the latest xorg cope well with xkbcomp.
svn path=/nixpkgs/trunk/; revision=15347
2009-04-28 08:05:28 +00:00
Eelco Dolstra 5f9014cc7f * Updated evdev to the latest version. Otherwise, the arrow keys and
others break under KDE and Gnome unless you set the keyboard type to
  evdev (e.g. in the KDE System Settings).  See
  
    http://wiki.archlinux.org/index.php/Xorg_input_hotplugging#Using_the_evdev_driver_kills_my_arrow_keys.2C_printscreen_is_triggered_instead

  TODO: update this in the X.org generator.

svn path=/nixpkgs/trunk/; revision=15343
2009-04-27 23:06:02 +00:00
Eelco Dolstra 213fff3ca0 * Updated HAL to 0.5.11. Passed gperf and patched a Makefile to
ensure that it installs policy/10osvendor/10-keymap.fdi, which the
  evdev driver in X.org relies on.

svn path=/nixpkgs/trunk/; revision=15342
2009-04-27 23:01:20 +00:00
Marc Weber 5703b08f47 fix ttmkfdir compilation (freetype headers, .o files)
svn path=/nixpkgs/trunk/; revision=15341
2009-04-27 22:38:54 +00:00
Eelco Dolstra 3ae548a124 * Latest NVIDIA driver.
svn path=/nixpkgs/trunk/; revision=15339
2009-04-27 18:28:09 +00:00
Eelco Dolstra 1ca8ff1cbb * `make check' for Cache-FastMmap fails randomly under high load
because it's timing sensitive, so disable it (see
  http://hydra.nixos.org/build/26871/nixlog/1).

svn path=/nixpkgs/trunk/; revision=15338
2009-04-27 15:43:36 +00:00
Lluís Batlle i Rossell 3e0708e505 Fixing ttmkfdir, with help of a modification in deb-package.
svn path=/nixpkgs/trunk/; revision=15335
2009-04-27 12:04:11 +00:00
Ludovic Courtès 2dc368f084 GNU Ghostscript 8.64.0.
svn path=/nixpkgs/trunk/; revision=15334
2009-04-27 10:19:59 +00:00
Ludovic Courtès 4ebc66caa3 GNU IceCat 3.0.9-g1.
svn path=/nixpkgs/trunk/; revision=15333
2009-04-27 09:37:48 +00:00
Eelco Dolstra dbc8b414be * Urgh.
svn path=/nixpkgs/trunk/; revision=15331
2009-04-27 09:27:15 +00:00
Eelco Dolstra 03844a3d9b * Revert to Qt 4.4.3. 4.5.1 breaks KDE 4.2.2. See e.g.
http://rdieter.fedorapeople.org/qt451_oxygen_borkage-2.jpg
  and also https://bugs.kde.org/show_bug.cgi?id=190485
  ("You're not meant to use Qt 4.5.1 with KDE 4.2.2.").
  Apparently this will be fixed in Qt 4.5.2.

svn path=/nixpkgs/trunk/; revision=15330
2009-04-27 09:25:48 +00:00
Marc Weber 3c05ea1a4b readding and updating xorg.xfs. It's required to run tightvnc
1.0.8 is latest version

svn path=/nixpkgs/trunk/; revision=15329
2009-04-27 01:44:30 +00:00
Marc Weber 829e0da0e5 topgit update
there is now a tg push command pushing branch and its base optionally
including all dependency

svn path=/nixpkgs/trunk/; revision=15328
2009-04-27 01:18:07 +00:00
Marc Weber 761e653515 reenable curl support for php
-lssl was missing

svn path=/nixpkgs/trunk/; revision=15327
2009-04-27 01:18:03 +00:00
Eelco Dolstra e037b8ad2c * Added some missing stuff to the channel.
svn path=/nixpkgs/trunk/; revision=15325
2009-04-26 19:14:44 +00:00
Eelco Dolstra 914f2d6cf6 * Last sync.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15320
2009-04-26 17:21:58 +00:00
Michael Raskin b3d965858b Update xmoto
svn path=/nixpkgs/trunk/; revision=15319
2009-04-26 17:00:10 +00:00
Marc Weber 3a9bfe866c adding small emacs session mode packages remembering inputs
svn path=/nixpkgs/trunk/; revision=15318
2009-04-26 11:06:54 +00:00
Marc Weber 4c72da6b82 adding pydb, a python debugging with gdb like commands
svn path=/nixpkgs/trunk/; revision=15317
2009-04-26 11:06:51 +00:00
Marc Weber 5d5995eb38 adding figlet
svn path=/nixpkgs/trunk/; revision=15316
2009-04-26 11:06:48 +00:00
Marc Weber 8d6fd9cb2b samba: Use /etc/samba as default configuration directory
svn path=/nixpkgs/trunk/; revision=15315
2009-04-26 11:06:41 +00:00
Eelco Dolstra 09fd56cc9e * Upstart in the stdenv branch is incompatible with Upstart in the
trunk: it segfaults when it tries to start the new Upstart, which
  locks up the entire system.  This may be because of the different
  Glibc, or something.  In any case, require a reboot.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15314
2009-04-25 22:48:48 +00:00
Eelco Dolstra 5a2284ac61 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15313
2009-04-25 22:45:32 +00:00
Eelco Dolstra f7454eae9c * Be able to cope with future changes to Upstart.
svn path=/nixpkgs/trunk/; revision=15311
2009-04-25 22:36:33 +00:00
Lluís Batlle i Rossell c2d651ef68 Removing static compilation of the driver for cromfs, so the package works again in x86_64
svn path=/nixpkgs/trunk/; revision=15309
2009-04-25 16:22:12 +00:00
Lluís Batlle i Rossell 1e8fff0915 Updating Wine.
svn path=/nixpkgs/trunk/; revision=15308
2009-04-25 16:22:08 +00:00
Lluís Batlle i Rossell 1f8e1f296d Updating freeimage and vxl.
svn path=/nixpkgs/trunk/; revision=15307
2009-04-25 16:21:56 +00:00
Andres Löh 1a6e7109d1 Don't build the Haskell Platform on Darwin.
svn path=/nixpkgs/trunk/; revision=15306
2009-04-25 15:39:25 +00:00
Andres Löh 922c14e372 Added MonadRandom Haskell package.
svn path=/nixpkgs/trunk/; revision=15305
2009-04-25 15:33:37 +00:00
Andres Löh 2a1fae29f8 Added some SDL-related Haskell libs.
svn path=/nixpkgs/trunk/; revision=15304
2009-04-25 15:33:29 +00:00
Sander van der Burg d1a57e454e Fixed version number of qt
svn path=/nixpkgs/branches/stdenv-updates/; revision=15303
2009-04-25 15:07:46 +00:00
Sander van der Burg 5ad095f5ed Upgraded to qt-4.5.1
svn path=/nixpkgs/branches/stdenv-updates/; revision=15302
2009-04-25 14:54:14 +00:00
Andres Löh 66f3af0bdd ghc-wrapper now detects installed pkgs automatically.
svn path=/nixpkgs/trunk/; revision=15301
2009-04-25 14:23:00 +00:00
Eelco Dolstra 671d53dd35 * Allow the user to install stdenv (nix-env -i stdenv) and get all the
packages in the stdenv as propagated user environment packages.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15300
2009-04-25 14:08:29 +00:00
Michael Raskin c26271927a Remove multiversion expression for tailor for easier use of custom versions
svn path=/nixpkgs/trunk/; revision=15296
2009-04-25 11:19:42 +00:00
Eelco Dolstra 96443f794e * Unfortunately, the Gentoo mirror of the attr library is no more
stable than the SGI source.  So we'll mirror it ourselves.  Thanks
  to Matthew Curry for reporting this.

svn path=/nixpkgs/trunk/; revision=15289
2009-04-24 20:27:54 +00:00
Ludovic Courtès 0b2be106e0 GNU Time: Improve meta-information.
svn path=/nixpkgs/trunk/; revision=15288
2009-04-24 13:28:16 +00:00
Ludovic Courtès 72656e7d1c GNU Zile 2.3.7.
svn path=/nixpkgs/trunk/; revision=15287
2009-04-24 12:48:37 +00:00
Peter Simons d1045dc8d0 qgit: update to version 2.2.
svn path=/nixpkgs/trunk/; revision=15286
2009-04-24 12:31:33 +00:00
Eelco Dolstra 20a0a02d15 * Fix GHC 6.8.3.
svn path=/nixpkgs/trunk/; revision=15285
2009-04-23 18:44:52 +00:00
Andres Löh 2bb2373cf9 Try to link readline Haskell package against ncursesw.
svn path=/nixpkgs/trunk/; revision=15284
2009-04-23 17:48:06 +00:00
Andres Löh cea9c12283 Trying to update haxr, but not finished.
svn path=/nixpkgs/trunk/; revision=15283
2009-04-23 17:48:03 +00:00
Andres Löh cd018e50d4 64bit support in Cabal builder
svn path=/nixpkgs/trunk/; revision=15282
2009-04-23 17:21:14 +00:00
Eelco Dolstra 5175cce9a9 * Oops. We don't call genericBuild, so the fixupPhase (which creates
the setup hook) is never run.  So revert.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15281
2009-04-23 16:23:12 +00:00
Eelco Dolstra e82ac236ab svn path=/nixpkgs/trunk/; revision=15278 2009-04-23 15:01:53 +00:00
Eelco Dolstra 7689a348c4 * Got rid of a lot of "postInstall=postInstall" and similar lines in
builders.  These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations.  This is done
  automatically now if setupHook is set.
* Deleted the initscripts package.  NixOS doesn't use it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
2009-04-23 13:31:10 +00:00
Eelco Dolstra 0f10222e4e * Merge libjpeg and libjpeg-static.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15275
2009-04-23 13:26:14 +00:00
Eelco Dolstra 6e32a4cea8 svn path=/nixpkgs/branches/stdenv-updates/; revision=15273 2009-04-23 12:46:14 +00:00
Eelco Dolstra 7a891eabe2 * Apparently the pythondir hack isn't needed with libxml2 2.7.3.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15272
2009-04-23 12:35:36 +00:00
Eelco Dolstra a61894ea81 svn path=/nixpkgs/branches/stdenv-updates/; revision=15271 2009-04-23 12:34:56 +00:00
Eelco Dolstra 49f47f92e3 * Disable some Haskell packages on Darwin.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15270
2009-04-23 12:33:09 +00:00
Eelco Dolstra f762b50991 * Another sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15269
2009-04-23 11:59:43 +00:00
Eelco Dolstra c13587d6b3 * Bump the default kernel to 2.6.28.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15268
2009-04-23 11:17:17 +00:00
Eelco Dolstra acd26a3353 * Fixed the gphoto2 build.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15267
2009-04-23 11:12:25 +00:00
Michael Raskin 4c02ccd107 Fix git-with-svn instantiation
svn path=/nixpkgs/trunk/; revision=15266
2009-04-23 10:56:23 +00:00
Michael Raskin 35bb7d6412 Python-not-2.4 support for libxml2
svn path=/nixpkgs/trunk/; revision=15265
2009-04-23 10:24:40 +00:00
Eelco Dolstra e13bce06c4 * Latest irssi. This also fixes --disable-static breakage.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15264
2009-04-23 10:11:02 +00:00
Eelco Dolstra 686ed295da * Disable curl support in PHP - it breaks for some reason.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15263
2009-04-23 09:56:15 +00:00
Eelco Dolstra 564d96042a * RPM barfs if you don't build its static libraries - probably a
Makefile bug.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15262
2009-04-23 09:55:52 +00:00
Eelco Dolstra c274d068e4 * Fix neon.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15261
2009-04-22 23:15:00 +00:00
Eelco Dolstra eaac5230f2 * Fix splashutils.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15260
2009-04-22 23:13:21 +00:00
Eelco Dolstra fd6de46f40 svn path=/nixpkgs/branches/stdenv-updates/; revision=15259 2009-04-22 23:08:25 +00:00
Eelco Dolstra 7ec61219db * lib/site_perl -> lib/perl5/site_perl.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15258
2009-04-22 23:04:18 +00:00
Lluís Batlle i Rossell 2021063052 Adding vwm, the console window manager.
svn path=/nixpkgs/trunk/; revision=15255
2009-04-22 21:33:24 +00:00
Eelco Dolstra 9609437573 * ffmpeg needs --enable-shared.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15254
2009-04-22 19:20:27 +00:00
Eelco Dolstra 7e4dcb6c2b * Urgh. Perl is built during the stdenv bootstrap, where we don't
have libpthread.  So don't build with thread support there.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15253
2009-04-22 17:44:44 +00:00
Eelco Dolstra a98d8aee74 * Install Perl modules in $out/lib/perl5. This is what Perl wants by
default, but it didn't happen in Nixpkgs because the string "perl"
  appeared in the prefix, and in that case Perl uses $out/lib.
* Enable thread-safe Perl while we're at it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15252
2009-04-22 17:37:21 +00:00
Eelco Dolstra 8b28c599a3 * Removed the hack to fix the installation path of some Perl
packages.  Turns out that those packages set INSTALLDIRS=perl, so we
  override it to INSTALLDIRS=site.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15251
2009-04-22 17:32:57 +00:00
Nicolas Pierron ea2d78f2bd Add STLport to hydra.
svn path=/nixpkgs/trunk/; revision=15249
2009-04-22 16:44:11 +00:00
Eelco Dolstra f70b4763bb svn path=/nixpkgs/trunk/; revision=15245 2009-04-22 13:13:55 +00:00
Ludovic Courtès 26c3fe186f Glibc 2.9: Have rpcgen(1) look for cpp(1) in $PATH.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15244
2009-04-22 12:55:47 +00:00
Ludovic Courtès a6b2ffd5f2 GNU Find Utilities 4.4.1.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15242
2009-04-22 12:11:21 +00:00
Eelco Dolstra 47b27a6c00 * `mv .../* ...' no longer works if nullglob is on. However, the real
WTF is that the Perl module installation path suddenly has changed
  from $out/lib/site_perl to $out/lib/perl5/site_perl.  Investigating...

svn path=/nixpkgs/branches/stdenv-updates/; revision=15241
2009-04-22 07:41:31 +00:00
Eelco Dolstra 7588d53f37 * idutils: don't depend on Emacs on non-Linux platforms, since Emacs
(or one of its dependencies) likely doesn't build.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15240
2009-04-22 07:22:28 +00:00
Eelco Dolstra a951fc2050 * Upstart doesn't like dynamic linking.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15239
2009-04-22 07:19:22 +00:00
Eelco Dolstra 78fbf85483 * popt updated to 1.15.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15238
2009-04-22 07:16:45 +00:00
Eelco Dolstra ac1d4fcdc5 * Strange configure script; add an explicit --disable-static.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15237
2009-04-22 07:05:50 +00:00
Eelco Dolstra 4af55f9dc8 * Jasper needs an explicit --enable-shared.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15236
2009-04-22 07:05:09 +00:00
Eelco Dolstra 94d7d1fdbb * Got rid of all --disable-static flags; they're redundant now.
* Also a bunch of style cleanups (tabs, with args, ...).

svn path=/nixpkgs/branches/stdenv-updates/; revision=15235
2009-04-21 23:18:09 +00:00
Eelco Dolstra 2a699fe5fb * Pass --disable-static to configure by default it it's supported.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15234
2009-04-21 22:40:12 +00:00
Eelco Dolstra ff057f0d07 * Build libperl.so.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15233
2009-04-21 22:38:52 +00:00
Eelco Dolstra 1966dded62 * OpenSSL 0.9.8k.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15232
2009-04-21 22:37:56 +00:00
Andres Löh e62cb1aa20 Added HLint plus dependencies.
svn path=/nixpkgs/trunk/; revision=15231
2009-04-21 21:48:10 +00:00
Lluís Batlle i Rossell 672890153e Fixing lua and perl for radare.
svn path=/nixpkgs/trunk/; revision=15230
2009-04-21 21:31:08 +00:00
Andres Löh d2067c300f Updated editline for Haskell.
svn path=/nixpkgs/trunk/; revision=15229
2009-04-21 21:19:49 +00:00
Andres Löh 8cfa1a5034 Added readline package for Haskell.
svn path=/nixpkgs/trunk/; revision=15228
2009-04-21 21:12:56 +00:00
Andres Löh d3b5bc4a20 * Fixed external library dependencies for some Haskell-Platform packages.
* Added Agda plus dependencies.

svn path=/nixpkgs/trunk/; revision=15227
2009-04-21 21:05:30 +00:00
Lluís Batlle i Rossell 233cf74781 Adding radare
svn path=/nixpkgs/trunk/; revision=15226
2009-04-21 19:47:51 +00:00
Lluís Batlle i Rossell 1b3ee8bf6c Adding libewf.
svn path=/nixpkgs/trunk/; revision=15225
2009-04-21 19:47:41 +00:00
Lluís Batlle i Rossell ff0483b3d8 Adding gtkdialog.
svn path=/nixpkgs/trunk/; revision=15224
2009-04-21 19:47:30 +00:00
Lluís Batlle i Rossell a6e86e241f Updating lua5.
svn path=/nixpkgs/trunk/; revision=15223
2009-04-21 19:47:20 +00:00
Sander van der Burg 71c0fb9532 Upgraded seccure 0.3 to 0.4 because the old version expression does not work anymore and breaks my installation
svn path=/nixpkgs/branches/stdenv-updates/; revision=15222
2009-04-21 19:38:35 +00:00
Sander van der Burg 883eb4371c Fixed dosbox expression
svn path=/nixpkgs/branches/stdenv-updates/; revision=15220
2009-04-21 18:30:54 +00:00
Andres Löh 6757fbafb1 Added haskell-platform to release.
svn path=/nixpkgs/trunk/; revision=15216
2009-04-21 16:22:30 +00:00
Sander van der Burg 5b9c5c62be Added some MySQL fixes in order to have a working libmysqld library on x86_64-linux
svn path=/nixpkgs/branches/stdenv-updates/; revision=15215
2009-04-21 13:22:38 +00:00
Sander van der Burg be04acaf45 Reengineered ALSA expression and patched alsaLib to prevent compilation errors
svn path=/nixpkgs/branches/stdenv-updates/; revision=15206
2009-04-21 09:56:02 +00:00
Lluís Batlle i Rossell ea933bf894 Adding symlinks for cdrkit, to be similar to the cdrtools.
svn path=/nixpkgs/trunk/; revision=15203
2009-04-21 07:05:38 +00:00
Eelco Dolstra 0ebb410014 * Remove all the mesaSupported assertions.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15202
2009-04-20 22:06:12 +00:00
Eelco Dolstra 0296fabb9e * Added dri2proto to the list of tarballs and reran
the generator.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15201
2009-04-20 21:59:42 +00:00
Eelco Dolstra 089eef511c * Module aggregator: use buildEnv, which is much faster because it
creates symlinks lazily (i.e., it creates a single symlink to an
  entire tree unless another input has an overlapping tree).  As a
  result it creates only a few dozen symlinks instead of ~ 12000
  (which can take almost 2 minutes on my laptop).

svn path=/nixpkgs/branches/stdenv-updates/; revision=15200
2009-04-20 19:13:40 +00:00
Lluís Batlle i Rossell 15f1feb702 Fixing mesa and xorgserver
svn path=/nixpkgs/branches/stdenv-updates/; revision=15199
2009-04-20 18:46:32 +00:00
Lluís Batlle i Rossell 2eb865a98f Fixing libdrm build
svn path=/nixpkgs/branches/stdenv-updates/; revision=15198
2009-04-20 18:43:08 +00:00
Eelco Dolstra 8f12b8abf9 * Fixed libXext; it needs newer headers.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15197
2009-04-20 18:09:37 +00:00
Eelco Dolstra d2d05dc868 * libdrm 2.4.9.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15196
2009-04-20 18:09:15 +00:00
Eelco Dolstra e05a069de9 * Mesa 7.4.1.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15195
2009-04-20 18:08:51 +00:00
Eelco Dolstra f14537a896 * Use makeOverridable for the QT3 variants.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15194
2009-04-20 18:07:09 +00:00
Eelco Dolstra 1807907e6d * The NVIDIA driver looks for libXrandr, so it's probably
best to provide it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15193
2009-04-20 16:54:16 +00:00
Eelco Dolstra 077b0157a0 * Updated the generator to handle some missing dependencies.
Also updated some X.org packages (notably xorg-server)
  as well as freetype.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15191
2009-04-20 16:02:50 +00:00
Eelco Dolstra b1e2bb54f2 * Doh! This broke pam_console (and probably system-config-printer).
svn path=/nixpkgs/branches/stdenv-updates/; revision=15190
2009-04-20 16:01:57 +00:00
Rob Vermaas a00ef2d247 updated strategoxt 0.17pre to bootstrap build
svn path=/nixpkgs/trunk/; revision=15188
2009-04-20 14:49:51 +00:00
Eelco Dolstra 406cacbb87 * printproto has a dependency on libXau which our generator
doesn't see for some reason.  Will have to fix the 
  generator.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15187
2009-04-20 14:37:05 +00:00
Andres Löh d2f9333dca Made it even worse -- hopefully fixed now, sorry.
svn path=/nixpkgs/trunk/; revision=15186
2009-04-20 14:30:01 +00:00
Andres Löh df7c38c2cb Fixed a typo.
svn path=/nixpkgs/trunk/; revision=15185
2009-04-20 14:26:09 +00:00
Andres Löh 035d7cb965 * Updated lhs2TeX.
* Propagated build inputs of Haskell pkgs are now automatically
  propagated user-env pkgs.
* Updated haskell-platform slightly.

svn path=/nixpkgs/trunk/; revision=15184
2009-04-20 14:23:50 +00:00
Eelco Dolstra 67b32b0ec7 * system-config-printer: don't apply autoconf/automake, because then
we need to have exactly the right versions of those :-)

svn path=/nixpkgs/branches/stdenv-updates/; revision=15183
2009-04-20 14:10:15 +00:00
Lluís Batlle i Rossell ff894ae773 Fixing the openoffice build, to run with a single job.
svn path=/nixpkgs/trunk/; revision=15182
2009-04-20 13:51:31 +00:00
Lluís Batlle i Rossell fc3574b125 Updating openoffice to 3.0.1.
svn path=/nixpkgs/trunk/; revision=15181
2009-04-20 13:50:07 +00:00
Andres Löh 3fd1093d2d xmonad and xmobar updates
svn path=/nixpkgs/trunk/; revision=15180
2009-04-20 13:01:34 +00:00
Andres Löh f4cdb54fd3 Added vacuum and vacuum-cairo packages.
svn path=/nixpkgs/trunk/; revision=15179
2009-04-20 13:01:31 +00:00
Eelco Dolstra cf54a62384 svn path=/nixpkgs/trunk/; revision=15178 2009-04-20 12:52:24 +00:00
Eelco Dolstra c61c9dc35b * Drop the "perl" prefix from Perl attribute names. It's redundant
now that Perl packages are in their own namespace
  (perlPackages.<pkg>).

svn path=/nixpkgs/trunk/; revision=15176
2009-04-20 12:49:35 +00:00
Eelco Dolstra 2cbc761779 * Move builder-defs to pkgs/build-support. (pkgs/top-level is for
composition.)

svn path=/nixpkgs/trunk/; revision=15175
2009-04-20 12:37:10 +00:00
Eelco Dolstra 3c4bdbc446 * Make Perl package show up in nix-env.
svn path=/nixpkgs/trunk/; revision=15174
2009-04-20 12:24:13 +00:00