Commit Graph

8201 Commits

Author SHA1 Message Date
Lluís Batlle i Rossell
511f3b7a61 Adding mplayer2, a mplayer fork.
It can play files very well with "vdpau". It has a reworked
vdpau pipeline compared to mplayer1. Mplayer1 fails to play well in
my computer.
2013-01-31 00:26:30 +01:00
Peter Simons
23e7008a71 all-packages.nix: fix typos in the haskellPackages attribute sets for GHC 7.4.2
The haskellPackages_ghc742_{no_,}profiling set accidentally referred to
the GHC 7.4.1 versions.
2013-01-30 17:50:07 +01:00
Peter Simons
abdd5bc538 Hide package sets for GHC 6.10.4, 6.12.3, 7.0.4, 7.4.1, and 7.6.1 from nix-env
(and from Hydra). It is still possible to install any of those packages by
referring to them by attribute:

 | $ nix-env -iA haskellPackages_ghc6104.hopenssl --dry-run
 | (dry run; not doing anything)
 | installing `haskell-hopenssl-ghc6.10.4-1.6.1'
 | these paths will be fetched (50.61 MiB download, 450.34 MiB unpacked):
 |   /nix/store/rjsgga1fdqin47n2rkfn9l7v9ncsfh9l-haskell-hopenssl-ghc6.10.4-1.6.1
 |   /nix/store/y567qhqbjxbkldg3kq2clzn52a56cmdn-haskell-mtl-ghc6.10.4-1.1.0.2
 |   /nix/store/zbn24z1443fbrx6ch1nn2vnss9bdw1g0-ghc-6.10.4

It's no longer possible to install those by name anymore, though:

 | $ nix-env -i haskell-hopenssl-ghc6.10.4
 | error: selector `haskell-hopenssl-ghc6.10.4' matches no derivations

That style works only for active GHC versions 7.4.2 and 7.6.2:

 | $ nix-env -qaP \* | grep  haskell-hopenssl
 | haskellPackages.hopenssl                          haskell-hopenssl-ghc7.4.2-1.6.1
 | haskellPackages_ghc742_no_profiling.hopenssl      haskell-hopenssl-ghc7.4.2-1.6.1
 | haskellPackages_ghc742_profiling.hopenssl         haskell-hopenssl-ghc7.4.2-1.6.1-profiling
 | haskellPackages_ghc762.hopenssl                   haskell-hopenssl-ghc7.6.2-1.6.1

