nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 00:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,564 Commits 232 Branches 124 Tags 7.4 GiB
ea13e2aa87
Commit Graph

50329 Commits

Author SHA1 Message Date
Valérian Galliat
62b17c8bf1 io.js: shared libraries 
@lethalman courtesy <https://github.com/NixOS/nixpkgs/pull/6234#issuecomment-75429850>.
 2015-02-22 12:00:34 +01:00
aszlig
089bdce621
Re-re-revert "chromium: remove preferLocalBuild". 
This reverts commit 0696b0ef78.

Okay, now finally, let's get this straight. We actually *want*
preferLocalBuild, *because* we have improved the source splitup in
c92dbffeac.

The idea is to use local builds in order to prevent the source being
pushed to a remote machine, splitted up there (and thus copied again)
and then being copied *again* FROM the remote machine.

"DOH!" - as @edolstra or @rbvermaa would call it... and good d^Hnight.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-02-22 08:31:25 +01:00
aszlig
7cd6dd9ada
inkscape: Clean up and update to version 0.91. 
This now also includes support vor visio and cdr and also adds the
missing dependency on libexif.

Forcing -lX11 in NIX_LDFLAGS is no longer needed in 0.91, so we drop
that as well as the patch and the --with-python configure flag, which is
now no longer even valid.

Tests now seem to run fine without -j1 as well.

I also tested it against the DXF test file mentioned in #3449, to be
sure we don't regress here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-02-22 08:14:53 +01:00
aszlig
0696b0ef78
Re-revert "chromium: remove preferLocalBuild". 
This reverts commit 26f024626c.

I actually wasn't reading the "remove" in the commit message, so sorry
for the brainfart/noise.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-02-22 08:07:23 +01:00
aszlig
26f024626c
Revert "chromium: remove preferLocalBuild" 
This reverts commit fdb5cf8107.

The reason I'm reverting this is that the implications this had on the
IO load of Hydra are fixed by c92dbffeac.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-02-22 07:55:33 +01:00
aszlig
c92dbffeac
chromium: Split up the source tarball on the fly. 
So far we've done the source code split up by using the generic
unpackPhase and copying it all over into the different outputs.

However, this had the problem of generating the I/O load of about three
times the size of the source tree: First at fetchurl of the tarball
(although it's not as much because it's compressed), second at
unpackPhase and third at installPhase.

Now we don't use installPhase anymore and directly unpack into the
output paths, which unfortunately becomes quite a bit more complex
because we need to transform the paths of the tar file on the fly.

I've also tried using GNU Tar's --to-command option to even untar *and*
patch it at the same time, but forking for every single file in the
tarball gets REALLY slow and also gets even more complex than this two
stage approach because you need to make sure that the patch file is
applied correctly, for example for files that don't yet exist but are to
be created by the patch file.

We're using --anchored and --no-wildcards-match-slash here to prevent
accidentally excluding files we don't want to exclude. One example is
something like v8/tools/gyp/v8.gyp.

So the current approach is some compromise between complexity and speed
and should hopefully get rid of the Hydra build timeouts by lowering I/O
load.

See here for examples of builds having this issue:

http://hydra.nixos.org/build/19045023
http://hydra.nixos.org/build/19044973
http://hydra.nixos.org/build/19044968
http://hydra.nixos.org/build/19045019

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-02-22 07:52:53 +01:00
aszlig
0aad4b7ee4
chromium: Update all channels to latest versions. 
Overview of the updated versions:

stable: 40.0.2214.91 -> 40.0.2214.115
beta:   41.0.2272.16 -> 41.0.2272.64
dev:    41.0.2272.16 -> 42.0.2305.3

Introduces 42.0.2305.3 as the new dev version, which no longer requires
our user namespaces sandbox patch. Thanks to everyone participating in
https://crbug.com/312380 for finally having this upstream.

In the course of supporting the official namespace sandbox (that's what
the user namespace sandbox is called), a few things needed to be fixed
for version 42:

 * Add an updated nix_plugin_paths.patch, because the old
   one tries to patch the path for libpdf, which is now natively included
   in Chromium.

 * Don't copy libpdf.so to libexec path for version 42, it's no longer
   needed as it's completely built-in now.

 * Disable SUID sandbox directly in the source instead of going the easy
   route of passing --disable-setuid-sandbox. The reason is that with
   the command line flag a nasty nagbar will appear.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-02-22 07:52:52 +01:00
Nathaniel Baxter
e149afe3a1 quazip: update from 0.7 to 0.7.1 2015-02-22 15:16:39 +11:00
Nathaniel Baxter
89f4507c5c libbluray: fix aacs support 2015-02-22 14:39:37 +11:00
Thomas Tuegel
a1c76a061f Merge branch 'zotero' 2015-02-21 20:23:40 -06:00
Thomas Tuegel
18e594eddb hplip: update to 3.15.2 2015-02-21 20:19:21 -06:00
Nathaniel Baxter
798a42a3ee ffmpeg: update 2.5.3 to 2.5.4 2015-02-22 11:58:48 +11:00
Ben Darwin
63d61cee7f teyjus: 2.0-b2 2015-02-21 19:55:24 -05:00
Thomas Tuegel
e2dabcfcfe zotero: update to 4.0.26 2015-02-21 18:38:32 -06:00
Thomas Tuegel
045013be89 Merge branch 'dropbox' 2015-02-21 18:17:21 -06:00
Thomas Tuegel
7c37b4d672 dropbox: update to version 3.2.6 2015-02-21 18:17:04 -06:00
Ambroz Bizjak
11fce52c7c gcc-arm-embedded: Update to 4.9-2014q4. 2015-02-21 23:48:58 +01:00
Arseniy Seroka
c71f19f8c0 Merge pull request #6502 from ehmry/makebootfat 
makebootfat: initial package at version 1.4
 2015-02-22 01:17:38 +03:00
Emery Hemingway
142a5ce2b3 makebootfat: initial package at version 1.4 
http://advancemame.sourceforge.net/boot-readme.html
 2015-02-21 16:56:02 -05:00
Jonathan Glines
3bfbed7535 Made suggested changes to nkf package 2015-02-21 14:35:01 -07:00
Arseniy Seroka
890b4e4cbd Merge pull request #6501 from zimbatm/direnv-2.6.0 
Direnv 2.6.0
 2015-02-22 00:30:10 +03:00
