JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
69,914 Commits 1 Branch 0 Tags 12 GiB
e9fcbe67b0
Commit Graph

2981 Commits

Author SHA1 Message Date
Arseniy Seroka
daf4ec39a5 fix: add missing versions 2015-06-04 23:34:14 +03:00
Eelco Dolstra
3ede0a64a2 make: Don't segfault if we can't get a tty name 
This happened in VM builds:

  make flags: SHELL=/nix/store/dbxpkswwc7rh6g1iy6dwqklzw39hihb1-bash-4.3-p33/bin/bash
  /nix/store/jm26xg0h3jcrg4bbrwiqx3jpirscdk0p-stdenv/setup: line 658:  5957 Segmentation fault      make ${makefile:+-f $makefile} ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} $makeFlags "${makeFlagsArray[@]}" $buildFlags "${buildFlagsArray[@]}"
 2015-06-04 19:47:34 +02:00
Peter Simons
c659105ef8 cabal2nix: get rid of the '-dirty' version suffix 
The fetchgit builder performs some freak magic in the name of deterministic
hashes that screws up git's idea of a clean directory tree.
 2015-06-04 13:33:57 +02:00
lethalman
219b9a63ad Merge pull request #8135 from sofuture/fix-goimports-build 
Fix goimports build
 2015-06-03 10:47:55 +02:00
jzellner
be03ca9262 fix goimports build, use buildGoPackage 2015-06-02 11:59:40 -06:00
Eelco Dolstra
e7f1038798 Fix typo in last merge 2015-06-01 20:09:31 +02:00
Eelco Dolstra
553abf71ba Merge remote-tracking branch 'origin/staging' into gcc-4.9 
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/libraries/wayland/default.nix
	pkgs/development/tools/build-managers/cmake/default.nix
	pkgs/top-level/all-packages.nix
 2015-06-01 20:08:43 +02:00
codyopel
fcf850c99e sassc: 3.2.1 -> 3.2.4 2015-06-01 01:28:18 -04:00
Pascal Wittmann
ed9455838c checkstyle: update from 6.6 to 6.7 2015-05-31 20:25:33 +02:00
Peter Simons
c55ca3fd0b cabal2nix: update to version 20150531 
This update adds support for bash completion.
 2015-05-31 18:31:26 +02:00
Tobias Geerinckx-Rice
21015ea82f Add bin_replace_string: edit precompiled binaries 2015-05-30 21:09:26 +02:00
Pascal Wittmann
1d30557516 Fixed meta.license: s/licence/license 2015-05-30 15:19:05 +02:00
Pascal Wittmann
24d2849dba gtk-doc: update from 1.23 to 1.24 2015-05-30 13:48:53 +02:00
Peter Simons
99273a6716 Merge pull request #8047 from nckx/master 
Don't use "with licenses;" for single licences
 2015-05-28 22:14:53 +02:00
Tobias Geerinckx-Rice
158e1cfdd0 Don't use "with licenses;" for single licences 
And don't use square brackets on such lines.
 2015-05-28 19:20:29 +02:00
Pascal Wittmann
7822640a18 yodl: update from 3.05.00 to 3.05.01 2015-05-28 19:10:52 +02:00
Pascal Wittmann
f675c4d90d icmake: update from 7.22.00 to 7.22.01 2015-05-28 18:57:32 +02:00
Pascal Wittmann
38bc63c605 help2man: update from 1.46.5 to 1.46.6 2015-05-28 18:56:12 +02:00
Pascal Wittmann
b57097b2fe fswatch: update from 1.4.6 to 1.4.7 2015-05-28 18:54:35 +02:00
Pascal Wittmann
1a3860e95a checkstyle: update from 6.5 to 6.6 2015-05-28 18:49:06 +02:00
Sander van der Burg
3fa15c820f doclifter: add new package 2015-05-28 16:13:47 +00:00
Rok Garbas
ea3748d519 cygwin: help2man patch for cygwin 2015-05-28 14:15:47 +02:00
Florian Friesdorf
90a97d32df cygwin cmake 2015-05-28 10:53:36 +02:00
Florian Friesdorf
f33f2a7e82 cygwin: disable gnumake check because of hanging test 2015-05-28 10:53:35 +02:00
Marko Durkovic
c4efe32d4d cygwin: pkgconfig 2015-05-28 10:53:35 +02:00
Austin Seipp
4793f2c7d3 nixpkgs: arcanist 20150412 -> 20150525 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-05-27 16:36:26 -05:00
Tobias Geerinckx-Rice
b2d7f4b1ba Use common licence attributes from lib/licenses.nix 
Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.
 2015-05-27 22:00:06 +02:00
Arseniy Seroka
6c9ac3f967 Merge pull request #8024 from ragnard/update-boot-version 
boot: Update version from 2.0.0-rc14 to 2.0.0.
 2015-05-27 22:43:15 +03:00
Ragnar Dahlén
9cb63367dc boot: Update version from 2.0.0-rc14 to 2.0.0. 2015-05-27 20:39:17 +01:00
lethalman
257c05fa82 Merge pull request #7622 from jzellner/master 
add goimports package
 2015-05-27 10:57:23 +02:00
vbgl
2857d5d7a8 Merge pull request #7823 from ericbmerritt/ocaml-enhancements 
Ocaml enhancements
 2015-05-26 23:52:32 +02:00
Edward Tjörnhammar
f02284a361 activator: add version 1.3.2 2015-05-26 20:56:43 +02:00
Antoine R. Dumont
a12dd8f6a1 Upgrade to latest stable 
Upgraded the dependency to oracle's jdk8.
 2015-05-26 19:30:19 +02:00