These changes intend to ease the load on Hydra. If you desperately need
pre-build binaries of any of those old versions, please post a short note
on the nix-dev mailing list.
2013-01-30 17:47:45 +01:00
Eelco Dolstra
c343e1db77 awscli: Remove Python prefix 2013-01-30 15:55:39 +01:00
Rob Vermaas
06c9353270 Add awscli 0.5.0, updated some of its dependencies. 2013-01-30 15:42:40 +01:00
Peter Simons
e5b51648b1 Move "darwin-native-x11-and-opengl" package into the "os-specific" hierarchy. 2013-01-30 14:53:04 +01:00
Cillian de Róiste
72cc82d49a Add PODIFF, a tool to diff PO files 2013-01-30 14:37:10 +01:00
Eelco Dolstra
8c0179bdde Make Stratego packages visible to nix-env 2013-01-30 13:48:45 +01:00
Eelco Dolstra
d330f6ff85 Nixpkgs channel: Use XZ compression for nixexprs.tar 2013-01-30 12:52:07 +01:00
Peter Simons
1e00556795 haskell-HTTP: update to 4000.2.7 2013-01-30 11:29:54 +01:00
Peter Simons
89ee4bd883 haskell-split: update to 0.2.1.2 2013-01-30 11:29:54 +01:00
Peter Simons
792f47020b haskell-string-qq: add version 0.0.2 2013-01-30 11:29:54 +01:00
Lluís Batlle i Rossell
ea6b1d808c Adding an automatic proper platform for some systems we know
That eases the burden of having to always set the platform at
least in the non-pc pure nixpkgs platforms.
2013-01-29 22:11:37 +01:00
Aristid Breitkreuz
3a68505c6e GHC 7.6.2 2013-01-29 20:42:28 +01:00
Lluís Batlle i Rossell
0bf70832f4 Raspberrypi platform: make ext4 in kernel
I also make other modules in-kernel. I originally copied this
from the sheevaplug kernel, but the sheevaplug runs the initrd
and the raspberrypi not.
2013-01-29 20:17:36 +01:00
Lluís Batlle i Rossell
45de66b2b1 Update the raspberry pi kernel to one newer. 2013-01-29 20:17:32 +01:00
Lluís Batlle i Rossell
60f2d9c6bb raspberrypi platform: adding a missing uboot attr
It's required, even if set to null, along all nixpkgs.
2013-01-29 20:17:30 +01:00
Lluís Batlle i Rossell
d770ea2ad2 Fixing the kernel target for raspberrypi (zImage)
Removing uboot things about it too.
2013-01-29 20:17:28 +01:00
Eelco Dolstra
be412fc789 Rename openoffice directory to libreoffice 2013-01-29 12:43:53 +01:00
Eelco Dolstra
6dba65b51f openoffice: Remove
It's superseded by LibreOffice and doesn't build anymore.
2013-01-29 12:43:53 +01:00
Eelco Dolstra
97c5ab3a6d linux-2.6.32-xen: Remove
Hasn't built in a long time and is obsolete anyway.
2013-01-29 12:43:53 +01:00
Eelco Dolstra
8317cd1f14 kde-3: Remove
KDE 3 hasn't built in a long time.  Also remove six, the only package
with a dependency on KDE 3.
2013-01-29 12:43:53 +01:00
Eelco Dolstra
eeb116a2eb emacs-22: Remove 2013-01-29 11:39:38 +01:00
Lluís Batlle i Rossell
c73655fa92 Adding the vaapi Intel driver.
I also renamed the vdpau driver to 'vaapiDriver' in all-packages. I think
it's a better name.
2013-01-29 01:10:00 +01:00
Lluís Batlle i Rossell
111b203467 Updates related to VAAPI/VDPAU
Making ffmpeg link to libva.
Add the vdpau driver for vaapi.
2013-01-29 01:10:00 +01:00
Eelco Dolstra
615b1d42a7 JSON::Any: Pull in JSON 2013-01-28 23:14:59 +01:00
Peter Simons
c924e051b6 all-packages: redirect 'freeglut' attribute on Darwin to the native implementation 2013-01-28 19:32:47 +01:00
Peter Simons
07cdc02266 all-packages: redirect 'mesa' attribute on Darwin to the native implementation 2013-01-28 19:32:29 +01:00
Peter Simons
4a3904f82c all-packages: redirect 'x11' attribute on Darwin to the native implementation 2013-01-28 19:31:50 +01:00
Peter Simons
e460a3f37c pkgs/build-support/native-darwin-x11-and-opengl: lift native X11 and OpenGL implementation from Darwin into the Nix store 2013-01-28 19:30:32 +01:00
Eelco Dolstra
8cc94dc652 ov511: Remove
This is very obsolete (last updated for Linux 2.6.0-test4).
2013-01-28 18:31:18 +01:00
Eelco Dolstra
424d695cd8 xfig: Use the default gcc 2013-01-28 18:31:18 +01:00
Eelco Dolstra
24420373f4 modutils: Remove
This package is long obsolete.
2013-01-28 18:31:18 +01:00
Eelco Dolstra
f7cc884de4 gwt: Remove obsolete version 2013-01-28 18:31:17 +01:00
Eelco Dolstra
6930efd1e5 openjade: Use default gcc 2013-01-28 18:31:17 +01:00
Eelco Dolstra
e0afec2edc pwdutils: Remove
This package no longer builds and is obsolete (use ‘shadow’ instead).
2013-01-28 17:58:43 +01:00
Eelco Dolstra
c8aed4202d eject: Remove
This command is part of util-linux now.
2013-01-28 17:25:59 +01:00
Eelco Dolstra
d8f8a29758 gcc-upc: Remove
This version (4.0) is obsolete.  And UPC will be merged in GCC 4.8
anyway.
2013-01-28 17:19:04 +01:00
Eelco Dolstra
d2b76e68d0 gcc-4.1: Remove
No longer used and doesn't build.
2013-01-28 17:19:03 +01:00
Eelco Dolstra
cb07844c9d gcc-2.95: Remove
Hasn't built in a long time.
2013-01-28 17:19:03 +01:00
Eelco Dolstra
5f6de267f0 gcc-4.0: Remove 2013-01-28 17:19:03 +01:00
Eelco Dolstra
5200c92aa0 libxcrypt: Remove 2013-01-28 17:19:03 +01:00
Eelco Dolstra
b40ca97f00 pam_unix2: Remove
It no longer builds and NixOS doesn't use it anymore.
2013-01-28 17:19:02 +01:00
Eelco Dolstra
1b7c5d3717 Remove some unused Boost versions 2013-01-28 17:19:02 +01:00
Eelco Dolstra
35af62f998 gperftools: Update to 2.0 and fix build
http://hydra.nixos.org/build/3875478
2013-01-28 17:19:01 +01:00
Eelco Dolstra
ecee1be7f1 RealPlayer: Remove
This package hasn't built in ages, is unfree, and is not needed
anymore.
2013-01-28 16:31:23 +01:00
Eelco Dolstra
d56325696a skype: Enable PulseAudio by default
I didn't see any 100% CPU problem.
2013-01-28 15:07:35 +01:00
Eelco Dolstra
201f64b20a Remove dots at end of meta.description 2013-01-28 11:59:49 +01:00
Eelco Dolstra
19665a7483 Add meta attributes 2013-01-28 11:59:28 +01:00
Song Wenwu
9f7cc1bfb3 add fcitx-4.2.7 2013-01-28 11:35:03 +08:00
Aristid Breitkreuz
4534699938 add alsa oss emulation 2013-01-28 02:49:49 +01:00
Shea Levy
3b34b3610e Add clojureUnstable (clojure 1.5.0-RC1).
Patch thanks to Patrick Lee.
2013-01-27 20:43:38 -05:00
viric
0a8f2e084f Merge pull request #260 from jcumming/vessel.121213
Vessel.121213
2013-01-27 12:38:08 -08:00
Lluís Batlle i Rossell
a87fba9619 Adding the firmware files for raspberrypi 2013-01-27 17:49:02 +00:00
Lluís Batlle i Rossell
dd3c83a5ff Updating perl packages NetSSLeay and IOSocketSSL. Upstream removed the old versions 2013-01-27 15:39:11 +01:00
viric
83366b484f Merge pull request #278 from vcunat/vlada/ufoai-notg
Update ufo-ai
2013-01-27 03:40:03 -08:00
Lluís Batlle i Rossell
3b26ba7019 Merge remote-tracking branch 'central/master' into stdenv-updates
Conflicts:
	pkgs/os-specific/linux/alsa-utils/default.nix