Arseniy Seroka
f54a3a462e Merge pull request #6489 from benley/mesos-dns 
New package: mesos-dns
 2015-02-22 00:26:20 +03:00
Arseniy Seroka
8887ad850f Merge pull request #6487 from ftrvxmtrx/openal-soft-1.16.0 
openal-soft 1.15.1 -> 1.16.0
 2015-02-22 00:25:55 +03:00
Arseniy Seroka
cbac300134 Merge pull request #6464 from suvash/add-mosquitto-broker 
Add Mosquitto MQTT server package
 2015-02-22 00:25:14 +03:00
Thomas Tuegel
ac2c57ea2c poppler_qt5: use Qt 5.4 2015-02-21 13:54:22 -06:00
Thomas Tuegel
1254a6478d Merge branch 'kde5-split-qt' 2015-02-21 13:49:49 -06:00
Peter Simons
05b97395ae haskell-hmm does not compile. 2015-02-21 18:53:35 +01:00
Peter Simons
5b475709c8 haskell-elevator doesn't compile. 2015-02-21 18:53:35 +01:00
Peter Simons
79c33623a5 haskell-apiary: test suite depends on obsolete QuickCheck 1.x 2015-02-21 18:53:35 +01:00
Peter Simons
862d224c69 haskell-wxc: fix build 
Our 'wxGTK' attribute refers to wxwidgets 2.8 by default, but haskell-wxc needs
version 2.9 or later.

Resolves https://github.com/NixOS/nixpkgs/issues/6478.
 2015-02-21 18:53:35 +01:00
Peter Simons
14fe149551 haskell-types-compat: Haddock fails with an internal error 2015-02-21 18:53:35 +01:00
Peter Simons
b4ed8845a9 haskell-uhc-light: Haddock syntax errors have been fixed 2015-02-21 18:53:35 +01:00
Peter Simons
81082affeb haskell-c2hs fails its test suite on Linux/i686 2015-02-21 18:53:34 +01:00
Peter Simons
aa8b539611 haskell-asn1-encoding fails its test suite on Linux/i686 2015-02-21 18:53:34 +01:00
Peter Simons
8051e87848 hackage-packages.nix: re-generate from Hackage 2015-02-20T13:19:54+0100 2015-02-21 18:53:34 +01:00
zimbatm
db50ddd9ea direnv: update to v2.6.0 2015-02-21 17:47:39 +00:00
Thomas Tuegel
8cf78bf5f4 update various packages to use Qt 5.4 2015-02-21 11:39:20 -06:00
Thomas Tuegel
0cf073627c remove split qt-5.3 2015-02-21 11:39:19 -06:00
Thomas Tuegel
95b13b1155 add media-player-info 2015-02-21 11:39:19 -06:00
Thomas Tuegel
2e7bf4ff60 remove kde-frameworks-5.5 and kde-frameworks-5.6 2015-02-21 11:39:19 -06:00
Thomas Tuegel
5dcab4fcf3 add kde-frameworks-5.7 2015-02-21 11:39:19 -06:00
Thomas Tuegel
2e38240c95 add qt-5.4 2015-02-21 11:39:18 -06:00
Thomas Tuegel
69ff7ab541 remove plasma-5.1 2015-02-21 11:39:18 -06:00
Thomas Tuegel
fdcfefee2c autonix: tweak manifest format 2015-02-21 11:39:18 -06:00
Vladimír Čunát
7bf2021349 nvidia_x11: reintroduce libXv for nvidia-settings 
It was dropped in 77986803a6.
 2015-02-21 17:28:02 +01:00
Sander van der Burg
382f175f10 ejabberd: fix problem with missing shell while loading a backup 2015-02-21 16:08:55 +00:00
Vladimír Čunát
77986803a6 nvidia_x11: fix nvidia-settings after the major update 
The GUI would no longer find libs it needed.
Now it's gtk3 by default, so we don't support gtk2 version for simplicity.
ldd finds no missing libs after this commit.
 2015-02-21 16:07:53 +01:00
Suvash Thapaliya
81588746aa Add Mosquitto MQTT server package 
as of now it is just built and copied to the right place so that
the server can be run.  hopefully i will be tweaking with the
configuration files in the future and tweak this a bit more
 2015-02-21 11:38:51 +01:00
Arseniy Seroka
18ec13d9d2 Merge pull request #6483 from qknight/kino-1.3.4-build-fix 
kino-1.3.4 fixes
 2015-02-21 13:32:40 +03:00
Sibi
c8ae0b77f3 new package: passlib 2015-02-21 15:09:21 +05:30
John Wiegley
6f30dcd456 emacs24Macport: upgrade Macport patch to 5.1 -> 5.3 2015-02-21 03:38:07 -06:00
vbgl
91ab2d82da Merge pull request #6484 from Havvy/patch-2 
Update Elixir to v.1.0.3
 2015-02-21 09:48:25 +01:00
Valérian Galliat
7fcac2e8e1 Update iojs 2015-02-21 09:06:24 +01:00
Valérian Galliat
c56256709b Add io.js 2015-02-21 09:06:24 +01:00
Nathaniel Baxter
e0cefbca65 virt-viewer: update from 1.0 to 2.0 2015-02-21 16:29:50 +11:00
Nathaniel Baxter
ce7449f68b virt-manager: update from 1.0.1 to 1.1.0 2015-02-21 16:29:50 +11:00
codyopel
f10a8f8501 openjpeg: refactor to generic, add 1.x & 2.0.0 -> 2.1.0 2015-02-20 22:20:19 -05:00
Henry Till
a0830c9039 hsetroot: fix libX11 error 2015-02-20 20:49:33 -05:00
Benjamin Staffin
d382667537 New package: mesos-dns 2015-02-20 17:11:49 -08:00
Benjamin Staffin
2290dbb843 Update goPackages.dns to a more recent commit 
Old: 2014-07-15
New: 2015-02-20, with many bugfixes and improvements and test coverage.
 2015-02-20 17:11:48 -08:00
Siarhei Zirukin
61b8aa26f2 openal-soft 1.15.1 -> 1.16.0 2015-02-21 00:44:18 +01:00
Ryan Scheel
f2f3c5b4ef Update Elixir to v.1.0.3 
Tested locally and it works. :D
 2015-02-20 14:23:04 -08:00
