JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
64,024 Commits 2 Branches 0 Tags 13 GiB
f12a466730
Commit Graph

1440 Commits

Author SHA1 Message Date
Mateusz Kowalczyk
ddcb9db54f youtube-dl: update to 2014.12.06.1 
Also add self to maintainers considering I bump it pretty often already.
 2014-12-10 09:15:59 +00:00
Domen Kožar
4aa3eec330 Merge branch 'master' into staging 
Conflicts:
	pkgs/development/libraries/fontconfig/default.nix
 2014-12-07 14:02:48 +01:00
Bjørn Forsman
32da2ba923 plantuml: update from 7991 to 8012 2014-12-06 16:13:15 +01:00
Pascal Wittmann
47eabfabe2 Merge pull request #5239 from robberer/pkgs/mrtg 
mrtg: add 2.17.4
 2014-12-06 10:58:53 +01:00
Longrin Wischnewski
cf4318ad4e mrtg: add 2.17.4 
- The Multi Router Traffic Grapher
- You have a router, you want to know what it does all day long?
- Then MRTG is for you. It will monitor SNMP network devices and draw
- pretty pictures showing how much traffic has passed through each interface.
 2014-12-06 09:05:29 +01:00
Rok Garbas
24848992bc goaccess: update to 0.8.5 2014-12-05 11:30:25 +01:00
Emery Hemingway
3faacca044 nixpkgs: iPXE initial package 2014-12-04 11:03:56 +01:00
lethalman
9bce8d2ef2 Merge pull request #5190 from deepfire/debootstrap-version-fix 
debootstrap | 404-fix:  -> 1.0.64, since 1.0.63 disappeared from archive
 2014-12-02 10:59:14 +01:00
Kosyrev Serge
ae72e5ba8f debootstrap | 404-fix: -> 1.0.64, since 1.0.63 disappeared from archive 2014-11-30 16:51:42 +03:00
Arseniy Seroka
5b8fb2239c Merge pull request #5188 from DamienCassou/umlet 
New package for Umlet 13.1
 2014-11-30 15:30:03 +03:00
Damien Cassou
dcc2f1ac38 New package for Umlet 13.1 2014-11-30 12:56:08 +01:00
Jaka Hudoklin
31ebe4d89d Merge pull request #5181 from grwlf/plowshare 
plowshare: version bump
 2014-11-29 21:57:05 +01:00
Sergey Mironov
2e95f697fb plowshare: version bump 
fixes games/adom downloader
 2014-11-29 23:39:33 +03:00
Patrick Mahoney
cf5f282940 Consolidate conf-compile steps for skarnet.org pkgs. 2014-11-28 13:10:37 -06:00
Vladimír Čunát
cbd2305d4d Merge branch 'master' into staging 2014-11-28 18:59:07 +01:00
Mateusz Kowalczyk
456312a5fc youtube-dl: update to 2014.11.27 2014-11-28 02:31:01 +00:00
Oliver Charles
1132484200 opentsdb: Use fetchurl to fetch all dependencies 2014-11-27 12:06:01 +00:00
William A. Kennington III
021efdf021 yubico-piv-tool: 0.1.0 -> 0.1.2 2014-11-26 15:50:15 -08:00
William A. Kennington III
e1988740a5 yubikey-personalization: 1.16.0 -> 1.16.1 2014-11-26 15:47:43 -08:00
Vladimír Čunát
bdc323c540 opentsdb: mark as broken 
It tries to download things and fails. CC @ocharles.
 2014-11-27 00:45:47 +01:00
muflax
dc9f084278 parcellite: 1.1.7 -> 1.1.9 2014-11-26 21:23:17 +00:00
Vladimír Čunát
b5ff06eda4 Merge branch 'master' into staging 2014-11-26 21:48:26 +01:00
Pascal Wittmann
10c9196c0f parallel: update from 20141022 to 20141122 2014-11-25 18:18:05 +01:00
Pascal Wittmann
880f6a517e bmon: update from 3.5 to 3.6 2014-11-25 18:18:05 +01:00
Vladimír Čunát
a9bad25ffe Merge branch 'master' into staging 2014-11-24 22:14:25 +01:00
Oliver Charles
9cab0e1b8a Add meta information to hbase, bosun, scollector, opentsdb 2014-11-24 14:40:48 +00:00
Oliver Charles
751a2943f4 opentsdb: Upgrade to 2.1.0-RC1 2014-11-24 14:40:47 +00:00
Oliver Charles
764cca613d opentsdb: New package and NixOS module 2014-11-24 14:40:47 +00:00
Mateusz Kowalczyk
8570046e5c rlwrap: update from 0.41 to 0.42 2014-11-20 13:28:43 +00:00
Pascal Wittmann
dfc3140b3d Merge pull request #5031 from AndersonTorres/youtubeDL 
Youtube-DL: update to 2014.11.16
 2014-11-18 14:47:21 +01:00
AndersonTorres
a24225da61 Youtube-DL: update to 2014.11.16 2014-11-18 11:31:55 -02:00
Longrin Wischnewski
73aef348bb hdf5: move to a more stable URL 2014-11-18 11:14:17 +01:00
Eelco Dolstra
a0f3faf34e Merge remote-tracking branch 'origin/glibc-2.20' into staging 2014-11-16 22:17:36 +01:00
Lengyel Balázs
79fc5bde48 updated hdf5 to version HDF5-1.8.14 2014-11-16 09:27:32 +01:00
Evgeny Egorochkin
7e2f54ae44 youtube-dl: update from 2014.11.12 to 2014.11.13.3 2014-11-15 22:20:16 +02:00
Pascal Wittmann
58ad907b49 abduco: update from 0.1 to 0.2 2014-11-15 16:21:56 +01:00
Pascal Wittmann
dd37edd2d8 dvtm: update from 0.12 to 0.13 2014-11-15 16:21:56 +01:00
Domen Kožar
62dd6c1d72 pastebinit: fix build 2014-11-15 10:57:51 +01:00
Vladimír Čunát
b4af993c3f Merge branch 'master' into staging 
Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh
 2014-11-14 14:28:23 +01:00