2013-01-27 11:32:12 +01:00
Vladimír Čunát
46dd0485f5 Update ufoai to 2.4, clean dependencies and the expression. 2013-01-26 23:36:42 +01:00
Peter Simons
46135deaa5 haskell-reflection: add version 1.1.6 2013-01-25 14:12:02 +01:00
Shea Levy
495fbceef9 Add libspotify 2013-01-25 01:10:36 -05:00
Lluís Batlle i Rossell
fbf42935cd taskcoach: updating to 1.3.22 2013-01-23 23:22:47 +01:00
Eelco Dolstra
5ebaaeb7f3 procps-ng: Add
This will replace procps eventually.
2013-01-23 17:12:20 +01:00
Eelco Dolstra
0a47a28f1d Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-22 23:23:53 +01:00
Shea Levy
50b939ce54 clang: fix build on darwin 2013-01-22 15:41:37 -05:00
Shea Levy
eaa343ea66 llvm: fix build on darwin 2013-01-22 15:17:09 -05:00
Peter Simons
a84de6c966 haskell-semigroupoid-extras: add version 3.0.1 2013-01-22 16:06:50 +01:00
Peter Simons
3a034c9d8e haskell-profunctors: add version 3.2 2013-01-22 16:06:36 +01:00
Peter Simons
2ca9fc6bd7 haskell-groupoids: add version 3.0.1.1 2013-01-22 16:06:23 +01:00
Peter Simons
15f7853a9e haskell-bifunctors: add version 3.0.3 2013-01-22 16:06:13 +01:00
Florian Friesdorf
a63bb419f2 remove pythonhome-wrapper, python-linkme-wrapper is more flexible 2013-01-22 15:28:30 +01:00
Florian Friesdorf
1fa2e7f9a9 python-linkme-wrapper 2013-01-22 15:28:30 +01:00
Shea Levy
bdcf5ba4d7 linux: Don't use the aufs patches by default any more, now that they're not needed for nixos 2013-01-22 08:01:44 -05:00
Rok Garbas
e08b79d256 pythonPackages.turses: upgrade to 0.2.12 (also update of its dependency tweepy). 2013-01-22 13:03:29 +01:00
Rok Garbas
e92c868096 pythonPackages.flake8: upgrade to 1.7.0 2013-01-22 13:02:57 +01:00
Rok Garbas
31bbfb7737 alot: update to latest revision 2013-01-22 13:02:18 +01:00
Eelco Dolstra
f4d4c7f6a8 DBI: revert to 1.616
With the new version DBD::Pg fails with "DBI Connection failed:
install_driver(Pg) failed: Unable to get DBI state function. DBI not
loaded.".
2013-01-22 11:48:37 +01:00
Eelco Dolstra
e78ff09f02 Update Catalyst::Manual 2013-01-22 11:40:24 +01:00
Eelco Dolstra
47793a9eb7 Fix indentation 2013-01-22 11:19:58 +01:00
Cillian de Róiste
a5fe3adc10 pythonPackages: upgrade zope_interface, package more plone dependencies using python2nix.py 2013-01-22 01:45:59 +01:00
Shea Levy
82f3f01526 pythonPackages.zopeInterface is now pythonPackages.zope_interface 2013-01-21 18:11:49 -05:00
Cillian de Róiste
2a050f2137 pythonPackages: add myself as maintainer to some packages which I added 2013-01-21 23:50:27 +01:00
Cillian de Róiste
46d6d437a6 pythonPackages: tidy up names
Use "." in the name where appropriate, e.g. zope.event, since this is the commonly used name for the package.
2013-01-21 23:50:27 +01:00
Cillian de Róiste
719cde0c46 pythonPackages.zope_interface: renamed from zopeInterface to match the naming convention 2013-01-21 23:50:27 +01:00
Shea Levy
b67667e074 perlPackages.ClassLoad: Fix meta.description 2013-01-21 15:43:09 -05:00
Peter Simons
fb5a7e05f9 haskell-doctest: add version 0.9.5 2013-01-21 17:06:28 +01:00
Florian Friesdorf
b02d8f2f5f python-pip 2013-01-21 16:12:56 +01:00
Florian Friesdorf
b5e0ac7550 python-distribute-0.6.34, not using buildPythonPackage
this is in preparation so distribute can be used in buildPythonPackage
2013-01-21 16:07:48 +01:00
Eelco Dolstra
edbaa80bc1 Remove Firefox 17 2013-01-21 14:23:01 +01:00
Eelco Dolstra
331e7ac221 Merge remote-tracking branch 'origin/master' into systemd 2013-01-21 13:01:00 +01:00
Peter Simons
1d1127727c Merge pull request #269 from falsifian/tinc
tinc:  A VPN daemon with full mesh routing.
2013-01-21 02:15:55 -08:00
Peter Simons
13352be4fd perl-Net-OpenID-Consumer: add missing dependency on 'LWP' 2013-01-21 11:08:23 +01:00
Peter Simons
8511c359d1 perl-packages: remove 'HTTPParser' attribute, which is a duplicate of 'HTTPMessage' 2013-01-21 11:07:57 +01:00
Aristid Breitkreuz
adf7a68158 perl package version maintenance as those packages are needed by wget and its dependencies 2013-01-21 10:57:10 +01:00
Florian Friesdorf
52e9981e0e buildPythonPackage defaults to python.meta.platforms 2013-01-21 08:38:54 +01:00
Florian Friesdorf
8b777bbf57 nose2Cov does not create pth for deps - propagate manually 2013-01-21 08:37:28 +01:00
Florian Friesdorf
8dd5f835fc python-coverage-3.6 2013-01-21 08:37:07 +01:00
Florian Friesdorf
3ab50c106d python-ipdb 2013-01-21 06:50:10 +01:00
Florian Friesdorf
b469185673 pythonPackages26 fixes 2013-01-21 06:42:22 +01:00
Florian Friesdorf
9ee07ba54f python-mrbob: add missing dependency 2013-01-21 05:35:41 +01:00
Eelco Dolstra
bcc0c1dc59 Update nixUnstable 2013-01-20 17:26:07 +01:00
Rickard Nilsson
1886d1db6a Merge remote-tracking branch 'upstream/master' into stdenv-updates 2013-01-20 16:53:21 +01:00
Florian Friesdorf
e185691ced python: nose2, nose2Cov and covCore 2013-01-20 16:45:33 +01:00
Florian Friesdorf
7fef7e53ce pythonPackages: use pygobject and pygtk of same python version 2013-01-20 16:45:33 +01:00
Cillian de Róiste
a72c9d728d Distutils2: patch to work with Python2 (only), until the issue http://bugs.python.org/issue17002 is resolved upstream 2013-01-20 11:57:07 +01:00
Cillian de Róiste
49dbf7057d Add pythonPackages Distutils2 and eggdeps 2013-01-19 01:28:30 +01:00
Eelco Dolstra
9da086c08d Merge remote-tracking branch 'origin/master' into systemd 2013-01-19 00:05:50 +01:00
Eelco Dolstra
cd5755845f Lots of Perl package updates 2013-01-19 00:02:51 +01:00
Eelco Dolstra
9e6d6dae01 Test::Warn: Update to 0.24 2013-01-18 13:05:54 +01:00
James Cook
2ba4f46752 tinc: A VPN daemon with full mesh routing. 2013-01-17 22:52:15 -08:00
Cillian de Róiste
52fb5d86a9 Add pythonPackages.zodb3 and dependencies 2013-01-18 02:21:24 +01:00
Cillian de Róiste
64950ff58e Add pythonPackages.buildout 2013-01-18 00:45:36 +01:00
Cillian de Róiste
9720148a14 Add pythonPackages.mrbob 2013-01-18 00:45:36 +01:00
Eelco Dolstra
d8e722985b Add config option ‘allowUnfree’
If set to false, mkDerivation will throw an exception if a package has
an unfree license.  ‘release-lib.nix’ uses this to enforce that we
don't build unfree packages as part of the Nixpkgs channel.  Since
this is set through Nixpkgs' ‘config’ argument, it's more finegrained
than $HYDRA_DISALLOW_UNFREE.
2013-01-17 23:41:37 +01:00
Eelco Dolstra
deaef8abaf Pass ‘config’ to stdenv/generic/default.nix
This is a backport of cf8daf6312 in
stdenv-updates (sans the userHook stuff).
2013-01-17 23:24:55 +01:00
Shea Levy
523ee1671b Add psutil pythonPackage 2013-01-17 11:44:03 -05:00
Eelco Dolstra
5bb548d2e4 Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00
Peter Simons
8150827219 haskell-network: update 2.4.x branch to version 2.4.1.0
This change affects only GHC 7.6.1.
2013-01-17 11:18:32 +01:00
Cillian de Róiste
b85a093b07 pythonPackages.virtualenv: update to 1.8.4 2013-01-17 00:18:02 +01:00
Shea Levy
f1054e5051 Add patch to handle /**/-style comments in Google::ProtocolBuffers
Patch thanks to Daniel Zinn
2013-01-16 13:59:15 -05:00
Vladimír Čunát
f1531391c0 Merge pull request #265 from errge/master
Add jbig2enc.
2013-01-16 06:07:43 -08:00
Gergely Risko
f67bc6bbfd Added jbig2enc. 2013-01-16 14:11:29 +01:00
Peter Simons
eb038185de haskell-crypto-pubkey: add version 0.1.2 2013-01-16 12:42:30 +01:00
Peter Simons
8971eb297a haskell-crypto-numbers: add version 0.1.3 2013-01-16 12:42:30 +01:00
Peter Simons
bbb3726fad haskell-cipher-rc4: add version 0.1.2 2013-01-16 12:42:30 +01:00
Peter Simons
6abb59cbac haskell-hashable: update 1.2.x branch to 1.2.0.5 2013-01-16 12:42:30 +01:00
Peter Simons
1775b99112 all-packages.nix: strip trailing whitespace 2013-01-16 12:22:46 +01:00
Shea Levy
4b10fcf1ec Add Google::ProtocolBuffers perlPackage 2013-01-15 18:09:09 -05:00
Florian Friesdorf
c7701c0786 python-pyquery-1.2.4 and dep python-cssselect-0.7.1 2013-01-15 19:04:41 +01:00
Florian Friesdorf
f5df5847bd add comment 2013-01-15 18:29:42 +01:00
Florian Friesdorf
ed4f0b2657 Merge branch 'channel-nixos' into python 2013-01-15 17:42:48 +01:00
Eelco Dolstra
eeda226b02 Merge branch 'master' into systemd 2013-01-15 12:11:07 +01:00
Evgeny Egorochkin
5dcdcf4af3 Remove Wine-Warcraft because WarCraft 3 works just fine in vanilla Wine now. 2013-01-15 07:43:40 +02:00
Evgeny Egorochkin
be989567c8 Torsocks is not compatible with certain apps like Kopete. Will integrate both in
NixOS.