Carles Pagès
1aed33f68b homebank: update to 5.0.0 2015-02-20 23:16:29 +01:00
Joachim Schiele
1a35a0ad34 kino-1.3.4 fixes; thanks to gentoo 2015-02-20 22:44:10 +01:00
Bjørn Forsman
c22435e70d clang-analyzer: align attrname with pkgname 2015-02-20 22:30:51 +01:00
Bjørn Forsman
97875ac175 bridge-utils: align attrname with pkgname 2015-02-20 22:30:51 +01:00
Jonathan Glines
30061d3971 Packaged nkf (network kanji filter) 2015-02-20 14:23:08 -07:00
Domen Kožar
d67ba6c5ab Merge pull request #6431 from psibi/new-python-sibi-patch 
new package: pybcrypt
 2015-02-20 12:49:13 -08:00
Sander van der Burg
8b1110f89a Bump development versions of several Disnix tools 2015-02-20 20:20:43 +00:00
William A. Kennington III
29fc0daa27 protobuf: Mark as disabled on py3k and fix python executable references 2015-02-20 11:17:08 -08:00
William A. Kennington III
a959cc91cf google_apputils: Keep disabled on py3k 2015-02-20 11:16:44 -08:00
Arseniy Seroka
6cd330b3e7 twmn: fix name (use date) and update pkg 2015-02-20 22:14:45 +03:00
Arseniy Seroka
bbbb9c0f93 swh-lv2: fix name (use date) 2015-02-20 22:14:44 +03:00
Arseniy Seroka
db35cb4937 DISTRHO: fix name (use date) and update pkg 2015-02-20 22:14:44 +03:00
William A. Kennington III
c21991d478 google_apputils: Update to 0.4.1 2015-02-20 11:14:41 -08:00
William A. Kennington III
1dd647eba6 protobuf: Remove v as it is unneeded now 2015-02-20 10:42:14 -08:00
William A. Kennington III
f58c96149d protobuf: Fix python build 2015-02-20 10:36:16 -08:00
rushmorem
b0277e5b0d Fix marathon package 2015-02-20 18:28:11 +02:00
Aycan iRiCAN
494fb2deb2 Updated haskellPackages.{rest-wai, rest-snap} 2015-02-20 16:13:49 +02:00
Peter Simons
7afe039842 pkgs/development/r-modules: fix evaluation errors 2015-02-20 15:08:18 +01:00
Luca Bruno
3391728c63 dragonegg: fix sha256 2015-02-20 14:51:24 +01:00
Luca Bruno
78834b9254 airfield: mark as broken, don't know what broke it 2015-02-20 14:46:37 +01:00
Ricardo M. Correia
50bf56fd09 grsecurity: Update stable and test patches 
stable: 3.0-3.14.33-201502181906 -> 3.0-3.14.33-201502200812
test:   3.0-3.18.7-201502180834  -> 3.0-3.18.7-201502200813
 2015-02-20 14:29:45 +01:00
Luca Bruno
cc837a974b sqlalchemy9: disable for pypy 2015-02-20 14:15:35 +01:00
Luca Bruno
7620fdb3ac sympy: disable for pypy 2015-02-20 14:11:25 +01:00
Luca Bruno
3225bf25b9 more-itertools: disable for py3k 2015-02-20 14:10:54 +01:00
Luca Bruno
1d09c1fd34 audiotools: disable for py3k 2015-02-20 14:10:49 +01:00
Luca Bruno
97f9150a56 wml: mark as broken, don't know why it broke 2015-02-20 14:07:59 +01:00
Luca Bruno
332c32b772 Revert "v8: 3.26.31.15 -> 3.31.1" 
This reverts commit 098ed10f39.
 2015-02-20 14:07:59 +01:00
Luca Bruno
fb4fc507ef Revert "v8: Properly update to 4.1.0.15" 
This reverts commit 1570cb501c.
 2015-02-20 14:07:59 +01:00
Luca Bruno
e0703e0d67 seeks: use protobuf 2.5 2015-02-20 14:07:58 +01:00
Luca Bruno
fbc7738867 sproxy: mark as broken, don't know what broke it 2015-02-20 14:07:58 +01:00
Shea Levy
830c76d6ba Merge branch 'xen_kernel' of git://github.com/ts468/nixpkgs 
Add kernel config form dom0 of Xen
 2015-02-20 07:49:46 -05:00
Peter Simons
9e4166328c Merge pull request #6458 from fpletz/package/screen-message 
Add new package screen-message
 2015-02-20 13:27:51 +01:00
Peter Simons
eb500e9945 Merge pull request #6432 from abbradar/r-update 
Regenerate R modules and update mirrors
 2015-02-20 13:22:45 +01:00
Pascal Wittmann
c1f50b6222 calibre: update from 2.19.0 to 2.20.0 2015-02-20 13:08:47 +01:00
Rickard Nilsson
0fbe589331 elasticsearch: Update from 1.4.3 to 1.4.4 2015-02-20 12:07:31 +01:00
Rob Vermaas
e1f08578aa elasticsearch: update from 1.4.2 to 1.4.3, potentially fixes CVE-2015-1427 2015-02-20 10:55:10 +00:00
Vincent Laporte
49114dec1f Adds ocaml-ocplib-endian 
This OCaml library provides optimised functions to read and write
int16/32/64 from strings, bytes and bigarrays, based on primitives added
in version 4.01.

Homepage: https://github.com/OCamlPro/ocplib-endian
 2015-02-20 11:37:32 +01:00
Rickard Nilsson
43c6f913a5 Merge pull request #6442 from 4z3/exim 
exim: add version 4.85 incl. nixos module
 2015-02-20 11:07:06 +01:00
tv
86cb16965a exim: add version 4.85 incl. nixos module 2015-02-20 10:49:15 +01:00
Cillian de Róiste
cfb68ce4f0 lmms: update from 1.1.0 to 1.1.2 2015-02-20 10:39:47 +01:00
Damien Cassou
bc58f50eab Merge pull request #6338 from DamienCassou/plm-2.5 
New package PLM: Programmer's Learning Machine
 2015-02-20 09:17:27 +01:00
