alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
99387 commits 217 branches 121 tags 4.5 GiB
Commit graph

4315 commits

Author SHA1 Message Date
Tobias Geerinckx-Rice 8de2eeec33
icmake: 9.00.00 -> 9.02.02 2016-11-09 02:24:28 +01:00
aszlig 09f87eeb7f
gn: Init at 0.0.0.20161008 
This is the standalone version of GN used currently solely for building
Chromium. An upstream bug report is available at
https://crbug.com/504074 to support a standalone build without needing
various components from the Chromium source tree.

Because there isn't a standalone vrsion available, I'm choosing
0.0.0.${date} as the version scheme here so that we don't conflict with
versioned releases from upstream someday[TM].

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2016-11-08 20:11:48 +01:00
Graham Christensen febf3cfd34 Merge pull request #20188 from vbgl/clean-opam 
We don’t need so many opam versions
 2016-11-08 09:55:59 -05:00
Vladimír Čunát 593b46fd1d
Merge branch 'staging' 
There are security fixes inside.
 2016-11-07 23:48:34 +01:00
Periklis Tsirakidis a9428f0c42 Fix breaking empty line 2016-11-06 18:55:43 +01:00
Periklis Tsirakidis 184aefa3c4 rtags: fix darwin build 
Adds dependency to MacOS_SDK 10.9 and accordingly to the macosx
deployment target to configure SDK-based deployment in rtags. In detail,
rtags makes use of launch_activate_socket() which is available in
launchd.h >10.9. Latter is still not available through
apple-opensource-releases, if ever. Thus, the deployment target and
build input have to be added to let rtags build scripts make use of MAC_OS_X_VERSION_MAX_ALLOWED correctly.
 2016-11-06 18:43:58 +01:00
Vladimír Čunát f77801d88d Merge branch 'master' into staging 2016-11-06 11:26:02 +01:00
Joachim Schiele 47d81ed347 leaps: 0.5.1 + add a service + test 2016-11-06 10:34:42 +01:00
Tobias Geerinckx-Rice 784bd713cc
dub: 1.0.0 -> 1.1.0 2016-11-05 18:44:11 +01:00
Vincent Laporte 01597adf07 opam: remove 1.1 2016-11-05 16:28:21 +01:00
Vincent Laporte 22732fc656 opam: remove 1.0.0 2016-11-05 16:28:21 +01:00
Shea Levy ca4b43d180 Merge branch 'master' into staging 2016-11-04 22:57:07 -04:00
Tim Steinbach 1120f2a2b7
xc3sprog: 748 -> 787 2016-11-04 11:23:43 -04:00
Tim Steinbach 1368ff89a0
remake: 3.82 -> 4.1 2016-11-04 10:14:00 -04:00
Peter Hoeg 46e6e2ba17 heroku: [WIP] 3.43.2 -> 3.43.12 and wrap the downloaded binary 
The heroku tool has changed and now downloads a binary to do bulk of the
work.

This PR also downloads the binary to wrap it properly, but due to
https://github.com/NixOS/patchelf/issues/66 we cannot ```patchelf``` the
binary and it doesn't work.

So for now we instead wrap it in a buildFHSUserEnv so at least things
are working again.

Once the patchelf issue has been solved, I'll update this again.
 2016-11-04 14:56:32 +08:00
Tim Steinbach ad43f28e07
Remove Selenium Remote Control 
No longer builds and was a dodgy process anyways
 2016-11-03 22:07:54 -04:00