Alexander Flatter
7d9724057c Update heroku toolbelt to 3.32.0 2015-05-26 13:06:34 +02:00
Alexander Flatter
be71c0871c Add meta information to heroku toolbelt 2015-05-26 13:06:34 +02:00
Alexander Flatter
d2b906c771 Add heroku-client 2015-05-26 13:05:53 +02:00
Peter Simons
d808f5b3e6 cabal2nix: update to version 20150525 2015-05-25 15:00:07 +02:00
Eric Merritt
8751d1ea1a rename ocaml_typeconv to type_conv 
The actual name of the package is type_conv
(https://github.com/janestreet/type_conv). Having it named
ocaml_typeconv adds a verbosity that isn't required and actually makes
the package harder to find.
 2015-05-24 12:32:45 -07:00
Eric Merritt
56627d5444 ocaml-opam: the sha hash of 1.2.2 changed 
This is a bit scary. The sha of 1.2.2 changed, causing a crash on
download of the url. This updates to the current sha. Opam maintainer
why, oh why, do you change a released version without a version bump??
 2015-05-24 12:31:44 -07:00
Boris Sukholitko
1da49e714d Upgrade to selenium 2.45 
Without the upgrade, firefox driver is unusable, due to:

https://code.google.com/p/selenium/issues/detail?id=8399
 2015-05-22 17:40:18 +03:00
Sander van der Burg
e612ea59c0 rman: add expression 2015-05-22 10:04:44 +00:00
Tobias Geerinckx-Rice
5d5044b2ec Use mirror:// URIs for ftp.debian.org 
Provide a more robust experience for users with horrible network
hardware (me).
 2015-05-22 10:39:27 +02:00
Pascal Wittmann
71aaebc954 thrust: fix build 2015-05-21 15:24:59 +02:00
jz
f2cc21a8b4 Merge branch 'master' of github.com:NixOS/nixpkgs 2015-05-20 15:18:26 -06:00
Ozan Sener
97160a8644 Add Thrust 0.7.6 2015-05-20 20:58:03 +02:00
Ossi Herrala
d2f21ab3fc cfr: Update to version 0_101 and remove platform restrictions 
cfr is written in Java, so it should work in every platform supported
by jre. This fix makes cfr usable in Darwin.
 2015-05-20 09:02:13 +03:00
Pascal Wittmann
2c8872f191 gtk-doc: update from 1.21 to 1.23 2015-05-19 20:08:15 +02:00
Ricardo M. Correia
2817e74d37 cargo: Add myself to maintainers 2015-05-19 19:02:38 +02:00
Ricardo M. Correia
9b752fd0e1 buildRustPackage: Don't hardcode registry index hash 
Instead, discover it automatically when building the package.

This makes `buildRustPackage` more future-proof with respect to changes
in how `cargo` generates the hash.

Also, it fixes broken builds in i686 because apparently, cargo generates
a different registry index hash in this architecture (compared to
x86-64).
 2015-05-19 19:02:38 +02:00
Ricardo M. Correia
de322b48b7 cargo: Fix src hash 
It seems that when you pass `leaveDotGit = true` to `fetchgit`, sometimes
the output can still change (i.e. it's not completely deterministic).

This could be due to changes in the upstream git repository...
 2015-05-19 19:02:38 +02:00
Luca Bruno
9adde87fea More usage of gnome3.defaultIconTheme 2015-05-19 14:44:27 +02:00
Ricardo M. Correia
85c48934bc racerRust: 2015-05-04 -> 2015-05-18 
Fixes build failure with rustc 1.0.0.
 2015-05-19 03:08:34 +02:00
Peter Simons
61224338ff cabal2nix: update to version 20150518 2015-05-18 18:04:37 +02:00
Joel Taylor
78ef78719f Merge branch 'master' of https://github.com/NixOS/nixpkgs 2015-05-15 14:33:21 -07:00
Joel Taylor
1aef9fc4af cmake: disable building with ncurses if building without ncurses 2015-05-15 14:31:40 -07:00
Vladimír Čunát
b7fe141f6b Revert "remove cmake-2.8" 
Some packages fail with the only cmake version we've left.
This reverts commit 67199bda4e.
 2015-05-15 23:02:41 +02:00
Pascal Wittmann
4ec3f8e42f intel-gpu-tools: apply patch to fix a compile error 
see https://bugs.gentoo.org/show_bug.cgi?id=548318
 2015-05-15 22:46:30 +02:00
Eric Seidel
67fe5d46d4 Merge pull request #7817 from gridaphobe/cc-wrapper-isgnu-isclang 
Add isGNU and isClang attributes to cc-wrapper
 2015-05-14 10:09:07 -07:00
vbgl
d206cd8a26 Merge pull request #7839 from vbgl/opam-122 
opam: update from 1.2.1 to 1.2.2
 2015-05-14 18:40:17 +02:00
Pascal Wittmann
9c9c586534 Fixed several "package has no version" warnings 2015-05-14 17:19:41 +02:00
Vincent Laporte
1c19f91dd7 opam: update from 1.2.1 to 1.2.2 2015-05-14 09:32:32 +02:00
Eelco Dolstra
26f17ee091 cmake: Get rid of circular dependency 
Also, don't install static libraries in jsoncpp.
 2015-05-13 18:17:26 +02:00
Shea Levy
90fd9a55d9 binutils: don't build with Werror 2015-05-13 18:17:25 +02:00
Ricardo M. Correia
981ea747b5 cargo: 2015-05-11 -> 2015-05-13 2015-05-13 17:23:18 +02:00
Ricardo M. Correia
755df64ee3 Merge pull request #7501 from wizeman/u/upd-rust 
Add support for Rust / Cargo packaging
 2015-05-12 17:30:11 +02:00
Ricardo M. Correia
e40a43cd1f rustRacer: 2015-04-12 -> 2015-05-04 2015-05-12 17:28:52 +02:00
Ricardo M. Correia
cbdedca255 cargo: 2015-04-14 -> 2015-05-11 2015-05-12 17:28:50 +02:00
Tobias Geerinckx-Rice
6396c04d9f ccache: enable tests 
Let's hope this doesn't break all over the place. Works here.
 2015-05-12 07:52:59 +02:00
Tobias Geerinckx-Rice
75ecd2e415 ccache 3.2.1 -> 3.2.2 
New features and improvements:
- Added support for "CCACHE_COMPILERCHECK=string:<value>". This is a faster
  alternative to "CCACHE_COMPILERCHECK=<command>" if the command's output
  can be precalculated by the build system.
- Add support for caching code coverage results (compiling for gcov).

Bug fixes:
- Fixed bug which could result in false cache hits when source code contains
  '"' followed by " /*" or " //" (with variations).
- Made hash of cached result created with and without "CCACHE_CPP2"
  different.  This makes it possible to rebuild with "CCACHE_CPP2" set
  without having to clear the cache to get new results.
- Don't try to reset a non-existing stats file. This avoids "No such file or
  directory" messages in the ccache log when the cache directory doesn't
  exist.
- Fixed a bug where ccache deleted clang diagnostics after compiler
  failures.
- Avoid performing an unnecessary copy of the object file on a cache miss.
- Bail out on too hard compiler option "-fmodules".
- Bail out on too hard compiler option "-fplugin=libcc1plugin" (interaction
  with GDB).
- Fixed build error when compiling ccache with recent clang versions.
- Removed signal-unsafe code from signal handler.
- Corrected logic for when to output cached stderr.
- Wipe the whole cached result on failure retrieving a cached file.
- Fixed build error when compiling ccache with recent clang versions.
 2015-05-12 07:52:59 +02:00
Eric Seidel
662a6b1ca6 remove all references to stdenv.cc.cc.is{GNU,Clang} 
use the new `stdenv.cc.is{GNU,Clang}` instead, which will always be
defined.
 2015-05-11 14:44:50 -07:00
Pascal Wittmann
a16cd707bd Merge pull request #7804 from codyopel/global 
global: refactor
 2015-05-11 21:15:38 +02:00
codyopel
4cba460737 ctags: 804 -> 816 2015-05-11 05:27:53 -04:00
codyopel
b8f1d6c9db global: refactor 2015-05-11 04:22:26 -04:00
Domen Kožar
bb4d658f64 Merge branch 'master' into staging 
Conflicts:
	nixos/doc/manual/release-notes/rl-unstable.xml
	nixos/modules/services/printing/cupsd.nix
	pkgs/applications/misc/calibre/default.nix
	pkgs/development/haskell-modules/hackage-packages.nix
	pkgs/development/libraries/libsodium/default.nix
	pkgs/misc/emulators/wine/unstable.nix
	pkgs/top-level/all-packages.nix
 2015-05-11 10:05:23 +02:00
codyopel
4b07d16827 intltool: refactor 2015-05-11 03:11:30 -04:00
Michael Raskin
84ffa4d489 Update CL-Launch 2015-05-10 13:46:31 +02:00
Michael Raskin
53f8245494 Update luarocks 2015-05-10 13:46:31 +02:00
Tobias Geerinckx-Rice
4081886d1a alloy: remove left-over no-op 2015-05-10 13:46:02 +02:00
Tobias Geerinckx-Rice
8bba7c5cf1 Add cfr 0_100: another Java decompiler 2015-05-10 13:46:01 +02:00
Tobias Geerinckx-Rice
62382e6a6f alloy: use installPhase instead of ./builder.sh 
Also pass on any arguments from the shell wrapper to the .jar.
And be less clever with shell strings.
 2015-05-10 13:46:00 +02:00
Tobias Geerinckx-Rice
f904376904 Add alloy 4.2_2015-02-22: relational modeller 2015-05-10 13:46:00 +02:00
Michael Raskin
fdd0a1f7f8 Update CL-Launch 2015-05-10 13:36:46 +03:00
Michael Raskin
d1d2a9856c Update luarocks 2015-05-10 13:36:45 +03:00
Tobias Geerinckx-Rice
8f74b653d2 alloy: remove left-over no-op 2015-05-09 17:40:51 +02:00
Tobias Geerinckx-Rice
41ad1f947b Add cfr 0_100: another Java decompiler 2015-05-09 17:38:35 +02:00
Tobias Geerinckx-Rice
e50afd12b7 alloy: use installPhase instead of ./builder.sh 
Also pass on any arguments from the shell wrapper to the .jar.
And be less clever with shell strings.
 2015-05-09 03:17:33 +02:00
Tobias Geerinckx-Rice
4c5d3f5a71 Add alloy 4.2_2015-02-22: relational modeller 2015-05-09 01:25:59 +02:00
William A. Kennington III
c9395e1e92 Merge branch 'master' into staging 2015-05-08 05:59:50 -07:00
codyopel
0f4b787428 sassc: 3.1.0 -> 3.2.1 2015-05-07 09:51:40 -04:00
William A. Kennington III
074c4a7f78 Merge remote-tracking branch 'upstream/master' into staging 2015-05-07 01:44:49 -07:00
Pascal Wittmann
4a9df12721 Merge pull request #7708 from vbgl/framac-sodium 
frama-c: update from Neon to Sodium
 2015-05-05 21:49:46 +02:00
Peter Simons
ea3b8cd918 cabal2nix: update to version 20150505 2015-05-05 21:44:48 +02:00
Peter Simons
324719a5a6 Drop obsolete pre-NG Haskell builds. 2015-05-05 21:44:47 +02:00
Vincent Laporte
67529e7a08 frama-c: update from Neon to Sodium 2015-05-05 19:59:54 +02:00
Tobias Geerinckx-Rice
897897cc30 Add flexc++ 2.02.00: C++ lexical scanner generator 2015-05-05 19:44:48 +02:00
Tobias Geerinckx-Rice
288291e132 yodl: fix paths. Now it actually works. 2015-05-05 19:44:45 +02:00
Tobias Geerinckx-Rice
2c62a0a930 Add egypt 1.10: create simple C call graphs 2015-05-05 19:43:18 +02:00
Peter Simons
11bf7502cc Remove obsolete entries from pkgs/development/tools/haskell. 2015-05-04 12:27:02 +02:00
Domen Kožar
21a7e39b0b Merge pull request #7658 from benley/jenkins-job-builder 
New package: jenkins-job-builder
 2015-05-04 10:34:52 +02:00
Benjamin Staffin
3a371528bb New package: jenkins-job-builder 2015-05-03 10:58:17 -07:00
Aristid Breitkreuz
6f5bfcdb33 Merge pull request #7665 from joachifm/cppcheck 
cppcheck: 1.68 -> 1.69
 2015-05-03 13:34:12 +02:00
Joachim Fasting
127050d851 cppcheck: 1.68 -> 1.69 
Also update meta and install man page.
 2015-05-03 00:22:23 +02:00
William A. Kennington III
64c68c5413 cmake: 3.2.1 -> 3.2.2 2015-05-01 22:27:14 -07:00
William A. Kennington III
00df204c82 Merge remote-tracking branch 'upstream/master' into staging 2015-05-01 15:57:09 -07:00
Joachim Fasting
78a877bef1 Delete redundant docutils expression 
`development/tools/documentation/docutils` is also provided
by `pythonPackages`; use that instead.
 2015-05-01 20:46:07 +02:00
William A. Kennington III
f48fe899c3 Simplify some builds with curses compatability 2015-04-30 18:49:28 -07:00
William A. Kennington III
f537943f27 dejagnu: Add metadata 2015-04-30 18:49:27 -07:00
Joachim Fasting
bf7ad2d84f meta.description fixups 
Mostly scripted substitutions with a couple of subjective enhancements.
 2015-04-30 18:17:42 +02:00
Ricardo M. Correia
4cae83bb70 gprof2dot: Add new package 
gprof2dot is a Python script to convert the output from many profilers
into a dot graph.
 2015-04-30 00:16:02 +02:00
Thomas Tuegel
1fe28a1132 Merge remote-tracking branch 'upstream/master' into staging 2015-04-29 11:33:28 -05:00
Robin Gloster
b88fc6c90e update vagrant to 1.7.2 2015-04-29 13:15:17 +02:00
Pascal Wittmann
6b4aec742d Merge pull request #7628 from ragnard/bump-boot 
boot: bump from rc8 to rc14
 2015-04-29 10:55:16 +02:00
Ragnar Dahlén
543ec3cf46 boot: bump from rc8 to rc14 2015-04-29 08:50:48 +01:00
jz
46e82353a1 add goimports 2015-04-28 19:45:28 -06:00
William A. Kennington III
c6bee4b4bb sysbench: Update to 2015-04-22 2015-04-28 18:27:39 -07:00
Pascal Wittmann
f99d5cf2fc Fixed some descriptions 2015-04-28 10:55:20 +02:00
Pascal Wittmann
06e2fdc62e spin: update from 6.4.1 to 6.4.3 2015-04-28 09:57:10 +02:00
Vladimír Čunát
30f31c9afc Merge 'master' into staging 
(relatively simple conflicts)
 2015-04-26 22:52:08 +02:00
Ambroz Bizjak
05a44cd06e stlink: Update to version 1.1.0. 2015-04-24 00:08:12 +02:00
Ricardo M. Correia
d6093505cc buildRustPackage: Get rid of /proc/self/cwd hack 
This makes buildRustPackage portable to non-Linux platforms.

Additionally, now we also save the `Cargo.lock` file into the fetch output, so
that we don't have to run $cargoUpdateHook again just before building.
 2015-04-23 20:22:19 +02:00
Peter Simons
cde5088bec cabal2nix: the hash has changed because of the newly added tag 2015-04-23 19:55:55 +02:00
Ricardo M. Correia
0cde1dc524 cargo: Remove setupHook 
Instead, move that code into buildRustPackage.

The setup hook was only doing part of the work anyway, and having it in
a separate place was obscuring what was really going on.
 2015-04-23 15:26:23 +02:00
Peter Simons
019b18722d cabal2nix: bump to latest version and wrap it to include nix-prefetch-scripts in $PATH 2015-04-23 14:12:43 +02:00
Ricardo M. Correia
e42c17ee97 buildRustPackage: Fix Cargo.lock being ignored 
It turns out that `cargo`, with respect to registry dependencies, was
ignoring the package versions locked in `Cargo.lock` because we changed
the registry index URL.

Therefore, every time `rustRegistry` would be updated, we'd always try
to use the latest version available for every dependency and as a result
the deps' SHA256 hashes would almost always have to be changed.

To fix this, now we do a string substitution in `Cargo.lock` of the
`crates.io` registry URL with our URL. This should be safe because our
registry is just a copy of the `crates.io` registry at a certain point
in time.

Since now we don't always use the latest version of every dependency,
the build of `cargo` actually started to fail because two of the
dependencies specified in its `Cargo.lock` file have build failures.

To fix the latter problem, I've added a `cargoUpdateHook` variable that
gets ran both when fetching dependencies and just before building the
program. The purpose of `cargoUpdateHook` is to do any ad-hoc updating
of dependencies necessary to get the package to build. The use of the
'--precise' flag is needed so that cargo doesn't try to fetch an even
newer version whenever `rustRegistry` is updated (and therefore have to
change depsSha256 as a consequence).
 2015-04-23 02:58:07 +02:00
Georges Dubus
7372c5434f nixbang: upgrade to 0.1.2 2015-04-22 10:00:26 +02:00
Cray Elliott
e73921aee1 valgrind: patch build system to allow linux kernels of v4.x 2015-04-21 20:40:15 -07:00
Ricardo M. Correia
d648be6724 buildRustPackage: Add check phase and enable it by default 
Also disable check phase in cargo as there are lots of failures (some
probably due to trying to access the network).
 2015-04-21 20:45:05 +02:00
Ricardo M. Correia
5e8a447739 cargo: Build optimized binary 2015-04-21 20:44:41 +02:00
Georges Dubus
7d67efa3f2 Add support for building cargo'ed Rust programs 2015-04-21 19:46:29 +02:00
Pascal Wittmann
183271560b Merge pull request #7393 from pjones/pkg/sassc 
New package: SassC (front-end for libsass)
 2015-04-21 09:52:50 +02:00
Nikolay Amiantov
91f3912b5d lambdabot: add configuration 2015-04-20 18:56:43 +03:00
Tobias Geerinckx-Rice
74d66a3df1 dejagnu 1.5.1 -> 1.5.3 2015-04-19 02:13:30 +02:00
Luca Bruno
384abb5e29 Add automake 1.15 2015-04-17 17:18:10 +02:00
Nikolay Amiantov
4c1afe5cce leksah: move to haskell tools and add cabal to path 2015-04-16 15:53:57 +03:00
Nikolay Amiantov
5dec393125 lambdabot, mueval: move to development/tools/haskell 2015-04-16 15:53:57 +03:00
Nikolay Amiantov
4947f918ad lambdabot: add package 2015-04-16 13:32:48 +03:00
Nikolay Amiantov
58330b2a81 mueval: add package 2015-04-16 13:32:48 +03:00
Arseniy Seroka
d56e9b4f05 Merge pull request #7330 from RumataEstor/rust-beta 
Provide rustc-1.0.0-beta as the default rust package
 2015-04-16 13:05:40 +03:00
Dmitry Belyaev
854f81da34 Update racerRust 2015-04-16 13:37:18 +10:00
Edward Tjörnhammar
dfc8e5ab05 ihaskell: cleanup wrapper and service 2015-04-15 23:00:03 +02:00
Peter Jones
c61aa9c2d1 New package: SassC (front-end for libsass) 2015-04-15 08:44:35 -06:00
Nikolay Amiantov
77a153a655 leksah: add wrapper 
Closes https://github.com/NixOS/nixpkgs/pull/7063.
 2015-04-15 13:40:07 +02:00
Charles Cooper
ba206b550a dub update to v0.9.23 2015-04-14 10:46:16 -07:00
Lluís Batlle i Rossell
745b1ce04a Updating gdb to 7.9. 
I can remove the patch of edit-signals. It seems to work without it.

I tested the change over release-14.12.
 2015-04-14 17:26:13 +02:00
Peter Simons
65822005f0 Merge pull request #7314 from edwtjo/ihaskell-fixups 
IHaskell fixes
 2015-04-14 14:21:44 +02:00
Dmitry Belyaev
871d11c176 Update cargoSnapshot to rustc-1.0.0-beta release 2015-04-13 15:55:39 +10:00
Austin Seipp
a4e63baf35 nixpkgs: arcanist 20150318 -> 20150412 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-04-12 12:16:30 -05:00
Edward Tjörnhammar
f13d9f28e8 ihaskell: deprecate old haskellPackages expression 2015-04-11 00:09:31 +02:00
Thomas Tuegel
88918e10e9 Merge branch 'master' into staging 2015-04-10 07:45:38 -05:00
William A. Kennington III
91221f5941 Revert "binutils: 2.23.1 -> 2.25" 
This reverts commit 4adae43646.

This breaks the building of samba and likely other binaries as some
libraries are never linked.
 2015-04-08 12:14:08 -07:00
Pascal Wittmann
2887162c7a intel-gpu-tools: update from 1.9 to 1.10 2015-04-08 16:06:58 +02:00
Pascal Wittmann
2958fedc2d global: update from 6.3.4 to 6.4 2015-04-08 16:04:56 +02:00
Pascal Wittmann
4576a72e45 checkstyle: update from 6.4.1 to 6.5 2015-04-08 16:03:03 +02:00
William A. Kennington III
5872185250 automake: Bump to 1.15 2015-04-07 13:32:35 -07:00
Eric Seidel
c94b24fa4a fix fallout from merge of master 2015-04-06 19:48:44 -07:00
Eric Seidel
6ec373d776 Merge branch master into staging 2015-04-06 18:58:08 -07:00
Markus Kohlhase
40db8b6ffd nixpkgs: removed sloc duplicate 2015-04-06 11:53:06 +02:00
Michael Raskin
67e055501f Update intltool 2015-04-05 20:27:25 +03:00
Michael Raskin
25317cf30c Update cl-launch 2015-04-05 20:27:25 +03:00
Ryan Mulligan
93f1029b0f Get rid of fetchurlGnome 
closes #1707
 2015-04-04 22:22:12 -07:00
Spencer Whitt
171225ab1c uncrustify: build on Darwin 2015-04-04 02:07:55 -04:00
Spencer Whitt
162f870e6f astyle: fix on Darwin 2015-04-04 02:07:55 -04:00
Austin Seipp
5ab1096f1f nixpkgs: re2c 0.14.1 -> 0.14.2 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-04-02 16:27:52 -05:00
William A. Kennington III
a604b42480 mysql: Use libs in place of the binary mysql 2015-04-01 16:46:53 -07:00
John Wiegley
80c6c5e9ec global: wrap "global" in the same fashion 2015-03-31 20:56:05 -05:00
John Wiegley
c7ce8c7768 global: make pygments visible to "gtags" binary 2015-03-31 20:53:22 -05:00
John Wiegley
b29fc6bfaf global: add missing spaces to configureFlags 2015-03-31 16:09:40 -05:00
John Wiegley
227ebdc7cb Remove unnecessary entries in propagatedBuildInputs 2015-03-31 10:34:22 -05:00
John Wiegley
65b4013194 Add propagatedBuildInputs 2015-03-31 10:31:58 -05:00
John Wiegley
b6932f56f8 Enable two modern features of GNU global 2015-03-31 10:30:19 -05:00
John Wiegley
d628247bdf Merge pull request #7095 from giogadi/cmake-full-install-name-staging 
Make cmake install shared libraries with full install names by default
 2015-03-30 21:47:27 -05:00
Luis G. Torres
ff35c4a5e2 Make cmake install libraries with full install names by default so that executables can find cmake-installed shared libraries at runtime on Darwin. Addresses #6821. 2015-03-30 21:25:44 -04:00
William A. Kennington III
fa2e5b25ba Merge branch 'master' into staging 2015-03-29 14:25:48 -07:00
Henry Till
7d52faac72 texi2html: change platforms to unix 
Tested on Darwin
 2015-03-28 17:11:14 -04:00
William A. Kennington III
22018c40d1 cmake: Remove obsolete openssl patch 2015-03-27 11:30:39 -07:00
William A. Kennington III
a0aec63eb8 dejagnu: 1.5.1 -> 1.5.2 2015-03-26 16:11:57 -07:00
William A. Kennington III
767c179a94 Merge branch 'master' into staging 2015-03-26 14:44:05 -07:00
Arseniy Seroka
a062b64cdf Merge pull request #6995 from oxij/add-toluapp 
tolua++ (toluapp): add version 1.0.92
 2015-03-26 20:13:31 +03:00
Jan Malakhovski
46aa9361d6 tolua++ (toluapp): add version 1.0.92 2015-03-26 13:03:17 +00:00
goodwillcoding
62d4564de4 fix the cmake 2.8.x detection of OpenSSL version broken in openssl 1.0.1m 
this is a follow up to security update for openssl: 1.0.1l -> 1.0.1m,
references:
 - http://public.kitware.com/Bug/bug_relationship_graph.php?bug_id=15386
 - http://www.cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5d9a8283cfac15b4a5a07f18d5eb10c1f388505#patch1

(cherry picked from commit 30dd174520827c58f7d58408029f8845878dd021)
Signed-off-by: Domen Kožar <domen@dev.si>
 2015-03-26 11:42:02 +01:00
Rob Vermaas
46eedd9de5 Dohh 2015-03-26 09:48:27 +00:00
Rob Vermaas
ac35d15bcc bazel: Upstream pushed patch, removing patch. 2015-03-26 09:46:31 +00:00
William A. Kennington III
5c3cdaf351 libtool: 2.4.5 -> 2.4.6 2015-03-26 00:59:08 -07:00
William A. Kennington III
4adae43646 binutils: 2.23.1 -> 2.25 2015-03-26 00:24:17 -07:00
Rob Vermaas
7721ff4ccb bazel: add patch suggested by upstream 2015-03-26 06:30:21 +00:00
Tobias Geerinckx-Rice
9060ae8f89 include-what-you-use: pin clang to version 3.5 
Fixes Hydra failure with clang 3.6 <http://hydra.nixos.org/build/20560181>.
Also shorten excessive longDescription a bit.
 2015-03-26 00:29:42 +01:00
Rob Vermaas
f5eed7e14e Add initial version for bazel.io build manager. 2015-03-25 15:12:02 +00:00
Shea Levy
6e3c9d5ce4 Fix fallout of recent cc-wrapper changes 
Fixes tarball except for 56e21d05e8
 2015-03-24 22:13:43 -04:00
Thomas Tuegel
8fd5dd89ac Merge branch 'master' into staging 2015-03-24 17:49:30 -05:00
Shea Levy
f80e342e83 ccache-links is wrapped, so it needs a gcc attribute 2015-03-24 08:59:34 -04:00
vbgl
bc5692f3ec Merge pull request #6939 from henrytill/opam 
opam: update to 1.2.1
 2015-03-23 11:45:05 +01:00
Thomas Tuegel
f47af9b2c8 remove cmake-3.0 2015-03-22 17:03:57 -05:00
Thomas Tuegel
3628370127 remove cmake-2.6.4 2015-03-22 17:02:32 -05:00
Thomas Tuegel
67199bda4e remove cmake-2.8 2015-03-22 17:01:45 -05:00
Thomas Tuegel
a910301e18 make cmake-3.2 the default version 2015-03-22 17:00:46 -05:00
Henry Till
a5fb20d65a opam: update to 1.2.1 2015-03-22 16:33:15 -04:00
j-keck
de9e7bc5f1 sbt: bump to 0.13.8 2015-03-22 19:58:01 +01:00
Michael Raskin
c64b5270fe update luarocks 2015-03-21 21:29:39 +03:00
Thomas Tuegel
7e21c519ba add cmake-3.2.1 
Earlier versions of CMake have a bug in their OpenSSL version detection code.
 2015-03-21 12:32:38 -05:00
Eelco Dolstra
2ed5c2bd6b Set some meta.platforms 
Also fix meta.platform -> meta.platforms in a few places.
 2015-03-20 20:04:42 +01:00
Shea Levy
19cd9f16a0 Merge branch 'staging' 2015-03-20 09:53:34 -04:00
Austin Seipp
9b41cf0281 nixpkgs: arcanist 20150118 -> 20150318 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-03-19 17:46:24 -05:00
Robin Bate Boerop
91004a3485 Merge branch 'Sqitch' into sqitch-pg 2015-03-19 08:11:31 -03:00
lethalman
515bd937f9 Merge pull request #6868 from lancelotsix/add_checkbashisms 
Add checkbashisms package
 2015-03-19 10:42:00 +01:00
Lancelot SIX
7bf0458cb6 Add checkbashisms package 2015-03-18 21:03:30 +01:00
Robin Bate Boerop
a3a98d7242 Improved builder for Sqitch 2015-03-18 10:32:46 -03:00
Jaka Hudoklin
b5298683aa Add chef-dk 2015-03-18 14:17:25 +01:00
Austin Seipp
c8d46c7374 nixpkgs: re2c 0.13.7.5 -> 0.14.1 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-03-17 20:29:46 -05:00
Austin Seipp
70528e9f8e nixpkgs: ninja 1.5.1 -> 1.5.3 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-03-17 20:29:46 -05:00
Robin Bate Boerop
566cd9ba19 Remove unnecessary propagatedBuildInputs line 2015-03-17 09:46:52 -03:00
Vladimír Čunát
e924f05cc3 Merge branch 'master' into staging 2015-03-17 13:35:05 +01:00
Vladimír Čunát
51a8a43dfc Merge #6472: add ddccontrol 2015-03-16 21:52:59 +01:00
Robin Bate Boerop
d73e5d6fbc Handle Sqitch manual 2015-03-15 11:06:01 -04:00
Robin Bate Boerop
d6e0169c6f Add Sqitch database management tool 2015-03-15 09:59:41 -04:00
Lancelot SIX
aa708af8d4 Change current version of uncrustify to 0.61 2015-03-15 09:36:39 +01:00
lethalman
a918bd0151 Merge pull request #6777 from ardumont/add-sqldeveloper-derivation 
[new] sqldeveloper derivation
 2015-03-13 15:09:40 +01:00
Antoine R. Dumont
86062d7a95 Adapt code according to @lethalman's review 
- Use ${bash}/bin/bash
- We cannot use oraclejre7 because sqldeveloper wants a jdk.
 2015-03-13 13:49:26 +01:00
Antoine R. Dumont
c96aff8eb9 Add sqldeveloper derivation 2015-03-12 22:30:47 +01:00
Pascal Wittmann
9cda91bcd8 pmd: update from 4.2.6 to 5.2.3 2015-03-12 21:19:49 +01:00
Peter Simons
6694ef42a9 Merge branch 'master' into staging. 
Conflicts:
      pkgs/development/libraries/gtk+/2.x.nix
      pkgs/tools/security/gnupg/21.nix
      pkgs/top-level/all-packages.nix
 2015-03-10 12:09:43 +01:00
Pascal Wittmann
362f2db258 findbugs: update from 3.0.0 to 3.0.1 2015-03-09 19:35:24 +01:00
Pascal Wittmann
a9719f9dbb global: update from 6.2.12 to 6.3.4 2015-03-09 17:53:45 +01:00
Eric Seidel
1d92bdd1ff help2man: more permissive meta.platforms 2015-03-09 09:43:19 -07:00
Luca Bruno
aae9e49cbc Add setup-hook to hicolor_icon_theme 2015-03-09 15:55:24 +01:00
Vladimír Čunát
0ffb98828e libtool: update 
I see nothing dangerous in NEWS.
Also refactored the expression.
 2015-03-09 15:55:22 +01:00
Vladimír Čunát
0619c852cb automake: use 1.14.* as the default 
I see 1.15 has been released recently,
but that's probably too new to be the default.
 2015-03-09 15:55:21 +01:00
Vincent Laporte
07536bd1fe merlin: update from 2.1.1 to 2.1.2 2015-03-09 12:07:08 +01:00
Michael Raskin
db0f66a188 update cl-launch 2015-03-09 01:03:01 +03:00
Michael Raskin
32ee876647 Update strace 2015-03-08 20:47:24 +03:00
Shea Levy
6b53021205 Merge branch 'master' into staging 2015-03-06 19:02:36 +00:00
Eelco Dolstra
f110e6721f chromedriver: Fix evaluation 2015-03-06 15:11:41 +01:00
Cillian de Róiste
d8a5712ea0 chromedriver: 2.10 -> 2.14 2015-03-06 13:55:42 +01:00
Peter Simons
1d953779b0 Merge remote-tracking branch 'origin/master' into staging. 2015-03-05 12:24:57 +01:00
Eelco Dolstra
6f33aa8465 orig-gcc -> orig-cc 2015-03-04 22:15:46 +01:00
Ricardo M. Correia
e6561c5fb1 cargo: Install man page 
... as well as other artifacts.
 2015-03-04 18:08:52 +01:00
Pascal Wittmann
824accb1cb checkstyle: update from 6.4 to 6.4.1 2015-03-04 12:23:37 +01:00
Vladimír Čunát
4dd253c306 valgrind: fix build with glibc-2.21 by Arch patch 2015-03-03 11:36:43 +01:00
Peter Simons
5341196f01 Merge branch 'master' into staging. 2015-03-02 21:10:36 +01:00
Jordan Woehr
5821e91bd1 Restructure rustc derivations for ease of updating. 
Update racerRust to use new rustcMaster and upgrade cargoSnapshot so racer builds.
 2015-03-02 12:40:55 -07:00
Tobias Geerinckx-Rice
ebf122c36f coan: only build on Linux 2015-03-01 12:32:13 +01:00
Pascal Wittmann
b8d5e2fd6a checkstyle: update from 6.3 to 6.4 2015-03-01 09:53:41 +01:00
Bjørn Forsman
fc966aead0 gradle: don't hardcode gradle-launcher-VERSION.jar 
Instead, figure out VERSION at build-time. This simplifies using
overrideDerivation (no need to copy and modify installPhase).

Also add a check that the file exists (catch potential failure early).
 2015-02-27 12:08:03 +01:00
Moritz Ulrich
12414a34b2 DFU-Programmer: Update to 0.7.2. 2015-02-26 18:20:40 +01:00
lethalman
69d3adbf3d Merge pull request #6425 from grwlf/siptools 
Siptools
 2015-02-26 15:00:17 +01:00
Peter Simons
d6c295e469 Merge remote-tracking branch 'origin/master' into staging. 2015-02-25 20:18:28 +01:00
Luca Bruno
bf521d7b55 Add setup-hook to hicolor_icon_theme 2015-02-24 14:09:31 +01:00
Tobias Geerinckx-Rice
841905e1ea coan: skip checks; they work locally but fail on Hydra 
This reverts commit 607cc808d8.
 2015-02-23 01:45:08 +01:00
Vladimír Čunát
ff1a5a2528 libtool: update 
I see nothing dangerous in NEWS.
Also refactored the expression.
 2015-02-22 20:01:02 +01:00
Vladimír Čunát
a112709b02 automake: use 1.14.* as the default 
I see 1.15 has been released recently,
but that's probably too new to be the default.
 2015-02-22 20:01:02 +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
Fedor Pakhomov
0738edc1fd added ddccontrol package 2015-02-20 00:49:31 +03:00
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
Sergey Mironov
b7adfe0e7d sipp: add the package 2015-02-18 11:52:14 +03:00
Shea Levy
2f061ff16b Merge remote-tracking branch 'origin/staging' 
Darwin and haskell fixes.
 2015-02-17 13:52:37 -05: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
Tobias Geerinckx-Rice
607cc808d8 coan: run checks 2015-02-17 05:13:40 +01:00
Lengyel Balázs
c42bcab582 Update: usb-mdeswitch 2.2.0 -> 2.2.1 2015-02-17 01:33:28 +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
Peter Simons
600135bba5 Merge remote-tracking branch 'master' into staging. 2015-02-13 22:17:12 +01:00
Peter Simons
54ce1a1810 Merge remote-tracking branch 'origin/master' into staging. 
Conflicts:
      pkgs/development/compilers/ghc/head.nix
      pkgs/top-level/haskell-ng.nix
 2015-02-13 22:13:25 +01:00
Vincent Laporte
3a17654b71 ocp-build: update source and website URLs 2015-02-12 06:59:28 +01:00
Shea Levy
127efcd6f6 Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging 
Took "ours" for the conflict and changed libiconvOrEmpty to libiconv

Conflicts:
	pkgs/applications/audio/ncmpcpp/default.nix
 2015-02-11 19:37:22 -05:00
Tobias Geerinckx-Rice
54397283b0 Add include-what-you-use 3.5: static C/C++ #include analyser 2015-02-11 00:14:16 +01:00
Peter Simons
7b99c149a4 Merge branch 'master' into staging. 2015-02-09 16:51:10 +01:00
Peter Simons
c0a0f90a32 gnulib: update Git repository snapshot 2015-02-09 12:58:19 +01:00
William A. Kennington III
5a1089d024 Merge pull request #6245 from edwtjo/samba-collate-urls 
fetchurl: collate samba project urls into a mirror
 2015-02-08 13:38:01 -08:00
Edward Tjörnhammar
33a8a51657 fetchurl: collate samba project urls into a mirror 2015-02-08 22:29:27 +01:00
Dan Peebles
f43c324cee Actually build (a newer version of) unifdef from source, so we can use it on non-linux platforms 2015-02-08 01:32:32 -05:00
Dan Peebles
e9e7bfa6ac Move and restructure objconv a bit 2015-02-08 00:15:54 -05:00
Eric Seidel
e08b9ab8d3 kill libiconvOr* 
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
 2015-02-07 20:29:28 -08:00
lethalman
8b236f2daf Merge pull request #6119 from lethalman/go 
Go packages, buildGoPackage
 2015-02-07 21:30:30 +01:00
Moritz Ulrich
1bbf15eca1 Leiningen: Fix GnuPG Support. 2015-02-07 18:45:35 +01:00
Jaka Hudoklin
4150a5eaf7 Add sauce-connect, sauce labs secure tunnel 2015-02-06 20:35:06 +01:00
Ambroz Bizjak
ec38dbe64b binutils: Move bison to nativeBuildInputs. 2015-02-05 21:26:24 +01:00
Ambroz Bizjak
d56d92ed6b bison: Update to 3.0.4. 2015-02-05 21:26:16 +01:00
Arseniy Seroka
c477e173de Merge pull request #6179 from k0ral/cppcheck 
cppcheck: 1.67 -> 1.68
 2015-02-05 21:58:37 +03:00
Luca Bruno
3f718a743d Add dontInstallSrc flag to buildGoPackage 2015-02-05 18:07:28 +01:00
koral
7ccede4aab cppcheck: 1.67 -> 1.68 2015-02-05 16:58:21 +01:00
Georges Dubus
a50e21dcc7 Exercism: update to 1.9.2 2015-02-05 11:54:19 +01:00
Edward Tjörnhammar
d593f9e3ef Merge pull request #6110 from edwtjo/ihaskell-ng-wrapper 
ihaskell-with-packages: add environment
 2015-02-04 20:43:15 +01:00
Luca Bruno
1c98fc7a9a Port go-repo-root to buildGoPackage 2015-02-04 14:00:26 +01:00
Luca Bruno
0e94ed144d Port etcdctl to buildGoPackage 2015-02-04 13:49:49 +01:00
Mike Sperber
93343fbb33 Reduce size of tradcpp derivation. 
Generate configure using autoconf instead of including it in the patch.
 2015-02-04 13:34:13 +01:00
Luca Bruno
9896829c49 Port gocode to buildGoPackage 2015-02-04 13:30:08 +01:00
Luca Bruno
67f34cbd0d Port gotags to buildGoPackage 2015-02-04 11:41:45 +01:00
Luca Bruno
9c6420580a Port golint to buildGoPackage 2015-02-04 11:37:17 +01:00
Mike Sperber
b611e3fb61 Add tradcpp package, needed for making imake work. 
(cherry picked from commit e0c197b2f4fa53ebd7896940e6e14170664de8e7)
 2015-02-04 09:29:34 +00:00
Eric Seidel
dbf3d31727 make llvm-3.5 the default and remove references to gccApple 
make perl be less dumb

revert change to release.nix
 2015-02-03 14:31:04 -08:00
lethalman
e1a8755b96 Merge pull request #6115 from benley/packer-0.7.5 
Update Packer to 0.7.5
 2015-02-03 13:28:41 +01:00
Pascal Wittmann
a1ce00d81e checkstyle: update from 6.2 to 6.3 2015-02-03 10:43:41 +01:00
Pascal Wittmann
92f1590893 help2man: update from 1.46.4 to 1.46.5 2015-02-03 10:43:41 +01:00
Benjamin Staffin
e6baec8627 Update Packer to 0.7.5 
Change-Id: I7822ac036947fb933fb66730f39426e499a097f9
 2015-02-02 23:55:17 -08:00
Shea Levy
c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae' 
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
 2015-02-02 21:14:28 -05:00
Edward Tjörnhammar
7814b1739b ihaskell-with-packages: add environment 2015-02-02 23:00:46 +01:00
Peter Simons
87c7fb24ed Merge pull request #6027 from offlinehacker/pkgs/godep/add 
Add godep, dependency tool for go
 2015-02-02 11:42:03 +01:00
Michael Raskin
bd38418e1a Update SlimerJS 2015-02-01 18:41:32 +03:00
Ragnar Dahlén
aaa6d79300 Clojure: boot: Add new derivation for boot build tooling 2015-01-30 09:33:55 +00:00
Pascal Wittmann
3c7e1ef698 Merge pull request #5866 from nckx/maven 
maven 3.2.3 -> 3.2.5
 2015-01-30 10:17:35 +01:00
Vincent Laporte
db75b5d052 merlin: update from 2.1 to 2.1.1 2015-01-29 08:43:15 +01:00