rushmorem
fa24a296be Add jshon package 
Jshon is a JSON parser designed for maximum convenience within the
shell (http://kmkeen.com/jshon).
 2015-02-20 10:10:43 +02:00
Domen Kožar
a76b53b06b Merge pull request #6339 from psibi/pythonmagick-fix 
Integrate mailchimp.
 2015-02-20 07:22:15 +01:00
Sebastián Bernardo Galkin
8a7097972e Postgis requires json_c to provide GeoJson support 
This change adds the needed build dependency and configuration to postgis
 2015-02-19 18:05:49 -08:00
Sibi
af7c1baf95 new package: Mailchimp python module 2015-02-20 04:31:25 +05:30
Vladimír Čunát
7d129a88a5 merge #5333: altcoins: a new category of applications 
Conflicts (openssl override moved to pkgs/applications/altcoins/default.nix):
	pkgs/top-level/all-packages.nix
 2015-02-19 23:36:41 +01:00
Nikolay Amiantov
8450ff3ab8 rPackages: fix broken packages 2015-02-19 23:53:36 +03:00
Domen Kožar
6eb740191f Merge pull request #6460 from fpletz/package/libressl 
Update libressl to 2.1.3
 2015-02-19 21:52:18 +01:00
Nikolay Amiantov
3e6531c174 rPackages: add packagesWithRDepends 2015-02-19 23:51:24 +03:00
Nikolay Amiantov
88ab59eb73 rPackages: nicer override* functions 2015-02-19 23:50:42 +03:00
Nikolay Amiantov
0f9c0348af rPackages: remove Xvfb where it's not needed 2015-02-19 23:49:41 +03:00
Arseniy Seroka
f5ee15d694 Merge pull request #6453 from k0ral/prosody 
prosody: added luaevent dependency
 2015-02-19 23:42:01 +03:00
koral
a57ec23d55 prosody: added luaevent dependency. 2015-02-19 21:07:23 +01:00
Franz Pletz
22bfa41033 Update libressl to 2.1.3 2015-02-19 19:33:41 +01:00
Franz Pletz
48f4290cd8 Update silc-client to 1.1.11 2015-02-19 19:31:29 +01:00
Franz Pletz
6265123f7a Add new package screen-message 2015-02-19 19:19:33 +01:00
William A. Kennington III
3d2c7d791e weston: Update to 1.7.0 2015-02-19 10:13:44 -08:00
William A. Kennington III
e574da83de wayland: Always build documentation 2015-02-19 09:57:16 -08:00
William A. Kennington III
2cbd639b2a graphviz-nox: Actually build without any deps on mesa or x11 2015-02-19 09:56:50 -08:00
codyopel
a53da93b2b wayland: 1.6.0 -> 1.7.0 & add optionals 
All non-essential dependencies are now optional, with exception
to wayland-scanner which if not enabled causes wayland to fail to build
 2015-02-19 09:47:40 -08:00
Tobias Geerinckx-Rice
9775f462b7 stress-ng 0.03.16 -> 0.03.18 2015-02-19 14:47:52 +01:00
Tobias Geerinckx-Rice
72b30b1b3d wakatime 20150213 -> 3.0.7 2015-02-19 14:47:52 +01:00
Jaka Hudoklin
ebfadc2fc9 Merge pull request #6452 from rushmorem/update-chronos-port 
Update chronos default port
 2015-02-19 14:13:00 +01:00
Jaka Hudoklin
77235e24bf Merge pull request #6454 from rushmorem/mesos-marathon-squashed 
New package: Mesos marathon framework (updated)
 2015-02-19 14:12:25 +01:00
Benno Fünfstück
e47675db6a cutecom: new expression 2015-02-19 13:34:31 +01:00
rushmorem
74b40e9a43 Add marathon mesos framework 2015-02-19 13:30:00 +02:00
rushmorem
a661802d29 Update chronos default port 
Update chronos default port to match the one documented on
their website (http://airbnb.github.io/chronos). The one in
their repo (the current one) clashes with the marathon documented
one.
 2015-02-19 12:31:12 +02:00
Jim Garrison
66097d8f4f julia: 0.3.5 -> 0.3.6 2015-02-19 00:07:20 -08:00
Ricardo M. Correia
99eb8705cd grsecurity: Update stable patch from 3.0-3.14.33-201502180832 -> 3.0-3.14.33-201502181906 2015-02-19 04:47:44 +01:00
Dan Peebles
e25150bb10 No need for this hack anymore 2015-02-18 22:18:57 -05:00
William A. Kennington III
524e815af1 krb5: 1.13 -> 1.13.1 2015-02-18 18:20:53 -08:00
William A. Kennington III
47f9a276c3 graphviz: Add a no x dependency version 2015-02-18 18:15:51 -08:00
William A. Kennington III
f94d0c3aa7 ctl: Update to 1.5.2 2015-02-18 18:03:34 -08:00
William A. Kennington III
e9c1a56f97 ilmbase: Update to openexr version 2015-02-18 18:03:34 -08:00
William A. Kennington III
51cc9612b7 openexr: 1.7.1 -> 2.2.0 2015-02-18 18:03:34 -08:00
Nikolay Amiantov
aec96d46c1 Merge pull request #6375 from abbradar/winetricks 
winetricks: update
 2015-02-19 02:29:54 +03:00
Nikolay Amiantov
ca8137d4a8 winetricks: update 2015-02-19 02:12:09 +03:00
Vincent Laporte
324324b024 Adds ocaml-erm_xml 
XML Parser for discrete data

Homepage: https://github.com/ermine/xml
 2015-02-18 22:21:53 +01:00
bstrik
6920d4fbeb dockapps for windowmaker 2015-02-18 21:53:47 +01:00
Vladimír Čunát
a9e4fc1079 poppler-qt4: fix rendering, fixes #6366 
The subpixel patches seem to cause trouble in recent versions.
 2015-02-18 21:38:23 +01:00
Joel Taylor
1b0409896e add fetch-bower to node-packages 2015-02-18 11:38:33 -08:00
Peter Simons
01d06e8ed8 Merge pull request #6428 from joachifm/more-haskell-updates 
Fix some haskellPackages build failures
 2015-02-18 20:37:44 +01:00
Arseniy Seroka
4880416b31 Merge pull request #6439 from mvcisback/uncertainties 
Add uncertainties python package
 2015-02-18 22:31:26 +03:00
Marcell Vazquez-Chanlatte
7e4e671c54 Add uncertainties python package 2015-02-18 11:29:40 -06:00
tv
61f074028b qprint: add version 1.1 2015-02-18 18:22:44 +01:00
Nikolay Amiantov
d9d0771769 Merge pull request #6434 from abbradar/bundler-checksum 
bundler and gitlab; fix checksums
 2015-02-18 20:08:59 +03:00
Nikolay Amiantov
c6e0178d40 gitlab: fix checksum 2015-02-18 19:25:13 +03:00
Ricardo M. Correia
c5a7115721 grsecurity: Update stable and test patches 
stable: 3.0-3.14.32-201502062101 -> 3.0-3.14.33-201502180832
test:   3.0-3.18.6-201502062100  -> 3.0-3.18.7-201502180834
 2015-02-18 17:24:53 +01:00
Nikolay Amiantov
aa878ffe94 bundler: fix hash 2015-02-18 19:06:30 +03:00
Nikolay Amiantov
7791a5362d libtirpc: adopt 2015-02-18 19:00:54 +03:00
Nikolay Amiantov
aa2fd491ad rpcbind: update 2015-02-18 19:00:54 +03:00
Arseniy Seroka
57a0c44c2c vimPlugins: update 2015-02-18 18:36:48 +03:00
lethalman
ee612198e7 Merge pull request #6400 from puffnfresh/package/consul-template 
Add consul-template package
 2015-02-18 15:29:42 +01:00
Nikolay Amiantov
621d1ab444 R: update mirrors 2015-02-18 15:41:46 +03:00
Nikolay Amiantov
6c2a607112 R: update archive url 2015-02-18 15:41:46 +03:00
Nikolay Amiantov
75ce44a95c r-modules: regenerate 2015-02-18 15:41:46 +03:00
Sibi
efbd73dc4c new package: pybcrypt 2015-02-18 18:08:13 +05:30
Arseniy Seroka
4c125ceddc Merge pull request #6310 from ikervagyok/usb-modeswitch 
Update: usb-modeswitch 2.2.0 -> 2.2.1
 2015-02-18 14:20:16 +03:00
Domen Kožar
b7c3afa674 Merge pull request #5926 from benmos/postgis 
Postgis 2.1.4 support
 2015-02-18 12:08:59 +01:00
Eelco Dolstra
d6c88eaeb8 Apply upstream fix for Nix on XFS 
Fixes #6424.
 2015-02-18 10:41:39 +01:00
Eelco Dolstra
cbab474cea nixUnstable: Update 2015-02-18 10:39:47 +01:00
Wout Mertens
1a6b92bb71 Merge pull request #6421 from Havvy/patch-1 
Update Node stable to v.0.12.0
 2015-02-18 10:36:40 +01:00
Sergey Mironov
0a006c78bf dhcpdump: add the tool 2015-02-18 11:52:20 +03:00
Sergey Mironov
b7adfe0e7d sipp: add the package 2015-02-18 11:52:14 +03:00
Sergey Mironov
4fea283349 sipcmd: add the command-line SIP client 2015-02-18 11:52:05 +03:00
Damien Cassou
3ae27db166 requests2 2.4.3 -> 2.5.1 2015-02-18 08:51:41 +01:00
Dan Peebles
c6ce6460c4 Rearrange llvm dependencies slightly to avoid unnecessary dependencies on darwin (binutils is only used for gold integration, which doesn't apply on darwin) 2015-02-18 02:05:56 -05:00
Joachim Fasting
baba36ce27 haskell-rest-happstack 
Fixes build
 2015-02-18 06:53:13 +00:00
Joachim Fasting
c2f216b8e1 haskell-rest-types: version bump 2015-02-18 06:53:13 +00:00
Joachim Fasting
233cc55dc4 haskell-rest-core: version bump 2015-02-18 06:53:08 +00:00
Ryan Scheel
ffc1a595e4 Update Node stable to v.0.12.0 
Patch is from ewemoa on IRC and claims it built successfully. User didn't want to create a Github account. Original patch is at https://pastee.org/zx45s
 2015-02-17 22:44:58 -08:00
Joachim Fasting
b3bacd4d0c haskell-pool-conduit: mark as broken 
Fails to build, deprecated.
 2015-02-18 06:41:09 +00:00
Joachim Fasting
45b9432f82 haskell-happstack-lite: version bump 
Fixes build
 2015-02-18 06:39:02 +00:00
Damien Cassou
ae0263f960 Merge pull request #6420 from DamienCassou/deactivate-simpleparse-on-python3 
Disable simpleparse on python3 and pypy
 2015-02-18 07:38:03 +01:00
Joachim Fasting
fbe66014ab haskell-happstack-hamlet: mark as broken 
No upstream version supports happstack-server >= 7.4
 2015-02-18 06:37:52 +00:00
Damien Cassou
6938b79de8 Disable simpleparse on python3 and pypy 2015-02-18 07:35:54 +01:00
William A. Kennington III
8b4156fb3e Merge pull request #6404 from codyopel/rtmpdump 
rtmpdump: refactor & bump commit
 2015-02-17 22:30:00 -08:00
William A. Kennington III
ad0277fbdc Merge pull request #6386 from codyopel/xvidcore 
xvidcore: refactor & 1.3.2 -> 1.3.3
 2015-02-17 22:29:40 -08:00
William A. Kennington III
f7cdbb091a Merge pull request #6417 from benley/haproxy 
haproxy: update to 1.5.11
 2015-02-17 22:28:57 -08:00
Dan Peebles
3caa6f4d7d This doesn't hurt the current darwin stdenv and doesn't affect anything else, but is needed for the upcoming pure darwin stdenv 2015-02-18 01:19:59 -05:00
Dan Peebles
7cc575c870 Fish wants libiconv too, even though it won't admit it 2015-02-18 01:14:36 -05:00
Dan Peebles
12c1c8d590 wget wants libiconv but doesn't say so 2015-02-18 00:49:37 -05:00
Dan Peebles
025f87f79a Bootstrap tools for the upcoming new darwin stdenv (not working yet in this stdenv, but will soon) 2015-02-18 00:24:34 -05:00
Dan Peebles
ecf662efc6 Flip cctools and cctools cross 2015-02-18 00:24:33 -05:00
Eric Seidel
9f84592160 Merge pull request #6250 from gridaphobe/emacs-melpa 
add package.el-based emacs package builder
 2015-02-17 20:32:28 -08:00
Eric Seidel
3cb5ee6b58 Merge pull request #6418 from gridaphobe/master 
provide explicit libiconv for the rare cases that need it, like uclibc
 2015-02-17 20:30:23 -08:00
Eric Seidel
d2a987d6e3 fix travis evaluation by providing explicit libiconv for the rare cases 
that need it, like uclibc
 2015-02-17 20:10:26 -08:00
Benjamin Staffin
2efd1a4700 haproxy: update to 1.5.11 
Change-Id: I6f5d8d62084da89c22e99df2a99b4608ba95f874
 2015-02-17 19:57:17 -08:00
Dan Peebles
3a423e4405 It doesn't appear to be necessary to force the libc++abi rpath in libc++, and removing it helps disentangle the upcoming darwin stdenv from its bootstrap tools 2015-02-17 22:39:31 -05:00
Dan Peebles
a78d164b1e Minor fixes for git on darwin (libiconv and Security dependencies) 2015-02-17 22:30:59 -05:00
Dan Peebles
a68484a0ac Minor fix for broken ruby evaluation and libiconv 2015-02-17 21:39:29 -05:00
Joel Taylor
695136db1c Temporarily fix build of x509-system on Darwin. 
Introduces a nasty impurity but what can you do :(
 2015-02-17 16:58:42 -08:00
Olav
3904d5445d Add lua package for cjson 2015-02-18 00:40:14 +00:00
Eric Seidel
76a501acdb reorganize emacs packages and add some meta info 2015-02-17 15:08:55 -08:00
Eric Seidel
07ebc363c8 emacs: add ac-haskell-process and update auto-complete 2015-02-17 13:21:13 -08:00
Eric Seidel
4676d0137b add hi2 haskell-indentation mode 2015-02-17 13:21:13 -08:00
Eric Seidel
04509a3c36 fix auto-complete 2015-02-17 13:21:13 -08:00
Eric Seidel
9a77480b0e pull package-build.el from github 2015-02-17 13:21:13 -08:00
Eric Seidel
39c647c218 add package.el-based emacs package builder 2015-02-17 13:21:12 -08:00
codyopel
25c9b84994 rtmpdump: refactor & bump commit 2015-02-17 16:15:03 -05:00
Arseniy Seroka
0e63ac0acf Merge pull request #6402 from codyopel/xavs 
xavs: add package
 2015-02-17 23:42:01 +03:00
Bjørn Forsman
9b79a35371 speedtest-cli: drop the "python2.7-" name prefix 2015-02-17 20:22:39 +01:00
Bjørn Forsman
ea6a9a2281 speedtest-cli: align attrname with pkgname 2015-02-17 20:14:10 +01:00
Shea Levy
2f061ff16b Merge remote-tracking branch 'origin/staging' 
Darwin and haskell fixes.
 2015-02-17 13:52:37 -05:00
codyopel
be0b4050aa xavs: add package 2015-02-17 13:29:48 -05:00
Brian McKenna
69e75d0bfb Add consul-template package 2015-02-17 11:19:14 -07:00
lethalman
6be3ffb0d4 Merge pull request #6394 from codyopel/libwebp 
libwebp: refactor & 0.4.1 -> 0.4.2
 2015-02-17 15:28:35 +01:00
Arseniy Seroka
c070665ca9 Merge commit 'a6b1cb8' 2015-02-17 16:55:01 +03:00
Arseniy Seroka
a6b1cb8411 vimPlugins.YCM: fix sha 2015-02-17 16:54:06 +03:00
Peter Simons
519c696bcf haskell-configuration-common.nix: fix evaluation 2015-02-17 14:35:25 +01:00
Aycan iRiCAN
60cbac103e Merge branch 'httpStreamsFix' of github.com:aycanirican/nixpkgs into httpStreamsFix 
Conflicts:
	pkgs/development/haskell-modules/configuration-common.nix
 2015-02-17 15:28:33 +02:00
Aycan iRiCAN
2d54eb7693 disable tests for haskellngPackages.http-streams since it doesn't include test modules 2015-02-17 15:26:56 +02:00
Aycan iRiCAN
c723352d77 disable tests for haskellngPackages.http-streams since it doesn't include test modules 2015-02-17 15:23:15 +02:00
Rob Vermaas
8495c101dc Fixes #6374. Now for real, dohhh. 2015-02-17 13:10:13 +00:00
Rob Vermaas
1a0e6f0039 Fixes #6374. 2015-02-17 13:07:54 +00:00
Arseniy Seroka
e13b0a8bb1 Merge pull request #6396 from codyopel/wavpack 
wavpack: add package
 2015-02-17 16:05:21 +03:00
Peter Simons
ad01e9dfbb haskell-language-lua fails its test suite. 2015-02-17 13:51:19 +01:00
Peter Simons
3f2513ddbc haskell-vcache: doesn't compile because of broken dependencies 2015-02-17 13:51:19 +01:00
Peter Simons
29e3bc30b3 haskell-digestive-foundation-lucid does not compile. 2015-02-17 13:51:19 +01:00
Damien Cassou
453c26abe7 Merge pull request #6397 from DamienCassou/simpleparse 
Add the simpleparse python package
 2015-02-17 13:43:38 +01:00
Damien Cassou
a45acf1b29 Add the simpleparse python package 2015-02-17 13:42:31 +01:00
codyopel
1435e69758 wavpack: add package 2015-02-17 07:29:04 -05:00
lethalman
00ebcd0c36 Merge pull request #6387 from nathanielbaxter/dev/cdrtools 
cdrtools: Update to 3.00
 2015-02-17 13:12:39 +01:00
Edward Tjörnhammar
47203a86bf unison: sha correction 2015-02-17 12:35:29 +01:00
Edward Tjörnhammar
17e6dd2da3 ideas: refactoring, remove snappyPatch as all derivative products are based on the 14 series 2015-02-17 12:27:08 +01:00
Nathaniel Baxter
0d1a707784 cdrtools: Add unfree license 2015-02-17 22:23:10 +11:00
lethalman
e24004fea9 Merge pull request #6377 from ehmry/mawk 
mawk: initial package at 1.3.4-20141206
 2015-02-17 12:06:21 +01:00
codyopel
67f82fe49c libwebp: refactor & 0.4.1 -> 0.4.2 2015-02-17 06:05:40 -05:00
Peter Simons
0145793b92 hackage-packages.nix: re-generate from Hackage 2015-02-17T11:57:38+0100 2015-02-17 11:57:38 +01:00
Domen Kožar
3dbde25855 Merge pull request #6381 from olavks/numpyfix 
Numpy: remove slow building and little used math library for more commonly used openblas
 2015-02-17 11:13:58 +01:00
Damien Cassou
8be35e6efe Merge pull request #6391 from DamienCassou/update-pylint-astroid 
update pylint, astroid, six, and logilab-common
 2015-02-17 11:08:37 +01:00
vbgl
82312e3b7b Merge pull request #6388 from nathanielbaxter/dev/gecode 
gecode: update from 4.3.0 to 4.3.3
 2015-02-17 11:05:53 +01:00
Damien Cassou
c9b4cb56ae update pylint, astroid, six, and logilab-common 
pylint 1.4.0 -> 1.4.1
astroid 1.3.2 -> 1.3.4
six 1.8.0 -> 1.9.0
logilab-common 0.61.0 -> 0.63.2
 2015-02-17 11:02:31 +01:00
Marco
5f6e6b1661 Update HOL Light to r218 2015-02-17 10:23:51 +01:00
Nathaniel Baxter
b19da5ba23 gecode: update from 4.3.0 to 4.3.3 2015-02-17 18:50:48 +11:00
Joel Taylor
4b6d83199a Fix temp directory paths for GHC 7.0.4 on Darwin 
This is a remnant of https://github.com/NixOS/nixpkgs/pull/6268
 2015-02-16 23:42:59 -08:00
codyopel
1b26e25845 xvidcore: refactor & 1.3.2 -> 1.3.3 2015-02-17 02:01:10 -05:00
Nathaniel Baxter
2366453d2f cdrtools: Update to 3.00 2015-02-17 18:00:53 +11:00
William A. Kennington III
aeb0db3def Merge pull request #6383 from codyopel/vid-stab 
vid-stab: add package
 2015-02-16 21:59:16 -08:00
codyopel
534332eaf7 vid-stab: add package 2015-02-17 00:54:23 -05:00
Marcell Vazquez-Chanlatte
7ad16801b0 moreItertools package had typo 2015-02-16 23:41:22 -06:00
William A. Kennington III
7dda2b30dd Merge pull request #6373 from mvcisback/moreItertools 
Added more-itertools-2.2 python package
 2015-02-16 20:47:53 -08:00
Tobias Geerinckx-Rice
a8ddd89f82 all-packages: move my first packages to correct ### SECTIONs 2015-02-17 05:33:40 +01:00
Tobias Geerinckx-Rice
607cc808d8 coan: run checks 2015-02-17 05:13:40 +01:00
Olav
380bd3f48a Numpy: Replace ATLAS and liblapack with openblas (that has blas and lapack). 
Was previously with ATLAS [Automatically Tuned Linear Algebra Software].
This takes ages and has little to no performance benefit over openblas+lapack.
And if you need this performance, you should really built it against your own hardware.
 2015-02-17 03:59:27 +00:00
Marcell Vazquez-Chanlatte
5e328ef690 fix indentation 2015-02-16 21:30:21 -06:00
William A. Kennington III
a52343ffe1 Merge pull request #6379 from benley/update-rbtools 
rbtools: update to 0.7.1
 2015-02-16 19:02:21 -08:00
William A. Kennington III
d847059c55 Merge pull request #6380 from codyopel/docker-fix 
docker: fix shebangs, closes #6368
 2015-02-16 19:01:27 -08:00
codyopel
6d3fee045a docker: fix shebangs, closes #6368 2015-02-16 21:41:46 -05:00
Benjamin Staffin
fbeae50296 rbtools: update to 0.7.1 
Change-Id: Ib41400507447564375a2ec61467b2ceb148e663c
 2015-02-16 16:41:31 -08:00
Lengyel Balázs
c42bcab582 Update: usb-mdeswitch 2.2.0 -> 2.2.1 2015-02-17 01:33:28 +01:00
Emery Hemingway
71ad263151 mawk: initial package at 1.3.4-20141206 2015-02-16 18:57:57 -05:00
Antoine R. Dumont
172d78923b Add microscheme derivation 
(A Scheme subset for Atmel microcontrollers.)

Use of the actual git HEAD because the actual tarball compiles but
segfault at runtime.

Upload the BLINK.ms sample on arduino board (/dev/ttyACM0):

```sh
$ sudo ./result/bin/microscheme -m UNO -d /dev/ttyACM0 -auc ~/repo/perso/microscheme/examples/BLINK.ms
Microscheme 0.8, (C) Ryan Suchocki
>> Treeshaker: After 4 rounds: 84 globals purged! 22 bytes will be
reserved.
>> 18 lines compiled OK
>> Assembling...
>> Uploading...

avrdude: AVR device initialized and ready to accept instructions

Reading | ################################################## | 100%
0.00s

avrdude: Device signature = 0x1e950f
avrdude: reading input file
"/home/tony/repo/perso/microscheme/examples/BLINK.hex"
avrdude: writing flash (2080 bytes):

Writing | ################################################## | 100%
0.35s

avrdude: 2080 bytes of flash written

avrdude: safemode: Fuses OK (E:00, H:00, L:00)

avrdude done.  Thank you.

>> Cleaning Up...
>> Finished.
```
 2015-02-16 23:09:48 +01:00
Antoine R. Dumont
9b81fa284f Fix avr-gcc url 
New releases have been made and the current one is now an old one.
 2015-02-16 23:08:05 +01:00
James Cook
602860e259 Merge pull request #6352 from falsifian/sox_CVE-2014-8145 
sox: Patches for CVE-2014-8145
 2015-02-16 13:39:11 -08:00
James Cook
6daf9aa922 Merge pull request #5995 from ts468/qemu-vm 
Update QEMU Nixos Virtual Machine
 2015-02-16 13:13:26 -08:00
Aristid Breitkreuz
6aa43976a7 update http-types 2015-02-16 21:06:29 +01:00
Marcell Vazquez-Chanlatte
3c06b41c26 Added more-itertools-2.2 python package 2015-02-16 13:57:44 -06:00
Thomas Strobel
eb97dc0013 Add kernel config for dom0 of Xen 2015-02-16 20:52:06 +01:00
Thomas Strobel
80afabd5b5 Update QEMU Nixos Virtual Machine 
The Nixos Qemu VM that are used for VM tests can now start without
boot menu even when using a bootloader.
The Nixos Qemu VM with bootloader can emulate a EFI boot now.
 2015-02-16 20:07:42 +01:00
vbgl
0c4ac4b936 Merge pull request #6349 from gfxmonk/ounit2 
Update OUnit to version 2.0.0
 2015-02-16 15:15:04 +01:00
Luca Bruno
915075ca0e Revert "nfs-utils: update from 1.2.5 to 1.3.1" 
This reverts commit bde3fe2335.
 2015-02-16 13:59:34 +01:00
Luca Bruno
8b666652a5 Revert "nfs-utils: Build and update for 1.3.2" 
This reverts commit a4ef29c499.
 2015-02-16 13:59:34 +01:00
Vincent Laporte
9128cf6944 ocaml-lwt: update from 2.4.5 to 2.4.6 2015-02-16 13:31:13 +01:00
Vincent Laporte
c3380ce3b0 smplayer: update from 14.9.0 to 14.9.0.6690 2015-02-16 13:31:13 +01:00
Vincent Laporte
f31d4b6adb Adds ocaml-top 
OCaml-Top is a simple cross-platform OCaml code editor built for
top-level evaluation.

Homepage: http://www.typerex.org/ocaml-top.html
 2015-02-16 13:31:13 +01:00
lethalman
9c8a89e9f4 Merge pull request #6365 from DamienCassou/umlet-13.2 
Umlet 13.1 -> 13.2
 2015-02-16 13:20:37 +01:00
Damien Cassou
d69c9bb42d Umlet 13.1 -> 13.2 2015-02-16 13:01:03 +01:00
Pascal Wittmann
9dc36774b3 nzbget: update from 14.1 to 14.2 2015-02-16 12:37:12 +01:00
Domen Kožar
5a0208d117 Merge pull request #6360 from nckx/add-vim-wakatime 
vim-plugins: add wakatime
 2015-02-16 11:54:07 +01:00
Eelco Dolstra
fb72208bcf nvidia-x11: Update to 340.76 2015-02-16 11:49:17 +01:00
Peter Simons
85e2076a0b haskell-amazonka-ecs: fix build with ghc 7.8.x 2015-02-16 10:43:36 +01:00
Peter Simons
92934f386e haskell-hypher does not compile with GHC 7.8.x due to mtl 2.2.x requirement. 2015-02-16 10:42:11 +01:00
Peter Simons
ce7b7c51e3 haskell-scotty-binding-play: test suite requires network access 2015-02-16 10:12:33 +01:00
Peter Simons
8e4a473fd7 haskell-amazonka-glacier: fix build with GHC 7.8.x 2015-02-16 10:10:06 +01:00
Peter Simons
d2322bca84 haskell-lucid-foundation does not compile. 2015-02-16 10:06:13 +01:00
Peter Simons
98476e9c51 haskell-mp does not compile. 2015-02-16 10:04:33 +01:00
Peter Simons
b548adf58d haskell-hwsl2 does not compile. 2015-02-16 10:01:17 +01:00
Peter Simons
6ba8720a56 haskell-configuration-tools: the Cabal issue has been fixed, but the library still depends on mtl 2.2.x 2015-02-16 10:00:49 +01:00
Peter Simons
a2a87c9126 hackage-packages.nix: re-generate from Hackage 2015-02-16T09:28:28+0100 2015-02-16 09:28:28 +01:00
William A. Kennington III
50bcf4583f zfs_git: Update 2015-02-15 23:59:27 -08:00
Marcell Vazquez-Chanlatte
5c62f143c1 Added python package funcy-1.4 2015-02-16 00:50:50 -06:00
William A. Kennington III
c295e51728 Merge pull request #6362 from mvcisback/parsimonious 
Add python package parsimonoius 0.6.0
 2015-02-15 22:47:17 -08:00
Marcell Vazquez-Chanlatte
dbcbe712dd Add python package parsimonoius 0.6.0 2015-02-16 00:41:30 -06:00
William A. Kennington III
bc11e1aee8 Merge pull request #6359 from codyopel/qbit 
qbittorrent: add gui & webui optionals
 2015-02-15 19:10:18 -08:00
William A. Kennington III
f2e464c89b iproute: 3.18.0 -> 3.19.0 2015-02-15 19:07:34 -08:00
Tobias Geerinckx-Rice
3049ef6769 vim-plugins: add wakatime 2015-02-16 02:20:11 +01:00
codyopel
e9c0bdb93e qbittorrent: add gui & webui optionals 2015-02-15 17:43:39 -05:00
Tobias Geerinckx-Rice
dff06cdd43 freefall 3.18.3 -> 3.19 2015-02-15 23:35:56 +01:00
Peter Simons
04c21a89a6 haskell-mtl-compat: fix build with GHC 7.8.x 2015-02-15 22:42:10 +01:00
Tobias Geerinckx-Rice
4b87505e32 stress-ng 0.03.15 -> 0.03.16 2015-02-15 22:38:32 +01:00
Peter Simons
e46030f144 structured-haskell-mode supports recent versions of haskell-src-exts now. 2015-02-15 22:35:28 +01:00
Peter Simons
cd27ebeb58 haskell-lowgl does not compile. 2015-02-15 22:35:28 +01:00
Peter Simons
a9f09f619b haskell-configuration-tools does not compile. 2015-02-15 22:35:28 +01:00
Peter Simons
5ab272bf1e Haskell packages wiring, ihaskell-parsec, and simple-conduit don't compile 2015-02-15 22:35:28 +01:00
Peter Simons
dccb2921ff haskell-test-sandbox cannot be built by GHC 7.8.x. 2015-02-15 22:35:28 +01:00
Peter Simons
2a8c78322c haskell-temporal-csound is broken. haskell-heroku can't compile its test suite. 2015-02-15 22:35:28 +01:00
Peter Simons
ccf7442be4 haskell-paypal-adaptive-hoops: don't try to run the network-related part of the test suite in our chroot environment 
Resolves https://github.com/NixOS/nixpkgs/issues/6350.
 2015-02-15 22:35:28 +01:00