Pascal Wittmann
f6b8460aa4 youtube-dl: update from 2014.11.04 to 2014.11.12 2014-11-12 16:11:07 +01:00
Eelco Dolstra
f33fa1b66b Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/boost/generic.nix
 2014-11-11 23:48:08 +01:00
Pascal Wittmann
ea49ac0496 flashrom: fix 4936 2014-11-11 21:53:37 +01:00
Pascal Wittmann
8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Luca Bruno
6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Pascal Wittmann
fa9af37751 kermit: update from 8.0.211 to 9.0.302 2014-11-09 17:26:37 +01:00
Luca Bruno
83221f3886 Merge branch 'master' into staging 
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
 2014-11-08 15:56:40 +01:00
宋文武
33d1a9a3cf ostree: new package 2014-11-07 13:30:04 +08:00
Eelco Dolstra
0518ccf5af Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/stdenv/generic/default.nix
 2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk
007f80c1d0 Turn more licenses into lib.licenses style 
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
 2014-11-06 00:48:16 +00:00
Vladimír Čunát
52404a868d Merge recent master into staging 
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
 2014-11-05 15:00:44 +01:00
AndersonTorres
56e9b2c953 Youtube-dl: upgrade to 2014.11.04 2014-11-05 06:01:24 -02:00
Eelco Dolstra
7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging 
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
 2014-11-04 14:30:43 +01:00
Vladimír Čunát
ed867a50eb iconv: remove usage on Linux in several packages 
This fixes builds after #4419. Thanks to @vbgl for the original commit;
I changed that as I'm not sure whether passing null values to buildInputs is clean.

CC maintainers: @coroa, @peti, @phreedom, @robberer, @jcumming.
 2014-11-03 12:58:54 +01:00
Evgeny Egorochkin
3a03bf5700 youtube-dl: update from 2014.10.30 to 2014.11.02.1 2014-11-03 13:18:20 +02:00
Michael Raskin
4ef5bd9918 Update Pipelight: both Wine version and Pipelight distribution 2014-11-02 23:51:58 +03:00
Peter Simons
a9c53037fa Merge remote-tracking branch 'origin/master' into staging. 2014-11-02 16:15:53 +01:00
Evgeny Egorochkin
767814e585 youtube-dl: update from 2014.10.25 to 2014.10.30 2014-11-01 14:52:11 +02:00
Peter Simons
b11060d8db Merge remote-tracking branch 'origin/master' into staging. 2014-10-31 11:14:24 +01:00
Eelco Dolstra
1acfbca7df grub2: Fix building against Glibc 2.20 
http://hydra.nixos.org/build/16563301
 2014-10-30 09:28:10 +01:00
William A. Kennington III
fa6275857e yubico-piv-tool: Add derivation 2014-10-29 02:05:17 -07:00
Pascal Wittmann
e7bfcdac05 parallel: update from 20140922 to 20141022 2014-10-28 15:51:47 +01:00
Evgeny Egorochkin
7eb9b172bb youtube-dl: update from 2014.10.13 to 2014.10.25 2014-10-27 07:35:13 +02:00
Anders Papitto
0d11520727 add rcm, Management Suite for Dotfiles 2014-10-26 00:17:26 +02:00
Evgeny Egorochkin
8977addc3a youtubeDL: update from 2014.09.19 to 2014.10.13 2014-10-25 20:31:54 +03:00
William A. Kennington III
ce590c3fc7 yubikey-personalization-gui: Add derivation 2014-10-24 16:37:37 -07:00
William A. Kennington III
2910183d5e yubikey-personalization: Add derivation 2014-10-24 16:37:37 -07:00
Eelco Dolstra
f4be4f5e54 Merge remote-tracking branch 'origin/master' into staging 2014-10-24 12:24:13 +02:00
Vladimír Čunát
2cf17b0802 Merge recent master into staging 
Hydra nixpkgs: ?compare=1156478
 2014-10-23 17:40:41 +02:00
Mateusz Kowalczyk
adb034f299 Merge pull request #4522 from ts468/trustedGrub 
Add package: trustedGrub
 2014-10-23 11:47:05 +01:00