Pavel Chuprikov 6693e3b06c bear: ignore wrapper calls (#20070) 
Fixes #20056
 2016-11-03 15:27:03 +01:00
Vincent Demeester 1e2f37e9f4
godef: init at 20160620-ee532b9 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-03 08:30:49 +01:00
Pavel Chuprikov 6f17cb108d bear: 2.2.0 -> 2.2.1 
Taken from #20020.
 2016-11-02 18:34:44 +01:00
Robbin C accd0728d8 haskellPackages.tinc: 20160924 -> 20161102 2016-11-02 22:44:38 +08:00
John Wiegley ecbb932957 Merge pull request #19696 from TikhonJelvis/electron-osx 
Electron: Added support for OS X.
 2016-10-31 16:53:30 -07:00
Tuomas Tynkkynen d0ae7b973d Merge remote-tracking branch 'upstream/master' into staging 2016-10-31 20:13:06 +02:00
Vladimír Čunát 31f0fdef32
cmake: minor update 3.6.0 -> 3.6.2 2016-10-29 22:08:25 +02:00
Vladimír Čunát 80d956caf3
intltool: fix the patch URL, #19487 
I hope it's without mistake now. I re-checked the download,
avoiding the binary caches where it would go usually.
 2016-10-29 20:42:18 +02:00
Vladimír Čunát 135a914ded
Merge #19514: cmake: improve if without glibc 
and bootstrap in parallel.
 2016-10-29 17:08:50 +02:00
Jörg Thalheim 4b52969f34 Merge pull request #19967 from frontsideair/flow-33-34 
flow: 0.33.0 -> 0.34.0
 2016-10-29 16:28:43 +02:00
Vladimír Čunát e78ef9cc12
gnumake-3.81: remove 
It doesn't seem to be of any use, except for spitting warnings about md5.
 2016-10-29 15:49:27 +02:00
Guillaume Koenig dd04af4fcc reno: init at 1.8.0 2016-10-29 13:30:18 +02:00
Fatih Altinok 4e5917c007 flow: 0.33.0 -> 0.34.0 2016-10-29 10:48:48 +00:00
Tim Steinbach a79fdce0b8
sbt: 0.13.12 -> 0.13.13 2016-10-28 14:08:20 -04:00
makefu 63dc801899
devpi-client: 2.3.2 -> 2.7.0 
devpi-common: 2.0.8 -> 3.0.1
 2016-10-27 10:11:53 +02:00
Bjørn Forsman 63bf567001 saleae-logic: 1.2.9 -> 1.2.10 (bugfixes) 2016-10-26 17:16:10 +02:00
Bjørn Forsman 0495b0763f saleae-logic: fix 32-bit source hash 
I messed up in commit 314b1fbf0 ("saleae-logic: 1.1.15 -> 1.2.9").
 2016-10-26 17:16:10 +02:00
Michael Raskin da114a21c9 cdecl: switch md5 to sha256 2016-10-26 16:59:37 +02:00
Frederik Rietdijk 7077a270bf Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-26 13:06:43 +02:00
Tuomas Tynkkynen b7aebdbf70 valgrind: 3.11.0 -> 3.12.0 
Also use more multiple outputs and perl shouldn't be a
nativeBuildInput.
 2016-10-25 17:22:00 +03:00
Graham Christensen 6042907d03 Merge pull request #19823 from NeQuissimus/activator_1_3_12 
activator: 1.3.11 -> 1.3.12
 2016-10-24 19:10:20 -04:00
Maciek Starzyk fe53659576 nimble: 0.7.8 -> 0.7.10 2016-10-24 21:09:29 +02:00
Tim Steinbach 1041e0eb1f
activator: 1.3.11 -> 1.3.12 2016-10-24 10:13:12 -04:00
Venkateswara Rao Mandela 74c631b9fa grabserial: 1.7.0 -> 1.9.3 2016-10-23 21:18:47 +05:30
Luca Bruno 57a791b4ff Merge pull request #17751 from michalrus/awf-gtk 
awf: init at 1.3.1
 2016-10-23 14:54:03 +01:00
Vincent Laporte b7b1e42ea4 ocamlPackages.merlin: 2.5.0 -> 2.5.1 2016-10-23 14:49:17 +02:00
Pascal Bach d3c5b5cfe7 gitlab-runner: 1.6.0 -> 1.7.0 2016-10-22 23:25:34 +02:00
Frederik Rietdijk e56832d730 Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-22 17:23:24 +02:00
Vladimír Čunát 7aeca58779 Merge #14404: add a couple of vulkan utilities 2016-10-22 11:37:05 +02:00
Nikolay Amiantov 1e66aa6e5e cppcheck: 1.74 -> 1.76.1 2016-10-21 16:56:40 +03:00
Vladimír Čunát 4d5b893002 Merge #19081: gnome-3.22 
Also master commits are brought in.
 2016-10-20 23:04:10 +02:00
Tim Steinbach eced70026a
activator: 1.3.10 -> 1.3.11 2016-10-20 14:33:39 -04:00
Florent Becker e2bb0c5da8 js_of_ocaml: propagate dependency on ppx_deriving 
ppx_deriving is needed by js_of_ocaml even when it is not used in the code to be compiled
by js_of_ocaml
 2016-10-20 10:19:57 +02:00
Tikhon Jelvis f33fbe5e82 Added support to for OS X to the Electron package. 
For OS X:

  1. I download and extract Electron.app
  2. put it in `$out/Applications`
  3. link the binary to `$out/bin/electron`
 2016-10-19 09:16:21 -07:00
Jascha Geerds e376ed81dc Merge pull request #19677 from jgeerds/deis 
deis: 1.13.0 -> 1.13.3
 2016-10-19 12:57:48 +02:00
Jascha Geerds 7bb75fa887 deisctl: init at 1.13.3 2016-10-19 11:41:54 +02:00
Jascha Geerds c7d9de0e39 deis: Add derivatin metadata 2016-10-19 11:27:02 +02:00
Jascha Geerds b6a616c0b9 deis: 1.13.0 -> 1.13.3 2016-10-19 11:27:02 +02:00
Jascha Geerds 27bf1c0794 deis: Use Godeps workspace instead of deps.nix 2016-10-19 11:27:02 +02:00
Frederik Rietdijk e730b15076 gnome_doc_utils: use python2, rewrite expression 2016-10-18 23:16:05 +02:00
Frederik Rietdijk 2a1c4e9322 itstool: use python2 
See https://github.com/NixOS/nixpkgs/issues/19631 for a proper fix.
 2016-10-18 23:16:03 +02:00
Frederik Rietdijk d0bf57ae85 devpi-client: fix 2016-10-18 23:14:36 +02:00
Frederik Rietdijk f42a7068da scons: use python2 and refactor expression 2016-10-18 23:14:32 +02:00
Tim Steinbach 4ed7db95ac
ammonite-repl: init at 0.7.8 2016-10-16 18:56:28 -04:00
Graham Christensen 104d6965af
hound: fixup meta 2016-10-16 13:10:41 -04:00
Graham Christensen fbadf2da23 Merge pull request #19498 from grahamc/hound 
Initialize Hound package / module
 2016-10-15 13:56:24 -04:00
Graham Christensen 14384f02e8
hound: init at 20160919 2016-10-15 13:32:16 -04:00
Vincent Laporte 5a5d051ed0 ocamlPackages.js_of_ocaml: link to ppx_deriving 2016-10-15 17:59:29 +02:00
Fatih Altinok 8ab8f49827
flow: 0.32.0 -> 0.33.0 2016-10-15 08:24:07 -04:00
Jörg Thalheim 3d5c3da40f Merge pull request #19557 from wizeman/u/upd-mypy 
mypy-lang: 0.4.3 -> 0.4.5
 2016-10-15 10:34:01 +02:00
Daiderd Jordan 9237596519 Merge pull request #19402 from ryanartecona/vagrant/darwin-support 
vagrant: add darwin support
 2016-10-15 00:37:13 +02:00
Ricardo M. Correia 0fd97bc102 mypy-lang: 0.4.3 -> 0.4.5 2016-10-14 20:50:54 +02:00
zimbatm cdbb020a1f fixes bundlerEnv calls 2016-10-14 16:56:42 +01:00
zimbatm 6351c4d24b Merge pull request #19180 from zimbatm/bundler-env-bins 
Bundler env bins
 2016-10-14 11:51:23 +01:00
Daniel Peebles 9703a72f70 Merge pull request #19495 from LnL7/darwin-gdb 
gdb: disable format hardening
 2016-10-13 15:57:19 -04:00
Vladimír Čunát e4d3254101 intltool: fix #19487 patch download 
It's strange.  Maybe they prune the history.
 2016-10-13 21:55:25 +02:00
Daiderd Jordan c5a7728152
gdb: disable format hardening 2016-10-13 21:33:07 +02:00
Will Dietz 48d7c7751a cmake: bootstrap in parallel 
Builds on previous commit so this happens without needing stdenv.glibc.
 2016-10-13 08:07:58 -05:00
Will Dietz 07849e749a cmake: When there is no stdenv.glibc, still fix search paths. 
Apply all of the fixups from preConfigure as well!

For testing purposes I added the following assert:

assert (stdenv ? glibc) -> (stdenv.glibc == stdenv.cc.libc);

To ensure behavior in the case there is a 'stdenv.glibc' (linux-only?)
wasn't changed, which passes in the configurations I could think of.

Not including that since it seems like a bad requirement moving forward.
 2016-10-13 08:05:37 -05:00
Dan Peebles 9617f61164 xcbuild: init at 49f8a592 2016-10-13 00:32:19 -04:00
Franz Pletz cdd019811c
intel-gpu-tools: 1.14 -> 1.16 2016-10-13 03:18:52 +02:00
Benjamin Saunders e0e27c83ab vulkan-loader: 1.0.21.0 -> 1.0.26.0 
Also added asserts to ensure everything stays in sync.
 2016-10-12 13:19:34 +01:00
lummax 9757757170 spirv-tools: init at 20160718 2016-10-12 13:19:34 +01:00
Frederik Rietdijk 67005e3c79 Merge pull request #19230 from nand0p/buildbot-9rc4 
buildbot: 0.9.0rc3 -> 0.9.0rc4
 2016-10-11 17:00:41 +02:00
Jörg Thalheim c4dd3d9b24 Merge pull request #19421 from sternenseemann/master 
valadoc: use newer libgee
 2016-10-10 20:14:43 +02:00
Vincent Laporte cc272dc996 OCaml modules: make explicit some dependencies to ocamlbuild 2016-10-10 19:18:07 +02:00
Vincent Laporte b7cb8f3da7 ocaml-camlidl: fix build on darwin 2016-10-10 19:16:32 +02:00
sternenseemann 2dca4f7ded meson: 0.32.0 -> 0.35.0 2016-10-10 16:03:33 +02:00
sternenseemann f14188e5d0 valadoc: use newer libgee 
Actually valadoc does not depend on libgee 0.8 but on the
libgee 0.8 API as defined in a gir file. I didn't notice the
difference earlier.
 2016-10-10 16:02:54 +02:00
Jörg Thalheim e325f010f0 Merge pull request #17579 from leenaars/arpa2deps 
quick-der library, asn2quickder + hexio tools
 2016-10-10 11:55:45 +02:00
Jörg Thalheim 6f389da98d Merge pull request #19399 from sternenseemann/master 
Add libgee_0_8 and valadoc-unstable
 2016-10-10 11:52:33 +02:00
Jörg Thalheim d4eaac27bf Merge pull request #19416 from lsix/update_7_12 
gdb: 7.11.1 -> 7.12
 2016-10-10 10:09:02 +02:00
Lancelot SIX db4b15bbbf gdb: 7.11.1 -> 7.12 
See http://lists.gnu.org/archive/html/info-gnu/2016-10/msg00007.html
for release announcement
 2016-10-10 09:08:43 +02:00
Jörg Thalheim 5b9913b178
mdk: use sha256 instead of md5 2016-10-10 08:52:13 +02:00
Michiel Leenaars 651beb0592 asn2quickder: init at 0.7RC1 2016-10-09 22:45:51 +02:00
Michiel Leenaars 620f367a60 hexio: init at 1.0RC1 2016-10-09 22:45:51 +02:00
sternenseemann e0faee950c valadoc: init at 2016-10-09 2016-10-09 22:04:14 +02:00
Ryan Artecona 224a6b85fa vagrant: add darwin support 
Vagrant on macOS is distributed as a .dmg installer. Luckily, the
internal contents of that archive resemble that of the .deb we use for
linux. In fact, the similarity is enough that if we move its `embedded`
directory to `opt/vagrant/embedded` and its `bin` to `usr/bin` (and back
again after installation), the derivation's installPhase (which replaces
embedded libs & binaries with those from the package's inputs) can
remain exactly the same between macOS and linux.
 2016-10-09 15:25:41 -04:00
Benjamin Staffin d42fb35713 bazel: Allow linux i686 builds too 2016-10-09 15:18:29 -04:00
Benjamin Staffin 3c39d75543 Merge pull request #19380 from IreneKnapp/nixos-unstable 
Update the packaged Bazel to 0.3.2, and also make it actually work.
 2016-10-09 14:49:23 -04:00
Vincent Laporte 4168706d4f OCaml modules: make explicit some dependencies to ocamlbuild 2016-10-09 11:55:19 +02:00
Vincent Laporte 731b616fdb camlp4: fix for OCaml-4.03 2016-10-09 11:55:19 +02:00
Irene Knapp 81c82bb5d6 Update the packaged Bazel to 0.3.2, and also make it actually work. 2016-10-08 20:54:12 -07:00
zimbatm 80d4117a8c travis: simplify 2016-10-08 22:38:56 +01:00
Andrey Trachenko 67e732d8f8
simavr: init at 1.3 
Closes https://github.com/NixOS/nixpkgs/pull/15961
 2016-10-07 14:11:22 +02:00
Maciek Starzyk 908ad09fd6
nimble: Do not use patchelf. 2016-10-07 07:02:26 -04:00
Kamil Chmielewski 4f6870bb4b vagrant: 1.8.5 -> 1.8.6 2016-10-07 11:15:11 +02:00
Daiderd Jordan 4589a8d750 Merge pull request #19222 from jhhuh/jh 
lsof: fixed for darwin
 2016-10-06 20:38:07 +02:00
Ji-Haeng Huh 86dc8ad0fd lsof-4.89 : change 'stdenv.libc' to 'stdenv.cc.libc' 2016-10-06 15:27:29 +02:00
Ji-Haeng Huh b150da5755 Merge remote-tracking branch 'upstream/master' into jh 2016-10-06 14:39:15 +02:00
Vladimír Čunát 30f551d8b2 Merge branch 'master' into staging 2016-10-05 19:02:48 +02:00
Fernando J Pando 5173cdb9cb buildbot: 0.9.0rc3 -> 0.9.0rc4 
- upgrade to rc4
- un-hardcode path in logwatcher
- fix shebang in wrapper
- add gpl2 license
- remove duplicate wrapper

Tested on CentOS and NixOS
 2016-10-05 11:08:01 -04:00
Bjørn Forsman b0d77698bf gpshell: wrap with gppcscconnectionplugin 
Fixes this:

  $ echo establish_context | gpshell
  establish_context
  establish_context failed with error 0xFFFFFFFFFFFFFFFF (libgppcscconnectionplugin.so.1.0.1: cannot open shared object file: No such file or directory)

Have to use LD_LIBRARY_PATH instead of patchelf, because it's
libglobalplatform.so.6 (from globalplatform package) that needs
libgppcscconnectionplugin.so.1.0.1, not gpshell itself. And because
RPATH doesn't "propagate" from one ELF to another, the library isn't
found. One can argue that globalplatform should depend on
gppcscconnectionplugin, but it touches on the still-unsolved "plugin"
issue in Nix packaging, so leaving that alone.
 2016-10-05 17:06:15 +02:00
Kirill Boltaev 3e646865f4 treewide: use ocaml.version (#19192) 2016-10-05 09:32:30 +02:00
Jörg Thalheim d8f8983df4 Merge pull request #19208 from mstarzyk/nim 
Nim & nimble upgrade
 2016-10-05 09:10:52 +02:00
Thomas Tuegel d067b7bd35
Merge branch 'kde-5' into staging 2016-10-04 21:50:17 -05:00
Ji-Haeng Huh b5b907f3fb corretions for PR comments 2016-10-05 01:27:47 +02:00
Ji-Haeng Huh f02f1a490b Fixing lsof-4.89 for Darwin 2016-10-04 15:37:35 +02:00
Michael Raskin 94e87bd79b lsof: add one more mirror, the second one seems unavailable (and the original site is too picky about NATs) 2016-10-04 10:16:22 +02:00
Maciek Starzyk 8852c5144f nimble: 0.7.4 -> 0.7.8 2016-10-03 21:45:03 +02:00
Jörg Thalheim 888f6a1280 Merge pull request #19199 from wizeman/u/fix-help2man-hash 
help2man: fix hash
 2016-10-03 19:26:44 +02:00
Ricardo M. Correia 2ad13953a4 help2man: fix hash 2016-10-03 18:49:47 +02:00
Matthias Beyer 081c5494ac
radare2: 0.9.7 -> 0.10.6 2016-10-02 17:19:19 +02:00
Tuomas Tynkkynen 19225bf5cc Merge remote-tracking branch 'upstream/master' into staging 2016-10-02 10:36:47 +03:00
Graham Christensen 63393b2d4e Merge pull request #19144 from mbbx6spp/fix-kibana-i686-build 
kibana: fix 4.6.0 for i686
 2016-10-01 22:36:39 -04:00
Markus Hauck c6d4645a8c scalafmt: 0.3.1 -> 0.4.2 2016-10-02 05:06:01 +03:00
Susan Potter c3e57f3095
kibana: fix 4.6.0 for i686 2016-10-01 14:45:22 -05:00
Jörg Thalheim 40f9f9c3f2 Merge pull request #19044 from vbgl/frama-c-aluminium 
frama-c: Sodium -> Aluminium
 2016-10-01 13:34:33 +02:00
Vincent Laporte 19eba38b6c frama-c: Sodium -> Aluminium 2016-09-30 17:49:16 +02:00
Periklis Tsirakidis 3dc6b19325 md2man: enable for darwin 2016-09-30 16:44:44 +02:00
Alexey Shmalko 444710ddb8 Merge pull request #19070 from frontsideair/flow-0.32 
flow 0.30.0 -> 0.32.0
 2016-09-29 16:17:22 +03:00
Joachim F f2e0484292 Merge pull request #19020 from aherrmann/pr_clang_tools 
clang-tools: New package
 2016-09-29 13:16:20 +02:00
Eelco Dolstra 518340624d Merge remote-tracking branch 'origin/master' into staging 2016-09-29 13:06:14 +02:00
Fatih Altinok f9c8dceb11 bump flow version to 0.32 2016-09-29 08:36:07 +00:00
Frederik Rietdijk 1729dcd264 Merge pull request #19065 from peterhoeg/global 
gnu global: 6.5.4 -> 6.5.5
 2016-09-29 08:59:16 +02:00
Peter Hoeg 76aa997f20 gnu global: 6.5.4 -> 6.5.5 2016-09-29 10:40:51 +08:00
Tuomas Tynkkynen 88a1ca3977 Merge pull request #18658 from bendlas/init-systemtap 
systemtap: init at 51b7ca
 2016-09-29 05:03:56 +03:00
Vladimír Čunát 77604964b6 Merge branch 'master' into staging 2016-09-28 17:13:59 +02:00
Peter Simons e521930e08 Merge pull request #18913 from robbinch/pkg-tinc 
tinc: 20160511 -> 20160924
 2016-09-28 16:17:27 +02:00
Andreas Herrmann 4a3e6d3091 clang-tools: New package 
Creates and installs wrapper scripts around the clang-tools from
`llvmPackages.clang-unwrapped`.

Motivation
----------

Fixes #9214

Allows to install clang-tools for C++ development without also installing the
clang compiler and its tool-chain. This way it is possible to use e.g.
`clang-format` without conflicting with e.g. GCC's tool-chain, or the global
system tool-chain.
 2016-09-28 09:31:30 +02:00
Franz Pletz a6d4ea4c2c
treewide: remove executable flags from .nix files 2016-09-27 22:15:00 +02:00
Kamil Chmielewski badd0ce218 go2nix: 1.1.0 -> 1.1.1 2016-09-27 16:49:14 +02:00
Joachim F 0973ee51e4 Merge pull request #18987 from maurer/oasis_typo 
oasis: fix typo
 2016-09-27 00:15:45 +02:00
Matthew Maurer 047f105bd1 oasis: fix typo 
The URL uses the filename of 0.4.6 in the 0.4.7 package.
The package still works currently and provides 0.4.7, because ocamlforge
dispatches entirely based on the number before that, the filename is just
sugar.
 2016-09-26 18:05:08 -04:00
zimbatm d4c66e2f46 Merge pull request #18694 from bachp/runner-master 
gitlab-runner: add package and service
 2016-09-26 22:45:39 +01:00
Joachim F a5580c9951 Merge pull request #18765 from aske/ocaml-move 
Reorganize ocaml packages
 2016-09-26 23:17:53 +02:00
Robbin C 5c5c059912 tinc: 20160511 -> 20160924 
Fix broken build.
 2016-09-27 01:09:45 +08:00
Michael Raskin ccc8c427d5 slimerjs: 0.10.0 -> 0.10.1 2016-09-26 15:49:30 +02:00
Michael Raskin f5375a5a9d luarocks: 2.3.0 -> 2.4.0 2016-09-26 15:49:30 +02:00
Michael Raskin 15e5c5214c jq: fix autoupdate metadata in case it gets updated in future 2016-09-26 15:49:30 +02:00
Frederik Rietdijk 3ba16c8234 Do not use top-level buildPythonPackage or buildPythonApplication 
but instead use the one in pythonPackages.
 2016-09-26 11:10:51 +02:00
Kirill Boltaev e5fa83e7f5 trv: explicitly specify camlp4 packages 2016-09-26 02:36:49 +03:00
Kirill Boltaev 8447340904 omake: mark as broken 2016-09-26 02:36:49 +03:00
Kirill Boltaev a8da2da780 ocamlmod: 0.0.7 -> 0.0.8 2016-09-26 02:36:49 +03:00
Kirill Boltaev e61663a233 treewide: move to ocaml-ng system 2016-09-26 02:36:49 +03:00
Frederik Rietdijk 0bd31510f0 dfeet: do not use top-level python packages 
and use mkPythonDerivation.
 2016-09-25 23:00:08 +02:00
Susan Potter 46ff1c385f kibana: 4.5.2 -> 4.6.0 (#18277) 
Includes supporting binary src for x86_64-linux, x86_64-darwin, and
i686-linux which were previously unsupported and failed grossly before.
 2016-09-25 21:40:15 +02:00
Aneesh Agrawal bfbca9dacd jq: Fix CVE-2015-8863 and CVE-2016-4074 (#18908) 
jq has not had a release since v1.5 in August 2015, so backport both of
these patches (the fix for CVE-2015-8863 is in the current master, while
the fix for CVE-2016-4074 is not yet in master).
 2016-09-25 15:14:52 +02:00
Lancelot SIX 444c0420d8 pkgs.autoconf-archive: 2016.03.20 -> 2016.09.16 (#18706) 2016-09-25 14:29:35 +02:00
Franz Pletz 7203a0e94c Merge pull request #18576 from maurer/oasis 
oasis: 0.4.6 -> 0.4.7
 2016-09-25 07:49:01 +02:00
Rok Garbas 60f31c6077 pypi2nix: 1.4.0 -> 1.5.0 (#18941) 2016-09-25 04:42:23 +02:00
Vladimír Čunát aaa29843c3 Merge #18909: flex: 2.6.0 -> 2.6.1 
It contains security fixes.
 2016-09-24 18:54:44 +02:00
Vladimír Čunát fffc7638cd Merge branch 'master' into staging 2016-09-24 18:54:31 +02:00
Aneesh Agrawal bb349421c1 rr: pin Python to Python 2 
rr requires Python>=2.7, but does not support Python 3.
 2016-09-24 15:05:42 +02:00
Graham Christensen feec685636
flex: 2.6.0 -> 2.6.1 2016-09-23 21:42:08 -04:00
Matthew Maurer 6f5d3bec32 oasis: 0.4.6 -> 0.4.7 2016-09-23 19:58:47 -04:00
Tim Steinbach 084fa30411 gradle: 3.0 -> 3.1 (#18898) 2016-09-24 00:57:09 +02:00
Pascal Bach 373b37f179 gitlab-runner: init at 1.6.0 2016-09-23 22:38:56 +02:00
Joachim F ac8206e31d Merge pull request #17147 from regnat/ocamlUpdates 
ocamlPackages : update some packages
 2016-09-23 19:55:10 +02:00
Daiderd Jordan 8377bf39c3 Merge pull request #18739 from veprbl/ccache_fix2 
ccache: improve compiler wrapper
 2016-09-22 20:40:41 +02:00
Benjamin Staffin a28b8ec771 Merge pull request #18809 from teh/bazel-update 
bazel: 20150326.981b7bc1 -> 0.3.1
 2016-09-22 02:28:10 -04:00
rushmorem 89c8b6c379 glide: 0.10.2 -> 0.12.2 2016-09-21 21:53:00 +02:00
Joachim F 3b19fcb2dc Merge pull request #18728 from dudebout/cscope-cleanup 
Cscope cleanup
 2016-09-21 20:36:29 +02:00
Tom Hunger 93c773391d bazel: 20150326.981b7bc1 -> 0.3.1 2016-09-21 18:42:43 +01:00
Eelco Dolstra ddd41a509a virtualbox: Drop dontPatchELF hack 
However, this also requires ad8f31df7f
to get rid of gcc_multi.out in the closure.
 2016-09-20 18:02:19 +02:00
Eelco Dolstra 7a4209c356 Merge remote-tracking branch 'origin/master' into staging 2016-09-20 17:46:09 +02:00
Eelco Dolstra 5f8a330d40 outputDocdev -> outputDevdoc 
For consistency with the devdoc output.
 2016-09-20 17:44:48 +02:00
Daiderd Jordan 542babc3d2 Merge pull request #18670 from holidaycheck/sauceconnect-4.4.0 
sauce-connect: 4.3.16 -> 4.4.0
 2016-09-20 12:35:15 +02:00
Eelco Dolstra e03d1ababa cmake-2.8: Fix build 
The use of multiple outputs in libarchive broke it. Since this is an
ancient version of cmake, let's fix it by just using
--no-system-libarchive.
 2016-09-20 11:56:11 +02:00
rushmorem 391ea6f748 glock: init at 20160816 2016-09-20 10:56:11 +02:00
Frederik Rietdijk 5a1d3be81c Merge pull request #18647 from nand0p/buildbot-9rc3 
buildbot: 0.9.0rc2 -> 0.9.0rc3
 2016-09-18 22:57:18 +02:00
Dmitry Kalinkin 96d2a6c434 ccache: improve compiler wrapper 
* move compiler detection logic from nix to bash
* robust inheritance of isGNU/isClang

Fixes: d3274e8ae3 ('ccache: support clang in ccache.links')
Fixes: 634824d50b ('ccache: fix references to stdenv.cc.cc.isClang')
 2016-09-18 14:54:12 -04:00
Joachim Fasting 634824d50b
ccache: fix references to stdenv.cc.cc.isClang 
afa64a60bc breaks the
tarball job https://hydra.nixos.org/build/40817224/nixlog/1/raw

The problem is that there is a stdenv.cc.cc.isGNU but no corresponding
stdenv.cc.cc.isClang. The "correct" fix would be to add
stdenv.cc.cc.isClang but this is simpler.
 2016-09-18 15:58:53 +02:00
Nicolas Dudebout 9cea84a085 cscope: 15.8a -> 15.8b 2016-09-18 09:22:27 -04:00
Nicolas Dudebout 718678bba8 cscope: remove unused dependency on pkgconfig 2016-09-18 09:22:27 -04:00
Nicolas Dudebout 2dc6e41147 cscope: make emacs support optional 
Other nixpkgs offer cscope-emacs integration and they use package.el to
register the package. When using such package, only the cscope binary is
required.
 2016-09-18 09:22:27 -04:00
Nicolas Dudebout 03ae8729d4 cscope: do all emacs mode creation in postInstall 
One part of the emacs mode creation was done in preConfigure, and one in
postInstall, but both could be done together.
 2016-09-18 09:22:27 -04:00
Daiderd Jordan afa64a60bc Merge pull request #18135 from veprbl/ccache_fix 
ccache: enable build on darwin
 2016-09-17 22:35:43 +02:00
Dmitry Kalinkin d3274e8ae3 ccache: support clang in ccache.links 2016-09-17 16:32:38 -04:00
Dmitry Kalinkin d7f22f96b0 ccache: enable build on macOS 2016-09-17 16:32:37 -04:00
Mathias Schreck 7e7a54aba0 sauce-connect: refactor patchPhase instead of reordering phases 2016-09-17 19:49:01 +02:00
Mathias Schreck 50111d5cf4 sauce-connect: 4.3.16 -> 4.4.0 2016-09-17 19:49:01 +02:00
Joachim F 1868783a90 Merge pull request #18619 from RamKromberg/init/mandoc 
Init mandoc at 1.13.4 & replace groff with it in libedit and bsdbuild
 2016-09-17 16:15:35 +02:00
Daiderd Jordan 8e8c5a3429 Merge pull request #18424 from ppickfor/rainicorn 
rainicorn: init at 1.0.0
 2016-09-17 11:11:41 +02:00
rushmorem 6b8275eaf9 goa: init at 1.0.0 2016-09-17 01:15:14 +02:00
Vladimír Čunát 52e1a198cf Merge branch 'master' into staging 2016-09-17 00:31:34 +02:00
Fernando J Pando b31b262623 buildbot: 0.9.0rc3 wrapper fix 
- Tested on Linux
- Tested binary execution
- Fixes missing PYTHONPATH
 2016-09-16 16:27:49 -04:00
Herwig Hochleitner 59ccacbcd3 systemtap: clean up as per feedback 
- shorter description
- move systemtap into linuxPackages
  this is only necessary for the wrapper
  systemtap also has a dyninsn backend to instrument userspace apps
  we could experiment with other platforms, using this
- get rid of stow build dependency
- update version
- minor cleanup steps
 2016-09-16 22:24:49 +02:00
Fernando J Pando 57726b54af Remove obsolete buildbot slave 
buildbot-slave has been replaced with buildbot-worker.
 2016-09-16 11:20:26 -04:00
Fernando J Pando 164036d728 buildbot: 0.9.0rc2 -> 0.9.0rc3 
Tested on Linux
Tested Binary Execution
 2016-09-16 11:20:02 -04:00
Herwig Hochleitner b019424e5d systemtap: init at 51b7ca 
master needs to be tracked in order to support recent kernels
 2016-09-16 12:19:59 +02:00
Kamil Chmielewski 914e0e594c buildGoPackage: deps.json -> deps.nix in NIXON 
https://github.com/NixOS/nixpkgs/pull/17254#issuecomment-245295541

* update docs to describe `deps.nix`
* include goDeps in nix-shell GOPATH
* NixOS 16.09 rel notes about replacing goPackages
 2016-09-16 00:04:55 +01:00
Ram Kromberg 7238a94584 bsdbuild: groff -> mandoc 2016-09-15 20:44:49 +03:00
Joachim F 09646cc8a5 Merge pull request #18501 from tvon/update/gocd-server-16.9.0-4001 
gocd-server: 16.7.0-3819 -> 16.9.0-4001
 2016-09-15 13:17:17 +02:00
Joachim F cbdad9b5e9 Merge pull request #18502 from tvon/update/gocd-agent-16.9.0-4001 
gocd-agent: 16.7.0-3819 -> 16.9.0-4001
 2016-09-15 13:17:06 +02:00
Joachim F 068106cf6a Merge pull request #18571 from peterhoeg/wp-cli 
wp-cli: 0.23.1 -> 0.24.1
 2016-09-14 17:56:03 +02:00
Kirill Boltaev 0f37287df5 treewide: explicitly specify gtk version 2016-09-13 21:09:24 +03:00
Jaka Hudoklin 7a9dd489d6 Merge pull request #18481 from offlinehacker/pkgs/docker/1.12.1 
docker: 1.10.3 -> 1.12.1
 2016-09-13 15:59:18 +02:00
Peter Hoeg baf401cdf4 wp-cli: 0.23.1 -> 0.24.1 2016-09-13 18:20:51 +08:00
Nikolay Amiantov 4748709926 Merge commit 'refs/pull/18498/head' of git://github.com/NixOS/nixpkgs 2016-09-13 12:51:34 +03:00
Franz Pletz fb9117efa6 Merge pull request #18488 from chris-martin/md5-2 
Miscellaneous packages: Use sha256 instead of md5 (part 2)
 2016-09-13 07:11:43 +02:00
Kirill Boltaev bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Jesse Haber-Kucharsky 99e06fe771 opam, aspcud: init packages for external solver (#16938) 
The opam package manager relies on external solvers to determine package
management decisions it makes related to upgrades, new installations,
etc.

While, strictly speaking, an external solver is optional, aspcud is
highly recommended in documentation. Furthermore, even having a
relatively small number of packages installed quickly causes the limits
of the interal solver to be reached (before it times out).

Aspcud itself depends on two programs from the same suite: gringo, and
clasp.

On Darwin, Boost 1.55 (and thus Gringo) do not build, so we only support
Aspcud on non-Darwin platforms.
 2016-09-12 10:44:50 +02:00
Jaka Hudoklin ea2270aa7c go-md2man: init at 1.0.6 2016-09-12 01:31:58 +02:00
Lancelot SIX 1708c369fa
texinfo: 6.1 -> 6.3 
See http://lists.gnu.org/archive/html/info-gnu/2016-09/msg00004.html
for release anouncement
 2016-09-11 12:24:38 +02:00
Tom von Schwerdtner 9a2f40c024 gocd-agent: 16.7.0-3819 -> 16.9.0-4001 2016-09-10 18:33:14 -04:00
Tom von Schwerdtner 18f26f3563 gocd-server: 16.7.0-3819 -> 16.9.0-4001 2016-09-10 18:32:43 -04:00
Chris Martin d1e23ed8ed mk: md5->sha256 2016-09-10 14:08:26 -04:00
Chris Martin 5a3560fecf gnumake-3.80: md5->sha256 2016-09-10 14:06:13 -04:00
Tuomas Tynkkynen 290db94f04 Merge remote-tracking branch 'upstream/master' into staging 2016-09-09 02:40:47 +03:00
Peter Pickford 841d7e157b rainicorn: init at 1.0.0 2016-09-08 13:56:42 -07:00
Michael Raskin dabf09aa92 cmake: update setup-hook to take -isystem instead of -I into account 2016-09-08 09:10:00 +02:00
Michael Raskin 592e265caa antlr3_4: init at 3.4 2016-09-06 18:19:17 +02:00
Michael Raskin 8f284c0a94 antlr3_5: init at 3.5.2 2016-09-06 18:19:17 +02:00
Aneesh Agrawal b1c83e8928 vagrant: make patches a list (#18364) 
This has more correct semantics, allows for multiple patches, and makes
using overrideDerivation to add/remove patches work as expected.
 2016-09-06 16:52:01 +02:00
Sheena Artrip 47e6d7d88c minizinc: init at 2.0.14 (#18308) 2016-09-06 06:16:42 +02:00
Ram Kromberg ccd5c6e47c bsdbuild: init at 3.1 (#18069) 2016-09-05 23:28:42 +02:00
Eelco Dolstra 78178d5854 systemd: Separate lib output 
This moves libsystemd.so and libudev.so into systemd.lib, and gets rid
of libudev (which just contained a copy of libudev.so and the udev
headers). It thus reduces the closure size of all packages that
(indirectly) depend on libsystemd, of which there are quite a few (for
instance, PulseAudio and dbus). For example, it reduces the closure of
Blender from 430.8 to 400.8 MiB.
 2016-09-05 19:17:14 +02:00
Peter Hoeg a359d330dc vagrant: 1.8.4 -> 1.8.5 (#18283) 
Includes https://github.com/mitchellh/vagrant/pull/7611 to fix issue with permissions on ~/.ssh/authorized_keys.
 2016-09-05 14:44:34 +02:00
Tuomas Tynkkynen 1e665de6b4 flow: Broken on i686 
http://hydra.nixos.org/build/39411311

````
hh_shared.c:142:6: error: #error "hh_shared.c requires a architecture that supports memfd_create"
````
 2016-09-02 18:54:39 +03:00
zimbatm d376b10105 packer: fixes compilation issues (#18217) 
* the default output for buildGoPackage is not "out" anymore
* go 1.7 has removed the linker flag deprecation which breaks packer's
  Makefile
 2016-09-02 17:13:38 +02:00
Tuomas Tynkkynen 3364230d56 Disable bunch of non-compiling packages on Darwin 
These ones have a "Last successful build" timestamp in the 2014s or
2015s. Presumably no one will notice if we now stop building them.

softether_4_18              2015-09-20  http://hydra.nixos.org/build/39418483
lensfun                     2014-09-30  http://hydra.nixos.org/build/39394104
net_snmp                    2015-09-20  http://hydra.nixos.org/build/39410553
djview                      2015-08-11  http://hydra.nixos.org/build/39413233
libmusicbrainz2             2015-09-20  http://hydra.nixos.org/build/39410106
fox_1_6                     2014-05-07  http://hydra.nixos.org/build/39410858
libofx                      2015-09-24  http://hydra.nixos.org/build/39423507
yacas                       2014-09-30  http://hydra.nixos.org/build/39393150
iomelt                      2014-09-30  http://hydra.nixos.org/build/39408486
softether                   2015-09-20  http://hydra.nixos.org/build/39425800
mp4v2                       2014-09-30  http://hydra.nixos.org/build/39421899
virtuoso7                   2014-09-21  http://hydra.nixos.org/build/39415206
man_db                      2015-04-23  http://hydra.nixos.org/build/39404236
libdiscid                   2014-09-30  http://hydra.nixos.org/build/39412202
zabbix22.agent              2014-09-21  http://hydra.nixos.org/build/39412149
vidalia                     2015-08-06  http://hydra.nixos.org/build/39411500
libmtp                      2015-09-20  http://hydra.nixos.org/build/39419199
wxGTK29                     2015-09-20  http://hydra.nixos.org/build/39415296
ncmpcpp                     2015-11-06  http://hydra.nixos.org/build/39404455
libtorrent                  2014-09-21  http://hydra.nixos.org/build/39394646
shishi                      2014-03-21  http://hydra.nixos.org/build/39418874
ocaml_3_12_1                2014-09-30  http://hydra.nixos.org/build/39392996
djview4                     2015-08-11  http://hydra.nixos.org/build/39427799
vimNox                      2014-05-23  http://hydra.nixos.org/build/39397012
ttfautohint                 2015-08-06  http://hydra.nixos.org/build/39398330
libraw                      2015-09-24  http://hydra.nixos.org/build/39402271
wxGTK30                     2015-09-20  http://hydra.nixos.org/build/39401871
sbcl_1_2_5                  2015-09-20  http://hydra.nixos.org/build/39426091
prover9                     2014-09-30  http://hydra.nixos.org/build/39406476
rcs                         2015-08-25  http://hydra.nixos.org/build/39392037
gpac                        2015-09-24  http://hydra.nixos.org/build/39399470
virtuoso6                   2014-09-30  http://hydra.nixos.org/build/39398651
xlslib                      2015-09-24  http://hydra.nixos.org/build/39410387
ucommon                     2015-03-27  http://hydra.nixos.org/build/39414040
commoncpp2                  2014-09-30  http://hydra.nixos.org/build/39420117
virtuoso                    2014-09-21  http://hydra.nixos.org/build/39399978
miniHttpd                   2014-09-30  http://hydra.nixos.org/build/39392925
mpack                       2014-09-26  http://hydra.nixos.org/build/39399535
nbd                         2014-09-26  http://hydra.nixos.org/build/39401367
newsbeuter-dev              2014-07-29  http://hydra.nixos.org/build/39406259
gimp_2_8                    2015-09-20  http://hydra.nixos.org/build/39436271
gimp                        2015-09-20  http://hydra.nixos.org/build/39435976
zabbix20.agent              2014-09-30  http://hydra.nixos.org/build/39393242
gst_all_1.gst-plugins-good  2015-09-20  http://hydra.nixos.org/build/39408506
ocaml_4_00_1                2014-09-30  http://hydra.nixos.org/build/39399526
inadyn                      2014-09-30  http://hydra.nixos.org/build/39426389
gst_all_1.gst-plugins-bad   2015-09-20  http://hydra.nixos.org/build/39392970
zabbix.agent                2014-09-30  http://hydra.nixos.org/build/39421412
cmake-2_8                   2015-09-24  http://hydra.nixos.org/build/39399443
liblastfm                   2015-08-06  http://hydra.nixos.org/build/39421812
newsbeuter                  2014-07-29  http://hydra.nixos.org/build/39396605
sdcv                        2014-09-26  http://hydra.nixos.org/build/39412928
 2016-09-01 20:39:33 +03:00
Frederik Rietdijk f2fc64a412 Remove buildbot_8 
We now have a newer version and the older version didn't work anymore
anyway because it depended on sqlalchemy7 which was itself broken,
because it depended on an older version of sqlite.
 2016-09-01 17:46:27 +02:00
Tuomas Tynkkynen 8c4aeb1780 Merge staging into master 
Brings in:
    - changed output order for multiple outputs:
      https://github.com/NixOS/nixpkgs/pull/14766
    - audit disabled by default
      https://github.com/NixOS/nixpkgs/pull/17916

 Conflicts:
	pkgs/development/libraries/openldap/default.nix
 2016-09-01 13:27:27 +03:00
Jaka Hudoklin e0da6b16f6 Merge pull request #17959 from offlinehacker/pkgs/kube-aws/init 
kube-aws: init at 0.8.1
 2016-09-01 11:58:38 +02:00
Fernando J Pando d86114cbd5 buildbot: init at 0.9.0rc2 
buildbot: init
buildbot-0.9.0rc2

buildbot-worker: init
buildbot-worker-0.9.0rc2

buildbot-ui: init
buildbot-www-0.9.0rc2

buildbot-full: init
buildbot-www-0.9.0rc1
buildbot-waterfall-view-0.9.0rc2
buildbot-console-view-0.9.0rc2
 2016-09-01 11:31:15 +02:00
Frederik Rietdijk 7cf000b77e buildbot -> buildbot_8 2016-09-01 11:31:15 +02:00
Sander van der Burg c4e67a3dc9 node-webkit: fix library references with multiple output derivations 2016-08-31 20:48:23 +00:00
Tuomas Tynkkynen d3dc3d4130 Merge remote-tracking branch 'dezgeg/shuffle-outputs' into staging 
https://github.com/NixOS/nixpkgs/pull/14766
 2016-08-30 12:43:37 +03:00
Robin Gloster 6f21201f93
rtags: git-2016-04-29 -> 2.3 
should fix the darwin build
 2016-08-29 13:33:36 +00:00
Vladimír Čunát f688ea37d8 bear: init at 2.2.0 2016-08-29 14:13:01 +02:00
Tuomas Tynkkynen 89833c0c72 binutils: Shuffle outputs 2016-08-29 14:49:54 +03:00
Tuomas Tynkkynen 8ed3d6a7e5 cmake 2.8: Fix build with shuffled outputs 2016-08-29 14:49:52 +03:00
Tuomas Tynkkynen a17216af4c treewide: Shuffle outputs 
Make either 'bin' or 'out' the first output.
 2016-08-29 14:49:51 +03:00
Robin Gloster 306cd03cdb
indent: disable format hardening 2016-08-29 01:29:00 +00:00
obadz 3de6e5be50 Merge branch 'master' into staging 
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
 2016-08-27 23:54:54 +01:00
Robin Gloster 193a57fa48
noweb: remove obsolete substituteInPlace 2016-08-27 21:54:55 +00:00
Robin Gloster fee9b3410e Merge pull request #18014 from zimbatm/buildGoPackage-1.7 
Build go package 1.7
 2016-08-26 15:41:08 +00:00
zimbatm db3de7a900 leaps: mark as broken 
The package sha256 is wrong. After fixing it the build has dependency
issues like:

    go/src/github.com/jeffail/leaps/cmd/leaps/bindata_assetfs.go:203:2:
    cannot find package "github.com/elazarl/go-bindata-assetfs" in any
    of:

/cc @qknight
 2016-08-26 13:46:05 +01:00
Matthias Beyer ae428c6411 rustfmt: 0.4 -> 0.6 2016-08-26 14:17:14 +02:00
Markus Hauck df343d4824 scalafmt: 0.2.11 -> 0.3.1 (#18004) 2016-08-26 07:03:41 +00:00
Lancelot SIX 0c12ae5615
binutils: 2.26.1 -> 2.27 
Release announcement at
http://lists.gnu.org/archive/html/info-gnu/2016-08/msg00012.html
 2016-08-26 08:51:09 +02:00
Robin Gloster 29649b93b8
arcanist: 20160516 -> 20160825 2016-08-25 23:27:56 +00:00
Moritz Ulrich 78305bc5a1 Merge pull request #17944 from steveeJ/racerd-bump 
rust: bump registry and racerd
 2016-08-26 00:03:34 +02:00