Revert "removing tsocks as it has been replaced by torsocks."

This reverts commit f947527f18.
2013-01-15 07:24:08 +02:00
Eelco Dolstra
f59881fc30 mplayer: Change directory name / attribute name from MPlayer to mplayer 2013-01-14 14:38:24 +01:00
Lluís Batlle i Rossell
982dd693b3 Adding ffmpeg 1.1
Moving packages using 1.0 to using 1.1. Vlc built fine here.
2013-01-14 00:41:01 +01:00
Shea Levy
553e1b16f0 replace-dependency: Eelco has ruled, lowerCamelCase > dash-case :( 2013-01-13 11:15:01 -05:00
Mathijs Kwik
2738f6d5cc node/bson: fix sha256 2013-01-13 14:54:26 +01:00
Petar Bogdanovic
5d1296b03f qiv: add version 2.2.4 2013-01-12 09:51:54 -05:00
Shea Levy
5626c5cdfb replace-dependency: don't break nixpkgs for people living in the stone age 2013-01-12 09:48:21 -05:00
Peter Simons
4ca4f1564f Merge pull request #254 from jcumming/x86info.130109
X86info.130109
2013-01-12 06:09:32 -08:00
Lluís Batlle i Rossell
0b78c01e18 coreutils: I think I fix the evaluation, which failed for darwin. 2013-01-11 20:47:34 +00:00
Shea Levy
d1662d7155 Add the replace-dependency build support function.
The use case is to do a deep replacement of a dependency without rebuilding the entire tree.
For example, suppose a security hole is found in glibc and a patch released. Ideally, you'd
just rebuild everything, but that takes time, space, and CPU that you might not have, so in
the mean time you could build a safe version of, say, firefox with:

  firefox-safe = replace-dependency { drv = firefox; old-dependency = glibc; new-dependency = patched-glibc; };

Building firefox-safe will rebuild glibc, but only do a simple copy/string replacement on all other dependencies
of firefox. On my system (MBP 13" mid-2012), after a new glibc had been build building firefox took around 11 seconds.

See the comments in the file for more details.
2013-01-11 14:42:09 -05:00
Florian Friesdorf
a7a6173a3f pygtk in pythonPackages, checks disabled, demo works, relates #223
Previously the checkPhase was not executed. It is now and a couple of
issues with it are seded away.
2013-01-11 17:45:26 +01:00
Peter Simons
4db9419a5c gmp: switch default version back to 5.0.5
The 5.1.0 version breaks the build of virtually every package that uses the C++
wrappers for gmp (such as mpfr, ppl, etc).
2013-01-11 17:08:25 +01:00
Peter Simons
b33ad366a1 Merge branch 'master' into stdenv-updates. 2013-01-11 15:46:10 +01:00
Florian Friesdorf
e856c72159 pygobject: in pythonPackages, removed hack handled now by pth 2013-01-11 15:30:56 +01:00
Florian Friesdorf
87423443b8 pycairo: move to pythonPackages 2013-01-11 15:23:44 +01:00
Florian Friesdorf
01f142296a pythonPackages: use unversioned to blend into pkgs, no functional change 2013-01-11 15:21:23 +01:00
Florian Friesdorf
b4f84e3b1e pythonPackages: introduce sections, no functional change 2013-01-11 15:14:53 +01:00
Florian Friesdorf
37abd1e353 fix python26Full expression 2013-01-11 10:35:55 +01:00
Florian Friesdorf
212b4df91c recursivePthLoader included via wrapper, not propagated by modules 2013-01-11 09:53:28 +01:00
Florian Friesdorf
4329ba3fb1 Merge branch 'channel-nixos' into python 2013-01-11 07:35:30 +01:00
Jack Cummings
42859e49ed Merge remote-tracking branch 'upstream/master' into x86info.130109 2013-01-10 21:35:13 -08:00
Vladimír Čunát
6f1aad769f Libertine fonts: update and cleanup. 2013-01-10 22:36:42 +01:00
Lluís Batlle i Rossell
ce705aa998 supertuxkart: updating to 0.8 2013-01-10 20:55:46 +01:00
Sander van der Burg
7242b4994e Added optparse: A node.js option parsing library 2013-01-10 13:39:24 +01:00
Florian Friesdorf
9a41e3630a remove some packages also broken in master 2013-01-10 13:10:47 +01:00
Florian Friesdorf
9f66bf678e release-python: derive python27Package from python27Packages 2013-01-09 22:23:41 +01:00
Florian Friesdorf
06ca1e4768 Merge branch 'channel-nixos' into python 2013-01-09 22:18:38 +01:00
Jack Cummings
2fd4313f6c x86info-1.30 2013-01-09 11:49:41 -08:00
Florian Friesdorf
1b110436bf release-python: remove two non-existing attrs 2013-01-09 20:45:01 +01:00
Lluís Batlle i Rossell
fdf11fdb7e firefox18: adding it to release.nix 2013-01-09 19:45:56 +01:00
Lluís Batlle i Rossell
a628b4b0e4 firefox: adding 18.0
I had to disable it using some nixpkgs, because they were considered
'too old'. They are simply commented in the code.
2013-01-09 17:31:04 +01:00
Peter Simons
1036942197 haskell-dimensional-tf: add version 0.1.1 2013-01-09 17:08:51 +01:00
Peter Simons
9e1df1ada3 haskell-numtype-tf: add version 0.1 2013-01-09 17:08:17 +01:00
Peter Simons
029439c0f6 haskell-type-level-natural-number: add version 1.1.1 2013-01-09 16:57:46 +01:00
Peter Simons
90952495db haskell-naturals: add version 0.2.0.2 2013-01-09 16:54:29 +01:00
Peter Simons
59aa248876 haskell-nat: add version 0.3 2013-01-09 16:54:29 +01:00
Rob Vermaas
cfdf35d6f9 Add preInstall ot buildPythonPackage (postInstall already existed) to allow selenium to work properly again. 2013-01-09 15:46:14 +01:00
Florian Friesdorf
0f007baf70 Merge branch 'channel-nixos' into python 2013-01-09 10:44:45 +01:00
Florian Friesdorf
dabb876c9b release-python: create list of python packages from pythonPackages attrset 2013-01-09 10:39:09 +01:00
Shea Levy
74c92f5f4a First attempt at packaging dd-agent 2013-01-08 12:32:47 -05:00
Eelco Dolstra
1909f9547d Merge remote-tracking branch 'origin/master' into systemd 2013-01-08 17:06:43 +01:00
Vladimír Čunát
afc0784322 Merge pull request #242 from vcunat/vlada/ipe-notg
Add the ipe editor.
2013-01-08 03:32:51 -08:00
Sander van der Burg
c6ff338e27 Added package + build functions for Titanium SDK, a cross-platform mobile development kit 2013-01-07 18:22:10 +01:00
Ludovic Courtès
805561e4aa libuuid: pass `--disable-libmount-mount' on GNU/Hurd. 2013-01-07 17:36:00 +01:00
Sander van der Burg
5b0ca88d97 - Added xcodeenv: experimental support to build iOS apps through Nix
- Moved mobile development tools into a separate folder
2013-01-07 16:52:42 +01:00
Peter Simons
8dd292c32f haskell-transformers-compat: add version 0.1 2013-01-07 12:05:25 +01:00
Peter Simons
c8e152b915 haskell-nats: add version 0.1 2013-01-07 12:05:16 +01:00
Peter Simons
2c219adf4d haskell-hashable: update (unused) 1.2.x version to 1.2.0.3 2013-01-07 12:04:35 +01:00
Eelco Dolstra
c6c1bc6b0f Merge branch 'master' into systemd 2013-01-07 00:34:25 +01:00
Eelco Dolstra
1e9e2cb2bb samba, imagemagick: Add missing meta info 2013-01-06 22:31:16 +01:00
Mathijs Kwik
fbeb84b288 bup: optionally depend on par2cmdline
The default is to use it from path when available, as this is an
optional feature.
2013-01-06 18:44:55 +01:00
Jan Malakhovski
4b041ea0b7 xbmc: add version 11 2013-01-05 23:33:50 +01:00
Peter Simons
9e9cd7b529 Merge branch 'master' into stdenv-updates. 2013-01-04 21:00:53 +01:00
Peter Simons
440bc6ec2a all-packages.nix: strip trailing whitespace 2013-01-04 20:55:41 +01:00
Peter Simons
fdf4dddac1 automake: add version 1.13.1 2013-01-04 20:51:45 +01:00
Peter Simons
796b5e3c9f gmp-5.x: update from 5.0.5 to 5.1.0 2013-01-04 20:38:11 +01:00
Peter Simons
f7ef8f0990 haskell-X11: dropped obsolete version 1.5.0.1 2013-01-04 19:10:36 +01:00
RSzibele
894de031cd Added Minetest-0.4.4. 2013-01-04 11:39:11 +01:00
Jan Malakhovski
e00c03101f anki: add version 2.0.3 2013-01-04 03:48:47 +00:00
Jan Malakhovski
ef926f21e6 maildrop: add version 2.6.0 2013-01-04 03:07:46 +00:00
Cillian de Róiste
4ad3cc1c6d Emacs Rope: update rope, ropemacs and add ropemode 2013-01-04 01:58:22 +01:00
Cillian de Róiste
e0248cdfdb Pymacs (Emacs to Python interface): upgrade to 0.25 2013-01-03 23:03:02 +01:00
Rok Garbas
129aa4df91 alot: updating to latest version 2013-01-03 20:21:04 +01:00
Rok Garbas
fa4f8f8688 pythonPackages.jedi: adding jedi package 2013-01-03 19:28:12 +01:00
Vladimír Čunát
3c2091276e vlada/ipe
Adding the ipe editor.

Signed-off-by: Vladimír Čunát <vcunat@gmail.com>
2013-01-03 16:13:55 +01:00
Rickard Nilsson
db292a74c0 Merge remote-tracking branch 'upstream/master' into systemd
Conflicts:
	pkgs/tools/networking/network-manager/default.nix
2013-01-03 13:44:47 +01:00
Rickard Nilsson
869a222062 obnam: Update to 1.3
Supporting packages also updated.
2013-01-03 13:25:02 +01:00
Rickard Nilsson
9cc281d5e8 Add python packages required for Graphite
Graphite is a scalable realtime graphing webapp,
see http://graphite.wikidot.com
2013-01-03 13:08:23 +01:00
Rickard Nilsson
26ee30d576 python-twisted: Update to 12.3.0 2013-01-03 12:50:19 +01:00
Lluís Batlle i Rossell
ee3f45d1db coreutils: fixing parenthesis on if/then
I'll never get it. This commit is suggested by Eelco, saying
the old parentheses were wrong.
2013-01-02 20:05:53 +01:00
Lluís Batlle i Rossell
9cc65f6893 Setting coreutils to 8.20 for linux, 8.19 for darwin
As Eelco noted in 0ecd1f62c7,
Darwin can't build 8.20. But linux can't build 8.19 now.
2013-01-02 20:01:49 +01:00
Vladimír Čunát
b5a3ae7b22 Merge pull request #241 from RSzibele/filezilla-3.6.0.2
Add FileZilla-3.6.0.2.
2012-12-31 04:29:57 -08:00
Vladimír Čunát
0147801ee7 Merge pull request #240 from RSzibele/tinyxml-2.6.2
Added TinyXML 2.6.2.
2012-12-31 04:29:24 -08:00
RSzibele
70fadcafcb Added FileZilla-3.6.0.2. 2012-12-31 11:59:08 +01:00
RSzibele
e66e926121 Added TinyXML-2.6.2. 2012-12-31 11:13:55 +01:00
Lluís Batlle i Rossell
2402bb2613 gcc: Moving the arch=loongson2f to the current platform approach 2012-12-31 09:38:32 +00:00
Lluís Batlle i Rossell
97d81bde0c Adding platform gcc information for raspberrypi, and the gcc support.
Without it, gcc builds for softfloat, and the glibc doesn't have support for
softfloat (it ends up requiring some gnu-soft.h file). We'll have to test if
this fixes the build of gcc or not, though.
2012-12-30 21:55:02 +00:00
Lluís Batlle i Rossell
eb0422e4c1 Merge branch 'stdenv-updates' into pi-stdenv-updates 2012-12-29 14:18:43 +00:00
Lluís Batlle i Rossell
829bdc1cb0 glibc: making 2.17 the glibc to use cross-building. 2012-12-29 15:08:18 +01:00
Lluis Batlle
db6925ea37 Add kgdb to the sheeveaplug. It can help in case of troubles. 2012-12-29 12:22:50 +01:00
Lluís Batlle i Rossell
30e0edd812 Adding freicoin 0.0.1 2012-12-29 10:46:54 +01:00
Lluís Batlle i Rossell
a8dedfc1d0 Merge branch 'stdenv-updates' into pi-stdenv-updates 2012-12-29 09:05:13 +00:00
Eelco Dolstra
01acc493ca Merge branch 'stdenv-updates' of github.com:NixOS/nixpkgs into stdenv-updates 2012-12-29 02:02:33 +01:00
Eelco Dolstra
0a0c7a352d linux-headers: Update to 3.7 2012-12-29 01:12:31 +01:00
Eelco Dolstra
db418fce3d glibc: Update to 2.17
Note that glibc-ports is now part of the main glibc tarball.
2012-12-29 00:48:14 +01:00
Lluís Batlle i Rossell
67aa9243f0 Merge branch 'stdenv-updates' into pi-stdenv-updates
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial.
2012-12-28 23:30:53 +01:00
Antono Vasiljev
f2c2d18a07 Added httpie
HTTPie is a command line HTTP client. Its goal is to make CLI
interaction with web services as human-friendly as possible.
2012-12-29 00:28:34 +02:00
Lluís Batlle i Rossell
b58780c43d Merge remote-tracking branch 'eelco/master' into stdenv-updates
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial solution.
2012-12-28 23:28:16 +01:00
Lluís Batlle i Rossell
719ba63004 Merge branch 'stdenv-updates' into pi-stdenv-updates
Conflicts:
	pkgs/development/compilers/gcc/4.6/default.nix
	pkgs/development/compilers/gcc/4.7/default.nix

The 4.7 had some weird parameters added in crossAttrs; I've removed
them, but I don't understand where they come from.
2012-12-28 20:14:01 +00:00
Eelco Dolstra
88b11196c1 Clean up redundant "if condition then true else false" 2012-12-28 19:57:47 +01:00
Eelco Dolstra
84779a6f7d Remove unnecessary parentheses around if conditions
Pet peeve...
2012-12-28 19:54:15 +01:00
Eelco Dolstra
e2d505b24e More renames 2012-12-28 19:42:10 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra
5be0a9acd7 Rename hostDrv -> crossDrv, buildDrv -> nativeDrv
This is for consistency with terminology in stdenv (and the terms
"hostDrv" and "buildDrv" are not very intuitive, even if they're
consistent with GNU terminology).
2012-12-28 19:08:19 +01:00
Eelco Dolstra
cf8daf6312 Add an option ‘stdenv.userHook’ to set a global stdenv setup hook
This allows various applications.  It allows users to set global
optimisation flags, e.g.

  stdenv.userHook = ''NIX_CFLAGS_COMPILE+=" -funroll-loops"'';

But the impetus is as an alternative to issue #229, allowing impure
stdenv setup for people who want to use distcc:

  stdenv.userHook = "source /my/impure/setup-script.sh";

This is probably a bad idea, but at least now it's a bad idea in
people's configuration and not in Nixpkgs. :-)
2012-12-28 16:36:09 +01:00
Lluís Batlle i Rossell
ab2520c383 Adding linux-3.6-rpi
I picked the change from
7b4d69eeff
2012-12-27 21:29:56 +00:00
Peter Simons
60cb018d80 youtube-dl: update to version 2012.12.11
The new build comes with man page and bash completion installed.
2012-12-27 20:46:28 +01:00
Michael Raskin
b31e6aa794 Merge pull request #231 from RSzibele/master
Added Logisim 2.7.1
2012-12-27 06:32:03 -08:00
RSzibele
fcdf685793 Added Logisim-2.7.1. 2012-12-27 16:25:39 +01:00
Michael Raskin
15d6989322 Merge pull request #232 from ierton/xkb-switch
Xkb switch
2012-12-27 06:05:12 -08:00
Sergey Mironov
c27b556673 xkb_switch: command line tool to switch X keyboard layouts 2012-12-27 17:45:08 +04:00
Michael Raskin
7b08a67096 Merge pull request #218 from Davorak/master
Include Python for Vim by default in vim_configureable(pkgs.vimHugX)
2012-12-27 05:13:52 -08:00
Eelco Dolstra
99f7c4e324 Merge branch 'master' into systemd 2012-12-27 01:28:25 +01:00
root
1b29d29c76 First movement to get the raspberrypi stdenv building. 2012-12-26 21:59:54 +00:00
Lluís Batlle i Rossell
67c73aafe8 Fixing distccMasquerade to have gas too 2012-12-26 21:54:09 +00:00
Lluís Batlle i Rossell
ea5f15813c distcc: Adding a derivation that prepares a masquerade for distccd 2012-12-26 21:54:06 +00:00
Lluís Batlle i Rossell
3e57886620 Adding wrappers for distcc, similar to those of ccache. 2012-12-26 21:53:57 +00:00
Antono Vasiljev
d67da925a6 Merge branch 'master' of github.com:NixOS/nixpkgs 2012-12-25 22:00:47 +02:00
Antono Vasiljev
2828729b9b mu0 -> mu, version bump 2012-12-25 21:59:48 +02:00
Peter Simons
1235f25426 libtxc_dxtn: add version 1.0.1
The build expression was kindly provided by Arseniy Alekseyev.
2012-12-25 11:57:55 +01:00
Peter Simons
591f85f17e celestia: add version 1.6.1 2012-12-25 11:26:53 +01:00
Peter Simons
275cfb8a80 haskell-hashable: add version 1.2.0.2 2012-12-23 20:14:40 +01:00
Peter Simons
6a15e8da08 haskell-bmp: update 1.2.3.x branch to 1.2.3.4 2012-12-23 19:51:05 +01:00
Antono Vasiljev
d4fc33b13a Merge branch 'master' into arduino
Conflicts:
	pkgs/top-level/all-packages.nix
2012-12-23 00:17:23 +02:00
Florian Friesdorf
b19162f88b release-python.nix used by hydra python-rework jobset
define full job attributes (not just systems) so we can define
schedulingPriority without touching release-lib.nix.

There is definitely a more elegant way to recursively walk attributes
and fill in missing values (job and schedulingPriority).
2012-12-22 01:26:27 +01:00
Florian Friesdorf
886742d91a use recursivePthLoader instead of setuptoolsSite 2012-12-22 01:13:23 +01:00
Florian Friesdorf
1797d396ab python-coilmq test fails 2012-12-22 00:25:37 +01:00
Lluís Batlle i Rossell
0584c1c693 Revert "w3m: fixing the build"
This reverts commit 0dc11d913c.

Somehow, I thought by hydra that w3m wasn't building fine.
2012-12-21 16:47:13 +01:00
Lluís Batlle i Rossell
0dc11d913c w3m: fixing the build
Many packages depend on this.
2012-12-21 16:21:50 +01:00
Eelco Dolstra
bbffdd4702 postgresql: Add version 9.2 2012-12-19 13:51:28 +01:00
Patrick John Wheeler
b264abcabb Turn on Python plugin for vim_configurable by default
Python plugin for vim is turned on by default in ubuntu and other flavors of linux and mimicking
this in NixOS will help contribut to the impression that NixOS "just works."
2012-12-17 21:54:39 +01:00
Shea Levy
97389f5b1f Keep nixpkgs backwards-compatible at least 1 version 2012-12-17 10:21:55 -05:00
Jack Cummings
d1254fa27e add Vessel, a fluid physics puzzle game. 2012-12-16 23:24:31 -08:00
Shea Levy
42b061d118 Add unionfs-fuse 2012-12-16 16:25:24 -05:00
Lluís Batlle i Rossell
14d87a44b1 Trying to fix avogadro -> kdeedu
avogadro also wants eigen2.
2012-12-14 22:23:37 +01:00
Lluís Batlle i Rossell
b956b77423 eigen: adding back eigen 2.0, for kde.
Kdeedu wants eigen 2.0.
2012-12-14 22:23:36 +01:00
Florian Friesdorf
93b3d24b96 oauth2 tests still fail 2012-12-14 20:24:53 +01:00
Mathijs Kwik
fbee57defb new package: casperjs 2012-12-13 17:51:03 +01:00
Mathijs Kwik
2cdc567ff5 new package: phantomjs 2012-12-13 17:51:03 +01:00
Rickard Nilsson
591c27e58d argyllcms: New package, version 1.4.0
ArgyllCMS is an ICC compatible color management system.
2012-12-13 16:01:35 +01:00
Eelco Dolstra
ea9d5e8e56 Remove references to some nonexistent packages 2012-12-13 15:28:07 +01:00
Mathijs Kwik
caf561d41a aufs3: upgrade to 1210 release, add linux-3.7 support 2012-12-13 14:00:28 +01:00
Lluís Batlle i Rossell
465f4f4e3e freecad: updating to git master 2012-12-13 12:38:19 +01:00
Eelco Dolstra
726b1bebbc Remove udev 173 2012-12-13 11:42:00 +01:00
Eelco Dolstra
8116fd9341 consolekit: Remove
This package is obsolete with systemd.
2012-12-13 11:30:18 +01:00
Eelco Dolstra
f364619e22 Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-12 17:01:20 +01:00
Eelco Dolstra
fd6941ad48 nut: Update to 2.6.5 and fix building against systemd
http://hydra.nixos.org/build/3473781
2012-12-12 16:17:47 +01:00
Eelco Dolstra
6a176c79cf Merge remote-tracking branch 'origin/master' into systemd 2012-12-12 16:09:19 +01:00
aszlig
5054e8ec29
scid: New package, version 4.3.
Just saw Michael Raskin's GNU Chess and XBoard updates and did a short check if
Scid is already in nixpkgs. It wasn't, so I decided to add it, so thanks to
@7c6f434c :-)

The package involves a lot of patching, as usual with Tcl/Tk on NixOS. In this
case the program is written in C++ and embeds the Tcl/Wish interpreter.

Unfortunately this doesn't make it easier to inject TCLLIBPATH, as there doesn't
seem to be a direct library call (well in theory you could `lappend TCLLIBPATH`,
but that won't help with TK_LIBRARY).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:20 +01:00
aszlig
0c160be3d2
ascii: New package, version 3.12.
Quite a useful tool, especially for non English native speakers to find out what
people mean with things like "hiccup", "boink", "blugle" and whatnot.

And of course it's quite useful to convert between hex/oct/dec/bin.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:19 +01:00
aszlig
6acc5289fc
vbindiff: New package, version 3.0_beta4.
Visual binary differences viewer, very useful for reverse-engineering
proprieritary file formats.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:18 +01:00
aszlig
e42dc52f42
samplicator: New package, version 1.3.7-beta6.
A small and lightweight UDP redirector if you don't want to bend a fly on the
wheel using socat.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:18 +01:00
aszlig
abb7c98cfe
wbox: New package, version 5.
Yet another HTTP benchmarking tool, which is really quite minimalistic and in
ANSI C.

This package maybe isn't even worth putting it in its own file and directory but
I did it for the sake of consistency.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:18 +01:00
aszlig
7cd641a4e7
hping: New package, version 20051105.
Quite a lot of patching involved here, but the upstream package is no longer
maintained anymore. Nevertheless the tool is still useful in some environments.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:17 +01:00
Peter Simons
b9bf83031c haskell-blaze-svg: add version 0.3.3.0 2012-12-12 11:40:10 +01:00
Peter Simons
8572b50535 haskell-dual-tree: add version 0.1.0.0 2012-12-12 11:40:00 +01:00
Peter Simons
75173b144f haskell-force-layout: add version 0.2 2012-12-12 11:39:51 +01:00
Peter Simons
72a16af4b3 haskell: add minimorph-0.1.4.0 and miniutter-0.4.0 2012-12-12 11:39:17 +01:00
Peter Simons
1612d80354 haskell-monoid-extras: add version 0.2.2.1 2012-12-12 11:39:03 +01:00
Peter Simons
b5ec495f5f haskell: add diagrams-contrib-0.6 and diagrams-svg-0.6 2012-12-12 11:37:44 +01:00
Lluís Batlle i Rossell
67019c1676 Fixing the 3.7 kernel packages. They referred to 3.6. 2012-12-12 11:20:44 +01:00
Michael Raskin
232fedb1c7 XBoard: update to 4.6.2 2012-12-12 09:29:49 +04:00
Shea Levy
9ddd1cc78b Linux 3.7
Kernel configuration succeeds, I'll let hydra test the build
2012-12-11 11:57:04 -05:00
Eelco Dolstra
f36f5cc82c Mark socat2 as lowPrio 2012-12-11 14:53:23 +01:00
Rickard Nilsson
bdfe779d2c Add xcalib 0.8, a tiny monitor calibration loader 2012-12-11 11:36:02 +01:00
Rickard Nilsson
6d8109555e Add legacy version 304.64 of the Nvidia driver
The current 310.x version of the Nivida driver has dropped support
for some cards (for example 6200LE).
2012-12-11 11:33:40 +01:00
Lluís Batlle i Rossell
0f7dee47a1 librecad: adding its 2.0 beta version too 2012-12-11 09:53:25 +01:00
Peter Simons
f9f9921d7c Add haskell-either version 3.0.2 and haskell-errors version 1.3.1. 2012-12-10 12:43:46 +01:00
Eelco Dolstra
179df95090 Merge remote-tracking branch 'origin/master' into systemd 2012-12-10 12:39:14 +01:00
Michael Raskin
1c3434cc16 Update E prover 2012-12-09 00:36:38 +04:00
Shea Levy
5f8647e7ae Merge branch 'redis' of https://github.com/washort/nixpkgs into upstream
fixes for redis on OSX
2012-12-07 12:28:58 -05:00
Allen Short
c47e911177 fixes for redis on OSX 2012-12-07 09:23:53 -08:00
Eelco Dolstra
1c24391251 nix: Update to 1.2 2012-12-07 13:46:07 +01:00
Peter Simons
24d9f8b4e2 pkgs/top-level/all-packages.nix: implement 'mesaSupported' attribute on top of mesaPlatforms
Thanks to Florian Friesdorf for pointing out the inconsistency in these attributes.
2012-12-06 11:28:23 +01:00
Peter Simons
0dcbfcc975 Added Haskell packages kansas-lava 0.2.4, netlist-to-vhdl 0.3.1, netlist 0.3.1, and sized-types 0.3.4.0. 2012-12-06 10:55:00 +01:00
Florian Friesdorf
ea58608726 python: give coverage to coilmq and oauth2 - thx shea 2012-12-06 08:24:38 +01:00
cillianderoiste
5b0cd954f1 Merge pull request #206 from chaoflow/python-merge
python pureness, cleanup, and enable pth loaders (setuptoolsSite, recursivePthLoader)
2012-12-05 14:28:09 -08:00
Mathijs Kwik
bc9efb67ef spice: upgrade to 0.12.0 2012-12-05 20:22:49 +01:00