Valérian Galliat
1f4456fb5a Add youtube-dl license 2014-10-22 20:35:42 +02:00
aszlig
78ef5f9c14
nixpart: Move all 0.4 dependencies into one dir. 
Once nixpart 1.0 is released we then only need to delete one single
directory rather than searching for needles in a haystack, that is, all
of <nixpkgs>. Also, it keeps my sanity at an almost healthy level.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-10-22 08:22:59 +02:00
aszlig
7676ff5973
nixpart: Bring back requirements for version 0.4. 
Quite a mess but at least the mdraid tests succeed now. However, the
lvm2 tests are still failing, so we need to bring back a few more old
crap :-(

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-10-22 08:22:58 +02:00
aszlig
34ae3b7f77
parted: Update to new upstream version 3.2. 
In order to properly run tests, we need to fix the unicode tests and
after some search, I have found that Ludo (who is also the <nixpkgs>
maintainer of parted) already reported this upstream and also provided a
solution:

http://lists.gnu.org/archive/html/bug-parted/2014-08/msg00003.html

I'm updating parted to 3.2, because the latest blivet implementation
relies on it for device geometry calculations.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-10-22 01:54:47 +02:00
Michael Raskin
6b727e8d68 Merge pull request #4596 from abbradar/rpmextract 
Add "rpmextract" script and use it
 2014-10-20 22:00:59 +04:00
Nikolay Amiantov
307af9148b use rpmextract in some packages 2014-10-20 03:16:59 +04:00
Michael Raskin
a95a5ef29f Fix override for patched Wine in pipelight 2014-10-18 19:52:59 +04:00
koral
43292d1ebf Removed useless terminfo wrapping. 
Users should manually set the TERMINFO environment variable.
 2014-10-18 16:04:34 +02:00
Michael Raskin
6909944827 Remove failing steps from pipelight build 2014-10-18 00:14:51 +04:00
Michael Raskin
eee6f5a004 Adding Pipelight via patch from Sven Keidel and some cleanup 2014-10-18 00:14:51 +04:00
Eelco Dolstra
09dc132e04 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/poppler/default.nix
 2014-10-16 15:16:50 +02:00
Thomas Strobel
596c9f54dc Add trustedGrub package. 2014-10-14 16:02:48 +02:00
Jaka Hudoklin
dd0758ab6b Merge pull request #4392 from cstrahan/logstash 
logstash service improvements
 2014-10-12 23:02:52 +02:00
Peter Simons
1658c545d4 Merge pull request #4502 from grwlf/screen-256color 
screen: enable 256 colors
 2014-10-12 21:45:58 +02:00
Sergey Mironov
efcb363ea9 screen: enable 256 colors 2014-10-12 20:47:47 +04:00
Longrin Wischnewski
6e7de2155b change md5sum to sha256sum for a few packages 2014-10-12 16:13:21 +02:00
Domen Kožar
482779e582 python: get rid of ssl module as it's always builtin 2014-10-11 20:23:51 +02:00
Domen Kožar
576a5605b8 ised: get rid of builderDefsPackage 2014-10-11 18:28:29 +02:00
Eelco Dolstra
811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv 
Conflicts:
	pkgs/tools/security/gnupg/default.nix
 2014-10-09 10:57:57 +02:00
Aristid Breitkreuz
d647adf85a less: update from 468 to 470 2014-10-08 20:23:27 +02:00
Aristid Breitkreuz
f995cd6bcb units: update from 2.10 to 2.11 2014-10-08 20:23:25 +02:00
Aristid Breitkreuz
2989968178 colord: update from 1.1.7 to 1.2.3 2014-10-08 20:23:24 +02:00
Francesco Lazzarino
585325dc14 New: gnu datamash 2014-10-07 19:41:31 -05:00
Eelco Dolstra
a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/libav/default.nix
	pkgs/shells/bash/bash-4.2-patches.nix
	pkgs/stdenv/generic/default.nix
 2014-10-07 00:09:37 +02:00
Aristid Breitkreuz
0957166f56 ethtool: update from 3.15 to 3.16 2014-10-06 22:41:21 +02:00
Aristid Breitkreuz
a24a4f7d76 byobu: update from 5.68 to 5.87 2014-10-06 22:06:26 +02:00
Eelco Dolstra
7456ae4f5c coreutils: Update to 8.23 2014-10-06 20:40:11 +02:00
Thomas Tuegel
95b12bf0be kde-gtk-config: handle symlinked themes 2014-10-06 08:33:26 -05:00
Charles Strahan
fc7098abf7 logstash service improvements 
* add logstash-contrib plugins package
* add additional options to the logstash service
 2014-10-05 21:53:05 -04:00
Michael Raskin
02c89b52d9 Update Remind 2014-10-04 16:40:09 +04:00
koral
d815b900f4 tmux: wrapped program to set TERMINFO variable 
Closes #4335
 2014-10-01 02:09:06 +01:00
Kosyrev Serge
3a95f9cafc debootstrap | 404-fix: 1.0.60 is gone from debian mirrors, update to 
1.0.63

Closes #4321
 2014-09-30 07:57:55 +01:00
koral
14930900c8 New package: tty-clock-0.1 2014-09-28 13:05:58 +02:00
Pascal Wittmann
d346a9cc07 fixed some meta.maintainers attributes 2014-09-26 23:44:29 +02:00
Pascal Wittmann
319125bef3 parallel: update from 20140822 to 20140922 and adopt it 2014-09-25 18:17:54 +02:00
Peter Simons
574c2dd3a0 Merge pull request #4226 from ts468/snapper 
Add package: snapper
 2014-09-23 19:19:07 +02:00
Eelco Dolstra
6d773d92ed less: Update to 468 2014-09-23 11:51:46 +02:00
Thomas Strobel
1cd703f3a9 Add package: snapper 
Snapper is a tool for Linux filesystem snapshot management, developed for OpenSuSE.
 2014-09-23 11:46:56 +02:00
Eelco Dolstra
cd71f7a2e6 Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging 
Conflicts:
	pkgs/development/interpreters/ruby/ruby-19.nix
	pkgs/development/libraries/libc++/default.nix
	pkgs/development/libraries/libc++abi/default.nix
	pkgs/tools/text/sgml/opensp/default.nix
 2014-09-23 11:27:53 +02:00
Mateusz Kowalczyk
bffbed3343 Merge pull request #4203 from k0ral/binwalk 
Added binwalk package, and its dependency pyqtgraph.
 2014-09-23 05:53:51 +01:00
koral
ec1712a601 Added runtime dependencies for binwalk. 2014-09-22 20:37:39 +02:00
Mateusz Kowalczyk
cd5f4e7f85 Merge pull request #4211 from ehmry/cpuminer-cryptonight 
Cpuminer cryptonight
 2014-09-22 19:26:35 +01:00
Emery Hemingway
be73d6c2f6 cpuminer-multi: update 20140619 to 20140723 2014-09-22 12:28:19 -04:00
koral
47c2b205ae Added binwalk package, and its dependency pyqtgraph. 2014-09-22 12:44:41 +02:00
Pascal Wittmann
363b6da6a7 bmon: update from 3.1 to 3.5 and added myself as maintainer 2014-09-22 00:06:29 +02:00
Ian Grant Jeffries
db23eace0d Add escoger, a terminal fuzzy selector. 
default.nix was generated with cabal2nix, but modified to use GitHub as
the source since escoger isn't on Hackage.

Closes #4194
 2014-09-21 20:09:11 +01:00
Mateusz Kowalczyk
2c76c1a1f2 rlwrap: update from 0.37 to 0.41 2014-09-21 19:11:37 +01:00
koral
52958ad4e1 Upgraded grc to v1.5 2014-09-20 23:15:45 +01:00
koral
7e34168f3b Upgraded youtube-dl to v2014.09.19 2014-09-20 01:58:27 +02:00
Domen Kožar
0fe76c441a ngrok: enable ngrokd 2014-09-16 10:19:50 +02:00
Charles Strahan
ecfe8ba48c fix empty sha256's 2014-09-16 10:19:50 +02:00
Charles Strahan
3594a6104f update ngrok to 1.7 2014-09-16 10:19:50 +02:00
William A. Kennington III
abc21d9464 mstflint: Add derivation 2014-09-14 19:00:25 -07:00
Pascal Wittmann
8d67b9a240 transformed meta.maintainers of some packages into lists 2014-09-13 13:52:02 +02:00
Rob Vermaas
fc12b15cf3 pv: update from 1.5.3 to 1.5.7 2014-09-11 13:33:59 +02:00
Joel Taylor
6f949b2e87 get rid of nasty CC stuff 2014-09-09 13:54:26 -07:00
Joel Taylor
3e8344d334 suitable clang stdenv 2014-09-09 13:54:24 -07:00
Nixpkgs Monitor
2415c6cbb2 memtest86: update from 4.3.3 to 4.3.6 2014-09-06 18:17:14 +02:00
Moritz Ulrich
8c2384a7cf gparted: update from 0.18.0 to 0.19.1 2014-09-04 19:31:33 +02:00
Moritz Ulrich
f2779233db ethtool: update from 3.14 to 3.15 2014-09-04 19:31:33 +02:00
Michael Raskin
113037967d Merge pull request #3931 from CodeBlock/screenfetch-bump 
[screenfetch] Bump to the stable release
 2014-09-03 21:55:55 +04:00
Michael Raskin
b37af08c3d Update mdbtools-git to latest 2014-09-03 21:54:25 +04:00
William A. Kennington III
88d270f62e grub2: Add localizations 2014-09-03 01:06:07 -07:00
William A. Kennington III
c369c4afbd grub2: Fix zfs support 2014-09-02 19:38:52 -07:00
William A. Kennington III
36614ff3e2 Revert "Revert "Merge pull request #2449 from wkennington/master.grub"" 
This reverts commit 94205f5f21.

Conflicts:
	nixos/modules/system/boot/loader/grub/install-grub.pl
 2014-09-02 09:16:13 -07:00
Michael Raskin
10b4bc3c43 Update XDaliClock 2014-09-02 14:25:17 +04:00
Michael Raskin
6d7c2c7858 Update ised 2014-09-02 14:25:16 +04:00
Ricky Elrod
aaa7e89a93 [screenfetch] Bump to the stable release 
Signed-off-by: Ricky Elrod <ricky@elrod.me>
 2014-09-02 02:51:24 -04:00
Michael Raskin
d33a20ef4a Merge pull request #3869 from pmahoney/skarnet 
skarnet.org UNIX utilities
 2014-09-02 02:15:22 +04:00
Domen Kožar
f70acd2584 munin: fix test 2014-08-31 16:54:09 +02:00
Michael Raskin
94205f5f21 Revert "Merge pull request #2449 from wkennington/master.grub" 
This reverts commit 469f22d717, reversing
changes made to 0078bc5d8f.

Conflicts:
	nixos/modules/installer/tools/nixos-generate-config.pl
	nixos/modules/system/boot/loader/grub/install-grub.pl
	nixos/release.nix
	nixos/tests/installer.nix

I tried to keep apparently-safe code in conflicts.
 2014-08-31 12:58:37 +04:00
Patrick Mahoney
a4b794bb73 s6-portable-utils: new package 
s6-portable-utils is a set of tiny general Unix utilities, often
performing well-known tasks such as cut and grep, but optimized for
simplicity and small size.
 2014-08-30 00:05:23 -05:00
Mateusz Kowalczyk
b4b3bd1bd7 cloc: update to 1.62 2014-08-29 12:21:52 +01:00
Michael Raskin
fdfaa7bac4 Merge pull request #3826 from ruediger/up/parallel 
parallel: Update to 20140822.
 2014-08-29 01:26:26 +04:00
Michael Raskin
469f22d717 Merge pull request #2449 from wkennington/master.grub 
Grub Update
 2014-08-29 01:22:47 +04:00
Michael Raskin
0078bc5d8f Merge pull request #3316 from aherrmann/pr_mpi 
MPI support for HDF5 and SGE support for OpenMPI
 2014-08-29 01:22:02 +04:00
Michael Raskin
121050046d Adding flashrom BIOS update utility. Patch by Edward O'Callaghan 2014-08-29 01:27:28 +04:00
William A. Kennington III
0fdbc44411 grub: Fix typo 2014-08-28 13:36:41 -07:00
William A. Kennington III
dd18e67cfb grub: Cleanup efi support 2014-08-28 13:35:37 -07:00
William A. Kennington III
2ea1433b77 grub: Fetch from alpha.gnu.org instead of git 2014-08-28 13:35:36 -07:00
William A. Kennington III
1f460e00ef grub: Build grub2 from git instead of using the unpredictable generated tarball 2014-08-28 13:35:35 -07:00
William A. Kennington III
f2bef62716 Update grub 2.00 to 2.02-beta2 2014-08-28 13:35:34 -07:00
Rüdiger Sonderfeld
d5ea3b1e44 parallel: Update to 20140822. 
https://savannah.gnu.org/forum/forum.php?forum_id=8067
 2014-08-28 13:02:37 +02:00
Emery Hemingway
ea7c412368 cpuminer-multi: initial expression 2014-08-27 12:47:36 +02:00
Domen Kožar
8b98d7dc08 logstash_forwarder: specify platforms 2014-08-25 14:55:14 +02:00
William Roe
963b97088f Logstash-forwarder requires Go-1.1/1.2 
The SSL stuff in it doesn't work right with Go 1.3 yet.
1.2 doesn't have a derivation for darwin, so go 1.1 should work for
everyone
 2014-08-25 14:55:14 +02:00
Bjørn Forsman
c9baba9212 Fix many package descriptions 
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
 2014-08-24 22:31:37 +02:00
Michael Raskin
bd9e07c24c Merge pull request #3352 from luke-clifton/master 
Added abduco
 2014-08-23 12:40:44 +04:00
Patrick Mahoney
d8d7cd7ef2 execline: new package 
Execline is a small scripting language, to be used in place of a shell
in non-interactive scripts.
 2014-08-22 23:40:52 -05:00
Peter Simons
17d3aee3eb Merge pull request #3693 from ruediger/add/colord-kde 
Add colord-kde.
 2014-08-20 19:59:15 +02:00
Rickard Nilsson
5c9157b329 riemann-c-client: Update from 1.2.0 to 1.2.1 2014-08-20 16:04:10 +02:00
Peter Simons
f8da7d5d18 Merge pull request #3684 from bodil/master 
Update to ponysay version 3.0.2.
 2014-08-20 12:41:27 +02:00
Rüdiger Sonderfeld
fd5084bc8f Add colord-kde. 
A KDE front-end for colord.
 2014-08-20 01:54:45 +02:00
Rüdiger Sonderfeld
0741150b97 colord: Update to 1.1.7 and copy bash completions. 2014-08-20 01:53:46 +02:00
Bodil Stokke
c38a27df77 Update to ponysay version 3.0.2. 2014-08-19 19:43:48 +01:00
Rüdiger Sonderfeld
775b4a39e6 tmux: Install bash completion script. 2014-08-19 17:03:49 +02:00
Sergey Mironov
37d5b54f59 plowshare: version bump 
From #3301.
 2014-08-15 00:25:45 +02:00
Vladimír Čunát
ae7153b9b0 sl: fix license (close #3072) 
From https://github.com/fistonbettens/nixpkgs/commit/7b6591b551afc6a17b
but it failed to apply for me, so I hand-added and corrected the change.
 2014-08-14 21:28:33 +02:00
Matt Miemiec
8695c58648 Add the bspwm window manager to Nix. 2014-08-12 18:22:15 +02:00
Mateusz Kowalczyk
749cf663be youtube-dl: update to 2014.08.10 2014-08-11 08:57:38 +02:00
Luca Bruno
7926b587c3 file: fails to build on darwin 2014-08-09 14:37:03 +02:00
Mateusz Kowalczyk
44d65c6582 youtube-dl: update to 2014.08.05 2014-08-09 02:57:18 +02:00
Vladimír Čunát
52d9c93abe Merge 'staging' into master 2014-08-08 20:13:23 +02:00
Eelco Dolstra
8a7f3c3618 Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
Pascal Wittmann
7bd3921cf9 multitail: update from 5.2.13 to 6.2.1 2014-08-08 14:51:11 +02:00
Pascal Wittmann
f3fd2bf9b2 xclip: fixed broken homepage link 2014-08-08 11:20:32 +02:00
Peter Simons
9226fbf56a Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
Rickard Nilsson
d958692420 riemann-c-client: Update from 1.1.1 to 1.2.0 2014-08-06 12:08:41 +02:00
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging. 
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
 2014-08-04 16:51:47 +02:00
Mateusz Kowalczyk
a54b012fe9 youtube-dl: update to 2014.08.02.1 2014-08-02 18:57:54 +02:00
aszlig
57781346d7
Merge branch 'i3-tests'. 
The reason I went through this whole journey of gathering dependencies
and debugging just in order to get i3 tests working was because I wanted
to supply test cases to a small patch I wrote for the upstream project.

This adds/updates quite a few Perl packages and a X dummy helper, which
are all needed in order to successfully run the test suite.
 2014-08-01 05:51:57 +02:00
aszlig
feeb5bae23
Add new package xdummy, a dummy X server. 
This is actually a small script which just starts an X server without
any real display. Right now only needed for running the test suite of
the i3 window manager within the Nix chroot, but might be useful for
running other tests needing a DISPLAY.

Usage is just like a regular X server, so in order to start an instance
for display :666, you just run it like this:

xdummy :666

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-08-01 05:49:14 +02:00
Bjørn Forsman
62d0a320b3 Revert "Remove obsolete jackaudio version 1." 
This reverts commit bdb77826d9.

Jack1 is not obsolete and neither jack1 nor jack2 is called 'jackaudio'.

Q: What's the difference between Jack1 and Jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
 2014-07-31 12:52:29 +02:00
Peter Simons
bdb77826d9 Remove obsolete jackaudio version 1. 2014-07-28 20:32:52 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
f64d84698e Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
 2014-07-28 11:30:49 +02:00
Luke Clifton
dcb226deb7 Changed to correct license from licenses.* 2014-07-26 08:39:14 +08:00
lethalman
9188444027 Merge pull request #3367 from FlashKorten/emv 
Emv
 2014-07-25 10:32:49 +02:00
Sebastian Korten
d03905dbf3 emv: perl isn't needed after all 2014-07-25 10:26:44 +02:00
Sebastian Korten
8da1291928 emv: Initial install script 2014-07-25 09:20:17 +02:00
Joel Taylor
4273d38b3b tmux 1.9a 2014-07-23 16:06:22 -07:00
Bjørn Forsman
49c9ba81a5 kalibrate-rtl: new package 
kalibrate-rtl calculates the local oscillator frequency offset in
RTL-SDR devices.

kalibrate-rtl has no tags/releases, so I'm using the latest commit from
git master (dated 2013-12-14). I made an upstream issue about making a
release back in May[1], but I've gotten no response yet.

[1] https://github.com/steve-m/kalibrate-rtl/issues/7
 2014-07-23 22:47:41 +02:00
William A. Kennington III
0031a036ca picocom: Add dependency on lrzsz so that we can transfer files 2014-07-23 20:28:18 +02:00
William A. Kennington III
9e767db818 lrzsz: Add derivation 
[Bjørn Forsman: remove "a unix" from beginning of meta.description and
capitalize first word]
 2014-07-23 20:27:12 +02:00
Bjørn Forsman
f6f2f38a6e jack: change package and attr names to 'jack1' and 'jack2' 
Currently, we have a 'jack' package with attrname 'jack1d' and a
'jackdbus' package with attrname 'jackaudio'. Make it consistent 'jack1'
and 'jack2' in both package name and attrname.

This aligns the naming with what can be found on the JACK homepage.

Q: what's the difference between jack1 and jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
 2014-07-23 20:22:14 +02:00
Luke Clifton
50c63f9b32 Added abduco 2014-07-23 21:52:22 +08:00
Eelco Dolstra
4f7289eec9 Don't use ensureDir 2014-07-22 11:01:32 +02:00
Eelco Dolstra
7f410ef923 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/misc/vim-plugins/default.nix
 2014-07-22 11:00:00 +02:00
Pascal Wittmann
261ecebfaf Merge pull request #3323 from wjlroe/logstash-1.4.2 
Logstash 1.4.2
 2014-07-21 20:02:11 +02:00
Pascal Wittmann
5156b5d11d Merge pull request #3260 from linquize/gbdfed 
gbdfed: add package 1.6
 2014-07-21 19:49:26 +02:00
Bjørn Forsman
f8778ed82c openopc: new package 
"OPC (OLE for Process Control) toolkit designed for use with Python"

This package contains a python module (OpenOPC) and a command line
client (opc). The OpenOPC Gateway Service for Windows is also copied to
$out, for reference.

It only works with python2.7 (not python3.x), so I'm not adding it to
python-packages.nix.

Also add needed dependency, python-pyro3, a distributed object
middleware for Python (IPC/RPC).

http://openopc.sourceforge.net/
 2014-07-21 18:43:33 +02:00
William Roe
b6c2dc4e4f License, platforms and maintainer for Logstash 2014-07-20 16:09:19 +01:00
Pascal Wittmann
52cf78ef22 added cv: Tool that shows the progress of coreutils programs 2014-07-20 15:45:19 +02:00
Andreas Herrmann
37b064fcc7 hdf5: Optional enableShared flag 
Required by h5py in mpi mode.
 2014-07-18 22:41:56 +02:00
Andreas Herrmann
8346343aa5 hdf5: Add mpi support 
Optionally, build the parallel version of hdf5.
 2014-07-18 22:41:55 +02:00
Pascal Wittmann
d518ef91c0 cpuminer: update from 2.3.3 to 2.4 and build with -O3 as described in the installation instructions 2014-07-17 00:15:44 +02:00
Eelco Dolstra
b9d19af3e6 Merge remote-tracking branch 'origin/master' into staging 2014-07-15 12:14:35 +02:00
Eelco Dolstra
45d327a346 jdiskreport: Update to 1.4.1 2014-07-15 11:52:20 +02:00
William Roe
a5783a977e Install all dirs for logstash 
Also only patch shebangs in bin/ directory
 2014-07-14 17:54:20 +01:00
Eelco Dolstra
ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
Pascal Wittmann
8c94b943de dvtm: update from 0.11 to 0.12 2014-07-14 15:40:09 +02:00
Linquize
73028ef161 gbdfed: add package 1.6 2014-07-13 19:22:10 +08:00
William Roe
d79a58e392 Bump Logstash to 1.4.2 2014-07-11 17:50:02 +01:00
zimbatm
a05ae93c66 Update direnv to v2.4.0 2014-07-08 00:20:21 +02:00
Rickard Nilsson
0ee69ef529 New pkg: riemann-c-client version 1.1.1 
A C client library for the Riemann monitoring system
 2014-07-07 23:58:24 +02:00
Eelco Dolstra
06fc1ec34d Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/servers/serfdom/default.nix
 2014-07-01 11:25:41 +02:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir 
See c556a6ea46.
 2014-06-30 14:56:10 +02:00
Michael Raskin
127175d27f Update gummiboot to the latest 2014-06-30 11:05:40 +04:00
Benno Fünfstück
e10001042d fetchbzr, fetchdarcs, fetchhg: use rev attr 
This makes it match the behaviour of fetchgit and fetchsvn, so it's
easier to write scripts that support all of them.
 2014-06-28 21:06:10 +02:00
Florian Friesdorf
ba654b9368 Merge pull request #3056 from aherrmann/pr_tables 
Python module tables
 2014-06-23 22:58:04 +02:00
Bjørn Forsman
e805731cac convmv: add meta.description 2014-06-22 23:03:36 +02:00
Andreas Herrmann
5a96043637 hdf5: Update to 1.8.13 2014-06-22 20:05:20 +02:00
Andreas Herrmann
d1f7bc7bcf hdf5: Add szip as an optional dependency 
This adds additional compression modes to hdf5.

Note: The szip license may not be compatible with everyone's use case. Hence,
it is an optional dependency.
 2014-06-22 20:05:20 +02:00
Andreas Herrmann
4528ebf509 hdf5: Add zlib as optional dependency 
This adds addition compression modes to the hdf5 library.

I am adding this, because pytables depends on it.
 2014-06-22 20:05:20 +02:00
Austin Seipp
55fee4ffce Merge pull request #3004 from offlinehacker/pkgs/logstash/update_1_3_3 
logstash: update to 1.3.3
 2014-06-18 16:20:00 -05:00
Jaka Hudoklin
d4506fd7eb logstash: update to 1.3.3 2014-06-18 13:29:26 +02:00
Vladimír Čunát
9757785295 Merge recent master 2014-06-15 17:55:35 +02:00
Vladimír Čunát
de12094b0e Merge recent master 2014-06-12 09:15:11 +02:00
Vladimír Čunát
1bcc2aa216 fix licenCe typos 2014-06-12 09:12:14 +02:00
Bjørn Forsman
86d19319d6 t1utils: new package 
t1utils is a collection of simple Type 1 font manipulation programs.
 2014-06-11 21:17:49 +02:00
Vladimír Čunát
5a98b9f514 Merge recent master into p/stdenv 
Merged just before the pypi update, as it seems to cause problems on Hydra.
 2014-06-09 19:07:31 +02:00
Vladimír Čunát
872860e6de Merge #1187 into p/stdenv 
Tested building firefox, kdelibs, evince on x86_64-linux.
 2014-05-29 22:16:07 +02:00
Rob Vermaas
400e85ae1e debootstrap: update from 1.0.42 to 1.0.60 2014-05-27 21:30:59 +02:00
Rob Vermaas
4d6f2e41d7 ethtool: update from 3.13 to 3.14 2014-05-27 21:28:40 +02:00
Michael Raskin
90602bc8a9 Merge pull request #2773 from ederoyd46/master 
Added goaccess package
 2014-05-27 05:11:13 -07:00
Ricky Elrod
c1bbfbc13e add screenfetch 
Signed-off-by: Ricky Elrod <ricky@elrod.me>
 2014-05-27 07:13:44 -04:00
Matthew Brown
155de0279e Added goaccess package 2014-05-27 11:57:32 +01:00
Rob Vermaas
1cc7ebe3cc pv: update from 1.5.2 to 1.5.3 2014-05-22 12:56:14 +02:00
Luca Bruno
288076154f appdata-tools: add new package 2014-05-20 13:41:39 +02:00
Eelco Dolstra
2cb65a3b99 testdisk: Enable NTFS support 2014-05-19 21:45:48 +02:00
Lluís Batlle i Rossell
471e5bcf41 rkflashtool: install more files 
rkcrc is quite needed, for example, to prepare files to flash.
 2014-05-18 18:25:45 +02:00
Austin Seipp
32b0416cf0 Merge pull request #2509 from lovek323/lbdb 
lbdb: fix build on darwin
 2014-05-18 08:24:10 -05:00
Vladimír Čunát
8e9ead8656 berlios.de probably shut down, replace it 
The shutdown was announced years ago, only now it stopped working.
 2014-05-18 13:30:27 +02:00
Ricardo M. Correia
667008d56f grub: Add support for grsecurity 2014-05-15 13:25:48 +02:00
Lluís Batlle i Rossell
4fcdc32924 Adding rkflashtool, to flash MK802IV. 2014-05-14 09:59:36 +02:00
Rob Vermaas
14eebb54df Merge pull request #2564 from darklajid/bump_tmux 
nixpkgs: bump tmux to 1.9
 2014-05-08 21:42:06 +02:00
Benjamin Podszun
141d1a1253 nixpkgs: Bump screen to 4.2.1 2014-05-08 16:25:27 +02:00
Benjamin Podszun
719bcde6cc nixpkgs: bump tmux to 1.9 2014-05-08 08:59:32 +02:00
Jason "Don" O'Conal
686fa3f2cc lbdb: fix build on darwin 2014-05-05 11:40:24 +10:00
宋文武
eb36621839 dvtm: update from 0.10 to 0.11 2014-05-02 21:31:05 +02:00
Oliver Charles
e89d37b4c4 Merge pull request #2393 from linquize/cpuminer 
cpuminer: Upgrade to 2.3.3
 2014-04-26 10:00:50 +01:00
Linquize
ae1189379e cpuminer: Upgrade to 2.3.3 2014-04-25 18:21:58 +02:00
Eelco Dolstra
dbd332d147 Fix meta.maintainer -> meta.maintainers 2014-04-23 14:26:32 +02:00
John Wiegley
35aeac2939 Allow multitail to build on Darwin 2014-04-19 11:35:52 +01:00
Luca Bruno
8decc8fc2f apparix: new package 
Add directory bookmarks, distant listing, and distant editing to the command line

http://micans.org/apparix
 2014-04-15 10:41:55 +02:00
Bjørn Forsman
da5b52f1b4 minicom: update 2.6.2 -> 2.7 
Changelog:
- Configurable status line via -F option, see manpage for a listing of
  format specifier.
- Improve display of device name in status line.
- Script: Binary transmission feature via "!<"
- Bugfixes
 2014-04-14 07:06:49 +02:00
Michael Raskin
97982c4085 Update MDBTools Git version 2014-04-12 19:29:40 +04:00
Rob Vermaas
c3c045c59d Add logstash-forwarder. 2014-04-10 13:31:23 +02:00
Luca Bruno
1653c118bd pastebinit: new package 
A software that lets you send anything you want directly to a pastebin from the command line

https://launchpad.net/pastebinit
 2014-04-06 11:10:24 +02:00
Vladimír Čunát
10147beecf Merge branch vcunat@NixOS:p/stdenv (close #1840) 
This branch contains a collection of stdenv-changing updates.
There's glibc 2.18 -> .19 bump and many non-intrusive PRs.

The grsecurity branch #1187 got removed at Eelco's request,
see https://github.com/NixOS/nixpkgs/issues/1840#issuecomment-39327023
 2014-04-04 21:33:55 +02:00
Evgeny Egorochkin
586d19d787 mc: update from 4.8.11 to 4.8.12 2014-04-03 10:32:28 +03:00
Evgeny Egorochkin
899fd2942a units: update from 2.02 to 2.10 2014-04-03 07:46:21 +03:00
Evgeny Egorochkin
bf0bc1044d youtubeDL: update from 2014.03.30.1 to 2014.04.02 2014-04-03 07:27:31 +03:00
Vladimír Čunát
11d4c257c1 Merge branch glibc-2.19, see #1840 2014-04-02 19:03:49 +02:00
Evgeny Egorochkin
6f4a62e9e4 youtubeDL: update from 2014.03.25.1 to 2014.03.30.1 2014-03-30 19:24:21 +03:00
Evgeny Egorochkin
cca30b37f8 youtubeDL: update from 2014.03.18.1 to 2014.03.25.1 2014-03-26 12:57:11 +02:00
Vladimír Čunát
58857096fb file: update to fix CVE-2014-2270, CVE-2013-7345 2014-03-25 23:02:37 +01:00
Evgeny Egorochkin
06097489a6 youtubeDL: update from 2014.03.12 to 2014.03.18.1 2014-03-20 13:32:29 +02:00
Tom Hinton
7b9485145d Add missing sha256sum to autorandr derivation 2014-03-18 10:15:59 +00:00
Ellis Whitehead
44b6766f5d Create package for 'fasd' 2014-03-15 20:33:10 +01:00
Vladimír Čunát
d6349df0dd put systemd unit dirs on the right place 
Also see #1936.
 2014-03-13 21:44:51 +01:00
Evgeny Egorochkin
7c38f9afe1 youtubeDL: update from 2014.03.07.1 to 2014.03.12, add myself as a maintainer 2014-03-13 08:56:04 +02:00
Domen Kožar
2de56d103c Merge pull request #1837 from falsifian/apt-offline 
apt-offline: offline APT package manager
 2014-03-10 21:39:43 +01:00
James Cook
c6e4e366e5 apt-offline: set platforms to linux 
(Only tested on Linux; might work on other systems.)
 2014-03-10 13:38:24 -07:00
James Cook
727c8981ad apt-offline: set platforms 2014-03-10 13:32:47 -07:00
Evgeny Egorochkin
bf900c25ec youtubeDL: update from 2014.03.04.2 to 2014.03.07.1 2014-03-08 17:53:52 +02:00
Thomas Tuegel
df5639183c Claim maintainership of recently added packages 
Also set platforms for some packages where it was missing.
 2014-03-07 11:23:30 -06:00
Evgeny Egorochkin
2dd320a382 youtubeDL: update from 2014.02.28 to 2014.03.04.2 2014-03-05 05:12:09 +02:00
Peter Simons
9c2c002a3b gparted: update from 0.15.0 to 0.18.0 2014-03-03 11:10:27 +01:00
Peter Simons
c4873add80 youtubeDL: update from 2014.02.26 to 2014.02.28 2014-03-03 11:10:27 +01:00
Peter Simons
98cb9c073f xsel: update from 0.9.6 to 1.2.0 2014-03-03 11:10:27 +01:00
Peter Simons
506da15579 pv: update from 1.4.12 to 1.5.2 2014-03-03 11:10:25 +01:00
Evgeny Egorochkin
6eecf5f03f parallel: update from 20130422 to 20140222 2014-02-27 18:52:05 +02:00
Evgeny Egorochkin
d189a57fd7 ncdu: update from 1.8 to 1.10 2014-02-27 18:49:28 +02:00
Evgeny Egorochkin
68e9829134 youtubeDL: update from 2014.02.19.1 to 2014.02.26 2014-02-26 20:47:30 +02:00
Eelco Dolstra
db9d204d33 Merge remote-tracking branch 'origin/master' into glibc-2.19 2014-02-26 12:42:03 +01:00
James Cook
a03f23440c apt-offline: fixed typo 2014-02-25 21:48:42 -08:00
James Cook
2294553cb1 apt-offline: offline APT package manager 2014-02-25 21:33:51 -08:00
Peter Simons
20a150a1df memtest86: update from 4.1.0 to 4.3.3 2014-02-24 22:04:40 +01:00
Domen Kožar
a131bf9be7 i3minator: 0.0.3 -> 0.0.4 2014-02-23 16:57:44 +01:00
Evgeny Egorochkin
a52f17e4e1 youtubeDL: update from 2014.02.17 to 2014.02.19.1 2014-02-19 15:56:13 +02:00
Evgeny Egorochkin
f10280fc19 youtubeDL: update from 2014.02.13 to 2014.02.17 2014-02-18 04:14:05 +02:00
Bjørn Forsman
47ead60c03 plantuml: update 7982 -> 7991 2014-02-16 10:31:24 +01:00
William A. Kennington III
42358f0cd0 man-db: Upgrade package from 2.5.1 -> 2.6.6 
Additionally, remove the uneeded share.patch since share/man is now
searched within upstream code.
 2014-02-15 12:17:06 +01:00
William A. Kennington III
bdb842d5eb Move all db4 packages to the default db5 2014-02-15 12:03:02 +01:00
Evgeny Egorochkin
f1ebc4a019 youtubeDL: update from 2014.02.10 to 2014.02.13 2014-02-14 20:27:41 +02:00
Eelco Dolstra
a0bbe58a19 coreutils: Disable parallel building 2014-02-14 19:17:23 +01:00
Bjørn Forsman
2f314cb231 ethtool: update 3.11 -> 3.13 2014-02-13 23:09:02 +01:00
Evgeny Egorochkin
08004bc93e youtubeDL: update from 2014.02.03 to 2014.02.10 2014-02-13 19:09:47 +02:00
Domen Kožar
35d1c4d34a i3minator: add platforms and maintain 2014-02-12 19:22:44 +01:00
Domen Kožar
7271eb50e6 Add i3minator: i3 project manager similar to tmuxinator 2014-02-12 12:04:53 +01:00