Commit graph

8425 commits

Author SHA1 Message Date
Katharina Fey 2f52a435f9
dive: 0.5.0 -> 0.6.0 2019-02-21 14:37:49 +01:00
Frederik Rietdijk 5871da418f Merge staging into python-unstable 2019-02-21 08:02:10 +01:00
Frederik Rietdijk e2cd07b997 Merge staging-next into staging 2019-02-21 07:54:33 +01:00
Jörg Thalheim c41ed752dc
radare2: 3.2.1 -> 3.3.0 2019-02-21 00:06:55 +00:00
Robert Schütz 83568dc5fe
Merge pull request #55916 from rvolosatovs/update/mbed-cli
mbed-cli: 1.8.3 -> 1.9.1
2019-02-20 17:25:26 +01:00
Matthew Bauer ae3e8355ab
Merge pull request #56021 from illegalprime/fix/cmake-cross
cmake: add ability to cross-compile cmake
2019-02-19 22:34:15 -05:00
worldofpeace dd4a1c1d66
mbed-cli: Enable tests 2019-02-19 20:45:53 +01:00
Sam Stites 9b38f6f09f
bump cmake to 3.13.4 2019-02-19 13:21:30 -05:00
Matthew Bauer b1bbd94bb6 Merge remote-tracking branch 'NixOS/master' into staging 2019-02-18 20:36:48 -05:00
Michael Eden cbbde55382 cmake: add ability to cross-compile cmake 2019-02-18 17:41:03 -05:00
Carlos Morera de la Chica 9c406336f1 bazel: fix bash completion 2019-02-18 11:34:35 +01:00
Freezeboy 8f87a61de2 Replace platforms.linux with platforms.darwin for expressions that compile on darwin too (too restrictive platforms) 2019-02-18 10:56:58 +01:00
Ryan Mulligan 3b8ee87c27
Merge pull request #53462 from astro/svd2rust
svd2rust: init at 0.14.0
2019-02-17 21:02:28 -08:00
Ryan Mulligan 96e17d4db9
Merge pull request #54835 from artemist/one_gadget
one_gadget: init at 1.6.2
2019-02-17 18:14:25 -08:00
Ryan Mulligan 0a0f0b355b
Merge pull request #55714 from mpisanko/leiningen-2.9.0
upgrade leiningen to latest (2.9.0)
2019-02-17 14:20:26 -08:00
Ryan Mulligan cf73f3fe2e
Merge pull request #55970 from tadfisher/ktlint
ktlint: init at 0.30.0
2019-02-17 14:17:28 -08:00
Tad Fisher b1eb421c1a ktlint: init at 0.30.0 2019-02-17 13:44:55 -08:00
Michal Pisanko e53ea1fb01 leiningen: 2.8.3 -> 2.9.0 2019-02-18 08:12:39 +11:00
worldofpeace 6062409767
Merge pull request #55653 from rvolosatovs/update/gotools
gotools: 2018-09-11 -> 2019-02-11
2019-02-17 15:30:42 +00:00
Ryan Mulligan a0cfb6ec6d
Merge pull request #55935 from zimbatm/mdsh-0.1.2
mdsh: init at 0.1.2
2019-02-17 07:22:15 -08:00
Ryan Mulligan a954ca52e5
Merge pull request #55035 from uri-canva/bazel-deps
bazel-deps: 2018-11-01 -> 2019-02-01
2019-02-17 06:49:31 -08:00
Frederik Rietdijk 6f0555b030 python.pkgs: rename pytestflakes to pytest-flakes
to follow naming guideline
2019-02-17 14:40:55 +01:00
Frederik Rietdijk 9dc262c659 pants: mark as broken 2019-02-17 14:40:55 +01:00
worldofpeace da26dca320
Merge pull request #55652 from rvolosatovs/update/gometalinter
gometalinter: 2.0.11 -> 3.0.0
2019-02-17 13:26:00 +00:00
zimbatm 4fad0de82a
mdsh: init at 0.1.2 2019-02-17 11:18:04 +01:00
worldofpeace d12463b01b
Merge pull request #55808 from r-ryantm/auto-update/sysprof
sysprof: 3.31.1 -> 3.30.2
2019-02-17 04:29:33 +00:00
worldofpeace e407f51aaf sysprof: 3.31.1 -> 3.30.2
This was accidentally updated to an unstable version
and is now at the latest stable release.
2019-02-16 23:26:49 -05:00
Roman Volosatovs 15b1356539
mbed-cli: 1.8.3 -> 1.9.1 2019-02-16 21:06:34 +01:00
Jaka Hudoklin ca472cdff5
k6: init at 0.23.1 (#55824)
* k6: init at 0.23.1

* k6: fix license

Co-Authored-By: offlinehacker <offlinehacker@users.noreply.github.com>
2019-02-16 13:20:34 +01:00
Frederik Rietdijk fd48a94b62 Merge staging-next into staging 2019-02-16 09:30:46 +01:00
Frederik Rietdijk 6fe10d2779 Merge master into staging-next 2019-02-16 09:29:54 +01:00
Will Dietz 6ff00fe96a elfutils: 0.175 -> 0.176
https://sourceware.org/ml/elfutils-devel/2019-q1/msg00147.html

Since it'short, NEWS is reproduced below
------

* NEWS *

build: Add new --enable-install-elfh option.
       Do NOT use this for system installs (it overrides glibc elf.h).

backends: riscv improved core file and return value location support.

Fixes CVE-2019-7146, CVE-2019-7148, CVE-2019-7149, CVE-2019-7150,
      CVE-2019-7664, CVE-2019-7665
2019-02-15 14:08:21 -06:00
Jaka Hudoklin 1775f6c393
Merge pull request #55809 from zaninime/kustomize
kustomize: 1.0.11 -> 2.0.1
2019-02-15 19:50:12 +01:00
Ryan Mulligan 64b05b8733
Merge pull request #55236 from r-ryantm/auto-update/utop
ocamlPackages.utop: 2.2.0 -> 2.3.0
2019-02-15 07:10:53 -08:00
Francesco Zanini 4698105747 Remove deps.nix again 2019-02-15 16:05:32 +01:00
Graham Christensen 67e0de1629
Merge pull request #55321 from gilligan/kind-update
kind: 0.0.1 -> 0.1.0
2019-02-15 09:26:06 -05:00
Francesco Zanini 24277a2ec8 Restore writing the version info correctly 2019-02-15 09:52:47 +01:00
Francesco Zanini d0b0cf7cd9 Update to 2.0.1, lock deps with dep2nix 2019-02-15 09:52:01 +01:00
R. RyanTM 7c860b5fd8 conan: 1.11.2 -> 1.12.0 (#55335)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/conan/versions
2019-02-14 21:53:05 +01:00
Frederik Rietdijk a25d48cd4f Merge master into staging 2019-02-14 11:35:50 +01:00
Jan Tojnar 606ceda352
gnome3: stop using aliases 2019-02-14 02:31:15 +01:00
Philipp Middendorf d4b3f3bbdd fdroidserver: 1.1 -> 1.1.1 (#55718) 2019-02-13 21:45:44 +01:00
Frederik Rietdijk 8b05b829be Merge staging-next into staging 2019-02-13 13:27:42 +01:00
Frederik Rietdijk 7257dedd7c Merge master into staging-next 2019-02-13 12:33:29 +01:00
Roman Volosatovs fc25b3d321
gometalinter: 2.0.11 -> 3.0.0 2019-02-12 18:51:28 +01:00
Roman Volosatovs 7482b48b7e
gotools: 2018-09-11 -> 2019-02-11 2019-02-12 18:51:02 +01:00
Daniel Peebles ccc02c5d82
Merge pull request #55350 from homich1991/master
chromedriver: 2.43 -> 2.46
2019-02-12 08:55:26 -05:00
Will Dietz 0f14c9cd8f ninja: patch to fix w/musl, see upstream issue 2019-02-11 22:41:45 -06:00
Will Dietz 690fb6e723
Merge pull request #55166 from dtzWill/update/bison-3.3.2
bison: 3.3.1 -> 3.3.2
2019-02-11 18:06:04 -06:00
Florian Klink 659ebb6869 vagrant: 2.2.0 -> 2.2.3 2019-02-12 00:23:46 +01:00
Daiderd Jordan 4195766cea
luarocks: remove unzip from setup-hook
The unzip variable is only set if it's an attribute and it's a
propagated input so it is already part of PATH.
2019-02-11 21:38:10 +01:00
Daiderd Jordan be1291e11b
luarocks: patch sw_vers and gcc on darwin
The sw_vers binary is not part of the stdenv and it would make builds
impure based on what macOS version they where built on.
2019-02-11 21:38:09 +01:00
R. RyanTM 3e70c0b4e2 ocamlPackages.cppo: 1.6.4 -> 1.6.5
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cppo/versions
2019-02-10 19:05:09 +01:00
Matthew Bauer 57cb5fe1f2
Merge pull request #55519 from FlorianFranzen/staging
Staging
2019-02-10 09:29:10 -05:00
Vladimír Čunát c40f211499
Merge branch 'staging-next'
It's not completely without regressions, but ATM it seems to bring more
upsides than downsides and the iteration is too long already.
2019-02-10 14:20:49 +01:00
Vladimír Čunát 64edccb463
treewide: fix missing libs after libtool pruning #51767 2019-02-10 14:14:33 +01:00
Jörg Thalheim f34da1c835
Merge pull request #55348 from r-ryantm/auto-update/ccls
ccls: 0.20181225.7 -> 0.20181225.8
2019-02-10 02:07:58 +00:00
Elis Hirwing 4619f2ab12
uhd: Move from misc to radio 2019-02-09 21:40:16 +01:00
Matthew Bauer 5c09d977c7 Merge remote-tracking branch 'origin/master' into staging 2019-02-09 12:14:06 -05:00
Silvan Mosberger 18d059a4ac
Merge pull request #54115 from k32/master
rebar3: 3.6.1 -> 3.9.0
2019-02-09 17:29:59 +01:00
Vladimír Čunát 7f9e3b8206
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1504357
2019-02-09 10:15:17 +01:00
worldofpeace 69be72a64a desktop-files-utils: add setupHook to remove mimeinfo.cache
Post-Installation scripts are running `update-desktop-database -q`
creating these files which obviously results in a lot of collisions.

Much better solution than eventually noticing their existence and
removing them in postInstall.
2019-02-09 01:29:53 +00:00
Matthew Bauer 54dcb0b137
Merge pull request #52622 from marsam/init-dive
dive: init at 0.5.0
2019-02-08 17:51:51 -05:00
Matthew Bauer 0dd773265e
Merge pull request #53182 from ryanfitzsimon/vagrant-libvirt-utils
vagrant: Add vagrant-libvirt utility dependencies
2019-02-08 17:47:46 -05:00
Matthew Bauer 94d8b1f2b6
Merge pull request #53151 from symphorien/rls1.31
rls: init at 1.31.7
2019-02-08 17:47:06 -05:00
Roman Meerson efed82655c chromedriver: 2.43 -> 2.46 2019-02-08 16:35:52 +01:00
R. RyanTM 436701842b flow: 0.91.0 -> 0.92.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/flow/versions
2019-02-08 13:18:33 +00:00
Timo Kaufmann 295acfcb33
Revert "rustfmt: 1.0.0 -> 1.0.1" (#55437)
This reverts commit 7fff567ee9. It depends
on the rustc update I reverted in #55379. It should be re-introduced
after that rustc update has gone through staging.
2019-02-08 12:24:15 +01:00
Eelco Dolstra 016c4c9c82 rustfmt: 1.0.0 -> 1.0.1
(cherry picked from commit 7fff567ee9)
2019-02-08 11:13:09 +01:00
Jörg Thalheim 33ca8f9150
Merge pull request #55405 from xtruder/pkgs/hetzner-prompt/main-package
kube-prompt: build only main package
2019-02-08 07:56:38 +00:00
Vincent Laporte f833a3e881 ocamlPackages.ocp-index: 1.1.7 -> 1.1.8 2019-02-08 07:35:52 +01:00
worldofpeace 3abe344987
ninja: Add comment explaining the consistent ID patch
Co-Authored-By: grahamc <graham@grahamc.com>
2019-02-07 18:26:51 -05:00
Graham Christensen 21cdf28a83
ninja: make reproducible
See https://github.com/ninja-build/ninja/pull/1529
2019-02-07 18:04:59 -05:00
Jaka Hudoklin 76704e15a0
kube-prompt: build only main package 2019-02-07 18:14:57 +01:00
lewo 15e43d59cf
Merge pull request #55101 from lopsided98/hydra-update
hydra: 2018-08-07 -> 2019-02-01
2019-02-07 17:59:46 +01:00
Sarah Brofeldt f19145d8ca
Merge pull request #55336 from r-ryantm/auto-update/cfr
cfr: 0.138 -> 0.139
2019-02-07 12:15:50 +01:00
k32 d4b243905f rebar3: 3.6.1 -> 3.9.0
Remove hermetic patch (make it compatible with the upstream)
(Mostly) eliminate the need for hex package registry
2019-02-06 19:45:40 +01:00
R. RyanTM 9f93aa092c ccls: 0.20181225.7 -> 0.20181225.8
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ccls/versions
2019-02-06 08:10:11 -08:00
Tim Steinbach c7fda39fc2
sbt-extras: 2018-12-04 -> 2019-01-30 2019-02-06 08:53:41 -05:00
Vladimír Čunát ff101946a8
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1503899
2019-02-06 14:24:46 +01:00
R. RyanTM c479113212 cfr: 0.138 -> 0.139
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cfr/versions
2019-02-06 05:17:27 -08:00
tobias pflug fe1d31480c kind: 0.0.1 -> 0.1.0 2019-02-06 10:51:00 +01:00
Florian Klink d711a8301b
Merge pull request #55218 from bachp/gitlab-runner-11.7.0
gitlab-runner: 11.6.0 -> 11.7.0
2019-02-06 00:53:51 +01:00
Ryan Mulligan cfa3f9bb99
Merge pull request #55253 from r-ryantm/auto-update/kubectx
kubectx: 0.6.2 -> 0.6.3
2019-02-05 06:03:18 -08:00
Eelco Dolstra 7fff567ee9
rustfmt: 1.0.0 -> 1.0.1 2019-02-05 12:19:19 +01:00
R. RyanTM 579c9762ba jbake: 2.6.3 -> 2.6.4
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/jbake/versions
2019-02-05 01:45:22 -08:00
R. RyanTM 23c0d79673 kubectx: 0.6.2 -> 0.6.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/kubectx/versions
2019-02-04 22:38:25 -08:00
Maximilian Bosch acfc1c1535
hydra: don't support Nix 1.x
The component `hydra-evaluator` requires `pool.hh` from Nix which isn't
provided by Nix 1.x and thus fails with the following error in this
case:

```
hydra-evaluator.cc:3:10: fatal error: pool.hh: No such file or directory
 #include "pool.hh"
          ^~~~~~~~~
compilation terminated.
make[3]: *** [Makefile:443: hydra_evaluator-hydra-evaluator.o] Error 1
```

As the commit is from 2016 and fairly hard to revert for Nix 1.x
support, it's easier to drop that.

This has been tested with fixed perl-bindings for Nix1 as done in #55146.
2019-02-05 00:00:18 +01:00
R. RyanTM c9a28dcaa6 ocamlPackages.utop: 2.2.0 -> 2.3.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/utop/versions
2019-02-04 14:59:21 -08:00
Pascal Bach 30c40858bd gitlab-runner: 11.6.0 -> 11.7.0 2019-02-04 18:30:52 +01:00
Matthieu Coudron 2ba891788b Lua generate nix packages from luarocks (#54978)
* lua: generate packages from luarocks

* luarocks-nix: update

* removed packages already available in nixpkgs

* adressing reviews

update script can now accept another csv file as input with -c

* Remove obsolete comment
2019-02-04 11:30:58 +00:00
Will Dietz b3d8b2d6ec bison: 3.3.1 -> 3.3.2
http://lists.gnu.org/archive/html/bison-announce/2019-02/msg00000.html
2019-02-03 22:54:03 -06:00
Pascal Wittmann 5eebe431ea
Merge pull request #55051 from NixOS/update-gtk-doc
gtk-doc: 1.28 -> 1.29
2019-02-03 17:27:40 +01:00
zimbatm abac6afe93
pkgconfig: rename to pkg-config (#55094)
Package attrs should map to the pname. It's confusing otherwise.

pkg-config is also the name used by most distributions:

Debian, Homebrew, Guix, OpenSuse

other distributions like FreeBSD ports, Fedora and Arch Linux call it
"pkgconf"

Waiting a few releases to make a tree-wide change to make it easier to
back-port things.
2019-02-03 15:35:55 +00:00
Jan Malakhovski 73b2c285fe radare2, r2-for-cutter: move defaults to package file 2019-02-03 15:33:25 +00:00
Vladimír Čunát 32767d139f
Merge branch 'staging-next'
This round is without the systemd CVE,
as we don't have binaries for that yet.
BTW, I just ignore darwin binaries these days,
as I'd have to wait for weeks for them.
2019-02-20 09:38:45 +01:00
zimbatm e0a927556b
mdsh: 0.1.2 -> 0.1.3 2019-02-19 21:56:42 +01:00
worldofpeace 82cde8f36e
Merge pull request #55651 from rvolosatovs/update/godef
godef: 1.0.0 -> 1.1.1
2019-02-19 14:59:49 -05:00
Roman Volosatovs 6c26419f5e
godef: Use fetchFromGitHub 2019-02-19 20:39:25 +01:00
Frederik Rietdijk 815b77cbe6 Merge master into staging-next 2019-02-18 14:18:04 +01:00
Vladimír Čunát f7f1a2f54e
Merge branch 'master' into staging-next
A mass darwin rebuild from master (#55784).
2019-02-17 08:05:24 +01:00
Roman Volosatovs 9bece0f471
godef: 1.0.0 -> 1.1.1 2019-02-12 18:51:18 +01:00
markuskowa 56b79124ca
Merge pull request #54816 from vdemeester/update-gauge
gauge: 1.0.3 -> 1.0.4
2019-02-03 13:09:54 +01:00
Franz Pletz 97507ffc8b
Merge pull request #55046 from FlorianFranzen/cmake_no_pkg_reg
cmake: disable package registry
2019-02-03 08:32:43 +00:00
Ben Wolsieffer 8fb7706847 hydra: 2018-08-07 -> 2019-02-01 2019-02-02 19:02:06 -05:00
Vladimír Čunát bd9f835bf6
Merge branch 'master' into staging-next
Larger rebuild, probably mainly haskell.
Hydra nixpkgs: ?compare=1503325
2019-02-02 17:13:11 +01:00
Vladyslav M c7e1e48657
Merge pull request #54773 from r-ryantm/auto-update/mill
mill: 0.3.5 -> 0.3.6
2019-02-02 12:32:14 +02:00
Will Dietz b6e50b3a3c
Merge pull request #55008 from dtzWill/update/ninja-1.9.0
ninja: 1.8.2 -> 1.9.0
2019-02-02 00:58:59 -06:00
Guillaume Massé 453baaeabd coursier: 1.0.1 -> 1.1.0-M10 2019-02-01 16:26:38 -05:00
Pascal Wittmann 895bc4cefe
gtk-doc: 1.28 -> 1.29 2019-02-01 17:36:49 +01:00
Pascal Wittmann d1e7081596
checkstyle: 8.16 -> 8.17 2019-02-01 16:19:50 +01:00
Vladimír Čunát 8ba516664b
Merge branch 'staging-next' into staging 2019-02-01 09:42:53 +01:00
Mario Rodas 3613654a1f pyre: 0.0.18 -> 0.0.20 2019-02-01 08:34:35 +00:00
Vladimír Čunát 5effa4e0f9
Merge branch 'master' into staging-next
Comments on conflicts:
- llvm: d6f401e1 vs. 469ecc70 - docs for 6 and 7 say the default is
  to build all targets, so we should be fine
- some pypi hashes: they were equivalent, just base16 vs. base32
2019-02-01 09:22:29 +01:00
Uri Baghin 2b2854e522 bazel-deps: 2018-11-01 -> 2019-02-01 2019-02-01 17:30:36 +11:00
adisbladis 8f58e00226
vgo2nix: unstable-2018-12-02 -> unstable-2019-02-01 2019-02-01 06:19:15 +00:00
Jörg Thalheim 1321f17bc1
Merge pull request #54580 from plapadoo/gprof2dot-latest
gprof2dot: 2015-04-27 -> 2017-09-19
2019-01-31 21:50:39 +00:00
Dmitry Kalinkin c0d3182f79
Merge pull request #53585 from Scriptkiddi/litecli
litecli: init at 1.0.0
2019-01-31 16:05:30 -05:00
Dmitry Kalinkin f3fe429d44
litecli: fix tests 2019-01-31 15:43:35 -05:00
Will Dietz d4cd52e503 ninja: 1.8.2 -> 1.9.0
https://groups.google.com/forum/#!topic/ninja-build/nY5Kb7zUvcg
2019-01-31 12:25:13 -06:00
Florian Franzen e0e4577c0f cmake: disable package registry 2019-01-31 10:17:55 +01:00
Kévin Rauscher e925ec27ba bloop: 1.2.3 -> 1.2.5 (#54427) 2019-01-31 01:20:55 +02:00
Mario Rodas 18ad447b6f heroku: 7.18.2 -> 7.19.4 2019-01-30 21:18:14 +02:00
Maximilian Bosch c7001df243
Merge pull request #53650 from Ma27/update-shmig
shmig: 2017-07-24 -> 1.0.0
2019-01-30 15:06:59 +01:00
Félix Baylac-Jacqué a5aca72f93 bazel: 0.21.0 -> 0.22.0 2019-01-30 14:57:32 +01:00
Philipp Middendorf a04e81898c gprof2dot: 2015-04-27 -> 2017-09-19 2019-01-30 13:32:44 +01:00
Robert Schütz dfc8ec8da7
Merge pull request #54813 from plapadoo/fdroidserver-update
fdroidserver: 2016-05-31 -> 1.1
2019-01-30 10:33:00 +01:00
Philipp Middendorf 72857e2850 fdroidserver: 2016-05-31 -> 1.1, and move out of pythonPackages 2019-01-30 09:38:37 +01:00
Philip Patsch 5c6892e1a2 bazel: fix java toolchain regression
By changing the default toolchain to JDK8, we broke the default Java
toolchain, which assumes JDK9.

Instead, set `host_java_toolchain` manually for our build of bazel,
and set `java_toolchain` to run the java tests with the build JDK as
well.

Fixes https://github.com/NixOS/nixpkgs/issues/54289
2019-01-29 14:03:54 +01:00
Vladimír Čunát efc836f607
Merge branch 'staging' into bison-3.3.1 2019-01-29 12:52:57 +01:00
lewo 2f8896b821
Merge pull request #54810 from vdemeester/update-kustomize
kustomize: 1.0.10 -> 1.0.11
2019-01-29 09:39:58 +01:00
Will Dietz 2b59e4edd6
Merge pull request #54731 from dtzWill/update/meson-0.49.1
meson: 0.49.0 -> 0.49.1
2019-01-28 21:25:06 -06:00
Will Dietz f235d64b18
Merge pull request #54635 from dtzWill/update/bison-3.3
bison: 3.2.4 -> 3.3.1
2019-01-28 21:24:33 -06:00
R. RyanTM ae78ae0fc1 ammonite: 1.6.2 -> 1.6.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ammonite/versions
2019-01-28 21:04:14 -05:00
Artemis Tosini 73bc897ac6
one_gadget: init at 1.6.2 2019-01-28 20:05:02 +00:00
Yorick 83520c308c buildkite-agent3: 3.0.1 -> 3.8.4 (#54430) 2019-01-28 17:31:00 +00:00
R. RyanTM 0ef85cca2e lttng-ust: 2.10.2 -> 2.10.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/lttng-ust/versions
2019-01-28 16:45:32 +01:00
R. RyanTM 07e06f3e0b lttng-tools: 2.10.5 -> 2.10.6
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/lttng-tools/versions
2019-01-28 16:44:56 +01:00
Vincent Demeester f89b4fc4b1
gauge: 1.0.3 -> 1.0.4
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2019-01-28 16:17:54 +01:00
Vincent Demeester 7df5bb1633
kustomize: 1.0.10 -> 1.0.11
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2019-01-28 15:46:11 +01:00
R. RyanTM 0f490eab3e mill: 0.3.5 -> 0.3.6
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mill/versions
2019-01-28 01:04:08 -08:00
Silvan Mosberger ddcf01bca6
Merge pull request #53848 from veprbl/pr/qtwebengine_darwin_fix
qt511.qtwebengine: fix on darwin
2019-01-28 02:41:53 +01:00
Will Dietz 5aaf597df3 meson: 0.49.0 -> 0.49.1
https://groups.google.com/d/msg/mesonbuild/xRXQatmXIwo/-2lqsOIXGAAJ

https://github.com/mesonbuild/meson/milestone/33
2019-01-27 15:28:01 -06:00
Will Dietz 8b1e5308ba
Merge pull request #54464 from dtzWill/fix/binutils-2.31.1-musl
binutils: unbreak w/musl via upstream commits
2019-01-27 13:15:27 -06:00
Will Dietz 5ef89ae605 bison: 3.3 -> 3.3.1
https://lists.gnu.org/archive/html/bison-announce/2019-01/msg00003.html
2019-01-27 10:26:13 -06:00
Léo Gaspard 0a39cabd11
Merge branch 'pr-54650'
* pr-54650:
  wabt: 1.0.6 -> 1.0.8
2019-01-27 07:55:16 +01:00
Matthew Bauer 92f0f8dd68 Merge remote-tracking branch 'NixOS/master' into staging 2019-01-27 00:01:13 -05:00
R. RyanTM 68b6efbce9 wabt: 1.0.6 -> 1.0.8
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/wabt/versions
2019-01-26 17:39:14 -08:00
Jörg Thalheim ba34ffc665
Merge pull request #54619 from Mic92/remove-wkennington
treewide: remove wkennington as maintainer
2019-01-26 23:37:27 +00:00
Silvan Mosberger 186762719b
Merge pull request #54371 from Gerschtli/add/mdl
mdl: init at 0.5.0
2019-01-26 22:47:21 +01:00
Robin Palotai 566539ff55 Add test and docs. 2019-01-26 22:22:34 +01:00
Robin Palotai d3199ddaa7 Add gzip and gnutar to default bazel-bash tools. These are often used by rules, mostly due to Bazel's one-output rule. 2019-01-26 22:22:34 +01:00
Will Dietz ecce13ef44 bison: 3.2.4 -> 3.3
https://lists.gnu.org/archive/html/bison-announce/2019-01/msg00002.html
2019-01-26 12:22:51 -06:00
Elis Hirwing f3230da9be
Merge pull request #54458 from nthorne/UFTrace_0_9_2
uftrace: 0.9.1 -> 0.9.2
2019-01-26 13:05:01 +01:00
Elis Hirwing 8fcf4925c7
Merge pull request #54473 from jdanekrh/packer_1.3.3
packer: 1.3.1 -> 1.3.3
2019-01-26 12:59:21 +01:00
Jörg Thalheim b5c1deca8a
treewide: remove wkennington as maintainer
He prefers to contribute to his own nixpkgs fork triton.
Since he is still marked as maintainer in many packages
this leaves the wrong impression he still maintains those.
2019-01-26 10:05:32 +00:00
Tim Steinbach 9e3db4df2c
toluapp: Fix includes for newer Lua versions
See https://github.com/LuaDist/toluapp/pull/2
2019-01-25 22:56:55 -05:00
Joachim F db478a342c
Merge pull request #52140 from r-ryantm/auto-update/python2.7-ansible-lint
ansible-lint: 3.4.23 -> 3.5.1
2019-01-25 17:22:30 +00:00
Jörg Thalheim f9e5b73178
Merge pull request #54566 from ChengCat/opam
opam: fix issue and upgrade
2019-01-25 14:13:32 +00:00
Yucheng Zhang 1f433e51b6 opam: 2.0.0 -> 2.0.2 2019-01-25 12:15:16 +08:00
Kevin Cox 3fe937275d
cargo-web: 0.6.15 -> 0.6.23 2019-01-24 21:35:15 +00:00
Silvan Mosberger 44a660e54e
Merge pull request #54256 from r-ryantm/auto-update/autoconf-archive
autoconf-archive: 2018.03.13 -> 2019.01.06
2019-01-24 01:02:52 +01:00
Michael Weiss f561acc48e
scons.src: Update the hash (tarball was modified)
Unfortunately the tarball was modified for the official release and
"nix-store -r --check $(nix-instantiate -A scons.src)" did not catch
this (not sure why ATM).

Thanks @pbogdan for noticing this :)
2019-01-23 21:21:46 +01:00
Michael Weiss c2b8270fb8
Merge pull request #54461 from primeos/scons
scons: 3.0.3 -> 3.0.4
2019-01-23 19:05:44 +01:00
Michael Weiss 32e7f391fc
scons: 3.0.3 -> 3.0.4
Announcement:
https://scons.org/scons-304-is-available.html

Changelog:
https://raw.githubusercontent.com/SConsProject/scons/rel_3.0.4/src/CHANGES.txt

There where no regressions and no deprecations in this release (at least
it does not break any additional builds in nixpkgs).
2019-01-23 18:46:53 +01:00
Frederik Rietdijk 01efca4a54
Merge pull request #54462 from dotlambda/python-pkgs-remove
pythonPackages: remove some packages representing outdated versions
2019-01-23 09:38:40 +01:00
Profpatsch 88fa235e63 bazel: camel-case python_bin_path 2019-01-22 21:28:24 +01:00
Philip Patsch 25cd44063f bazel: add python to the runtime closure 2019-01-22 21:28:24 +01:00
Jiri Danek 786ac26b86 packer: 1.3.1 -> 1.3.3 2019-01-22 17:18:51 +01:00
Vladimír Čunát 3fe32b675e
Merge branch 'master' into staging 2019-01-22 15:59:42 +01:00
Will Dietz cd836b57ec binutils: and apply in right order 2019-01-22 06:36:16 -06:00
Will Dietz aee77e66bb binutils: drop changelog portions of patches, so they apply 2019-01-22 06:36:15 -06:00
Will Dietz bf0a0d424b binutils: patches from upstream to unbreak linking musl
https://sourceware.org/bugzilla/show_bug.cgi?id=23428
2019-01-22 06:36:13 -06:00
Robert Schütz 8c57113e14 python.pkgs.argparse: remove
argparse is part of stdlib in 2.7 and 3.2+
2019-01-22 12:43:07 +01:00
Niklas Thorne 3db7afdf40 uftrace: 0.9.1 -> 0.9.2
Udated to latest released version.
2019-01-22 09:09:58 +01:00
Matthieu Coudron 15a8719d40 luarocks-nix: init
luarocks-nix is a fork of luarocks that adds a "nix" command capable of
converting luarocks package descriptions into nix derivations (though nixpkgs is
still missing the lua infrastructure).
2019-01-22 16:52:43 +09:00
Matthieu Coudron d7a48fc80d luarocks: support more usage
better support for luarocks in a shell (helpful to develop on luarocks).
Also adds unpacker for src.rock/rockspec files.
Also allows to use luarocks to build cmake based rocks.
2019-01-22 16:52:43 +09:00
Jörg Thalheim e6af830961
Merge pull request #54412 from mayflower/teeworlds-bump
teeworlds: 0.6.5 -> 0.7.2
2019-01-21 15:33:21 +00:00
Jörg Thalheim 343d07b0b6
radare2: 3.1.3 -> 3.2.1 2019-01-21 14:00:26 +00:00
Maximilian Bosch f9816bd6b0
Merge pull request #53927 from zaninime/patch-1
nexus: 3.14.0-04 -> 3.15.0-01
2019-01-21 14:57:56 +01:00
Linus Heckemann 4c651d1647 bam: 0.4.0 -> 0.5.1, fix licence 2019-01-21 11:34:28 +01:00
Mario Rodas 09b815ebf4 flow: 0.90.0 -> 0.91.0 2019-01-21 05:50:15 +00:00
Tim Steinbach 53e1db960a
binutils: 2.30.0 -> 2.31.1 2019-01-20 13:03:00 -05:00
Frederik Rietdijk ca2edf79f7 Merge master into staging-next 2019-01-20 18:22:17 +01:00
Jan Tojnar ef14a225bb
Merge pull request #54007 from jtojnar/darwin-gsettings
Darwin GSettings support
2019-01-20 13:53:47 +01:00
Tobias Happ 61a7313d7a mdl: init at 0.5.0 2019-01-20 13:23:46 +01:00
Pascal Wittmann b71ed9c888
Merge pull request #54298 from dtzWill/update/spin-6.4.9
spin: 6.4.8 -> 6.4.9
2019-01-20 12:35:51 +01:00
Will Dietz 6507d48eda spin: use dropbox "mirror" again to avoid problems 2019-01-19 21:35:05 -06:00
Léo Gaspard cf8383810e gn: use python2 as gn is incompatible with python3 2019-01-19 14:17:22 +01:00
Frederik Rietdijk d531da6f8a
Merge pull request #54094 from rnhmjoj/shell
treewide: use ${stdenv.shell} instead of /bin/sh where possible
2019-01-19 14:15:51 +01:00
Robin Palotai 68436aec2c Add awk as a default tool for Bazel shell commands.
Apparently
e292e0452f/bazel/gflags.bzl (L8)
assumes it should be accessible. Normally we could ask them to fix, but
I would expect awk to be a commonly assumed.

The rough search
https://github.com/search?q=filename%3ABUILD+genrule+awk&type=Code
brings ~1K hits.
2019-01-19 11:07:00 +01:00
Frederik Rietdijk f8b45e2d84 Merge staging-next into staging 2019-01-19 09:24:01 +01:00
Will Dietz c869590dea spin: install manpage 2019-01-18 21:34:55 -06:00
Will Dietz 5812580bf6 spin: 6.4.8 -> 6.4.9 2019-01-18 21:34:50 -06:00
R. RyanTM fdf7a22bbb ammonite: 1.6.0 -> 1.6.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ammonite/versions
2019-01-18 10:53:51 -05:00
Jörg Thalheim 67d5933482
Merge pull request #54057 from Tomahna/bloop
bloop: 1.2.1 -> 1.2.3
2019-01-18 11:16:53 +00:00
Kevin Rauscher 26e2eb3a9d bloop: 1.2.1 -> 1.2.3 2019-01-18 09:29:41 +01:00
R. RyanTM b2efe0ff62 autoconf-archive: 2018.03.13 -> 2019.01.06
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/autoconf-archive/versions
2019-01-17 20:56:23 -08:00
Mario Rodas 8819ff0701
brakeman: 4.3.1 -> 4.4.0 2019-01-17 22:14:00 -05:00
R. RyanTM 9bd9d2a002 flatpak-builder: 1.0.1 -> 1.0.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/flatpak-builder/versions
2019-01-17 11:11:48 -08:00
Frederik Rietdijk 9cfae76fc5 Merge staging-next into staging 2019-01-17 09:21:29 +01:00
Uri Baghin cd29409a45 bazel-watcher: 0.5.0 -> 0.9.0 2019-01-16 19:24:38 -08:00
Jörg Thalheim bb885d502a
Merge pull request #53888 from Mic92/ccls
ccls: init at 0.20181225.7
2019-01-16 23:56:55 +00:00
rnhmjoj bcf54ce5bb
treewide: use ${stdenv.shell} instead of /bin/sh where possible 2019-01-16 20:37:15 +01:00
adisbladis 08f446b541
vgo2nix: unstable-2018-10-14 -> unstable-2018-12-02 2019-01-16 16:03:38 +00:00
Christoph Hrdinka def5124ec8
Merge pull request #53995 from serokell/fix-pgtmp
pg_tmp, ephemeralpg: fix on darwin and merge
2019-01-16 13:45:48 +01:00
Jörg Thalheim 2eaadfa5be
conan: fix distro package version 2019-01-16 12:23:59 +00:00
Jan Tojnar 2f4e167156
meson: Fix linking ObjC objects on Darwin
https://github.com/NixOS/nixpkgs/pull/54007#issuecomment-454693658
2019-01-16 13:21:40 +01:00
Jörg Thalheim fd5b4eeb19
Merge pull request #53380 from HaoZeke/updateConan
conan: 1.6.0 -> 1.11.2
2019-01-16 08:15:14 +00:00
Jörg Thalheim 8853eb62aa
Merge pull request #54024 from r-ryantm/auto-update/yq
yq: 2.7.1 -> 2.7.2
2019-01-16 07:13:19 +00:00
R. RyanTM e9138bfff5 yq: 2.7.1 -> 2.7.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/yq/versions
2019-01-15 21:21:17 -08:00
Orivej Desh 052db93d8f bazel: fix patches after #53988 2019-01-16 00:54:56 +00:00
Tim Steinbach 8d35005491
jira-cli: Use Python 3.x
It otherwise reports
"error: jira-2.0.0 not supported for interpreter python2.7"
2019-01-15 19:08:39 -05:00
Vladyslav M 805e2bbced
Merge pull request #53703 from vbgl/ocaml-ocp-indent-1.7.0
ocamlPackages.ocp-indent: 1.6.1 -> 1.7.0
2019-01-16 00:54:27 +02:00
Jörg Thalheim 8c3e66e28a
Merge pull request #53992 from fgaz/dead-links/1
Fix some dead links
2019-01-15 19:47:36 +00:00
Félix Baylac-Jacqué 57004738b1 bazel: fix python stub paths.
Since the 0.21 upgrade, the host `$PATH` is not forwarded anymore by
default to the sandboxes in charge to realize Bazel actions. This
default change broke the `py_binary` rule among other things.

Every python binary is wrapped in a stub in charge to setup the
execution environment. Currently, this stub's shebang points to a
`/usr/bin/env python` which cannot be resolved with the current
`$PATH`.
This results in breaking any build pipeline requiring the use of
python at some point. On top of the incorrect shebang, the stub
template is unable to find the actual python binary using
`SearchPath`.

This PR fixes those two things by re-writing the stub template shebang
to the actual python binary and by substituting the faulty default
python binary lookup to the right one.
2019-01-15 19:25:24 +01:00
Will Dietz 2ea8a2147c
Merge pull request #53974 from dtzWill/update/pkgconf-1.6.0
pkgconf: 1.5.4 -> 1.6.0
2019-01-15 12:23:52 -06:00
Yorick van Pelt f9a7b5d22e
pg_tmp, ephemeralpg: merge packages 2019-01-15 18:17:12 +01:00
Jörg Thalheim ca61531750
ccls: init at 0.20181225
- tested with [emacs](https://dl.thalheim.io/kdh-PwxzlwGKTEl1_NpTzg/2019-01-13-190156_1920x1080_scrot.png)
and vim.
- wrapped to pick up our cc wrapper environment -> works perfectly in nix-shell
2019-01-15 17:12:56 +00:00
Francesco Gazzetta ba275b9df0 jl: fix homepage url 2019-01-15 17:20:26 +01:00
Frederik Rietdijk 42d276c6b8 Merge staging-next into staging 2019-01-15 16:59:03 +01:00
Frederik Rietdijk 4af059cd15 gnome-doc-utils: fix native deps 2019-01-15 10:16:11 +01:00
Will Dietz 357db3250a pkgconf: 1.5.4 -> 1.6.0
https://git.dereferenced.org/pkgconf/pkgconf/src/tag/pkgconf-1.6.0/NEWS
2019-01-14 16:50:45 -06:00
Roman Volosatovs 8b925a8f32 mbed-cli: init at 1.8.3 (#53954) 2019-01-14 23:47:12 +01:00
Gabriel Ebner 7f6ca93029
Merge pull request #53900 from dywedir/tokei
tokei: 8.0.0 -> 9.0.0
2019-01-14 11:07:46 +01:00
Francesco Zanini da98284faa
nexus: 3.14.0-04 -> 3.15.0-01 2019-01-14 09:45:50 +01:00
Kévin Rauscher d6fc1163e8 bloop: 1.1.2 -> 1.2.1 (#53093) 2019-01-13 23:17:16 +01:00
Vladyslav Mykhailichenko 2e03f923f7
tokei: 8.0.0 -> 9.0.0 2019-01-14 00:06:21 +02:00
Mario Rodas b1957d6428 detect-secrets: 0.11.0 -> 0.11.4 (#53893) 2019-01-13 22:31:10 +01:00
Frederik Rietdijk bb9581cd88 Merge staging-next into staging 2019-01-13 14:46:43 +01:00
volth a4faf59aa1 ninja: re2c is not for building docs
ninja sources include re2c's output files, so unless we change the sources by applying a patch, re2c is not even launched
anyway, it is not relevant to building docs
2019-01-13 13:42:06 +01:00
R. RyanTM f8d3a0d55c cfr: 0.137 -> 0.138
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cfr/versions
2019-01-13 09:42:37 +01:00
Vladimír Čunát 570d84a01e
Merge branch 'staging-next' 2019-01-13 00:39:38 +01:00
Austin Seipp 8b5e6b7711 icestorm: minor cleanup with pythonPkg.interpreter [NFC]
Suggested cleanup by @dotlambda. See:

  18839e1cc1 (commitcomment-31917295)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-01-12 15:51:00 -06:00
Maximilian Bosch f494cffab6
shmig: 2017-07-24 -> 1.0.0
Update to the latest revision, don't replace `which` anymore as all
`which` references are eliminated previously, enable support for at
least one database type (otherwise this scrpit is unusable and needs to
be built manually with support for on of these packages).

Tested functionality with a simple SQLite database.
2019-01-12 21:34:40 +01:00
Mario Rodas 2c48580be1 flow: 0.89.0 -> 0.90.0 2019-01-12 18:16:28 +00:00
Will Dietz 7feee4d81f retdec: remove pycache from install dir 2019-01-12 16:48:40 +01:00
Dmitry Kalinkin 7a6d18cac5
xcbuild: provide migcom in toolchain
This is needed to facilitate build of qt5.qtwebengine on darwin
2019-01-12 09:28:43 -05:00
Vladimír Čunát bde8efe792
Merge branch 'master' into staging-next
A couple thousand rebuilds have accumulated on master.
2019-01-12 12:19:34 +01:00
Michael Weiss 768d876394
scons: Remove version 2.5.1 2019-01-12 10:44:33 +01:00
Austin Seipp 61e57a827b icestorm: enableParallelBuilding = true
With the previous PyPy3 change, this reduces the compile time from
~1m30s to roughly 36s (compared to the original, serial, Python 3 build
time of 2:30s).

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-01-11 18:03:35 -06:00
Austin Seipp 18839e1cc1 icestorm: improve x86 build/runtime perf with pypy
PyPy3 offers tremendous speedups for IceStorm tools written in Python,
including tools used at compile-time to generate the chip databases, and
runtime tools distributed to users, such as icebox_vlog.

For example, on my ThreadRipper 1950X, build times for IceStorm
consistently go from 2m30s -> 1m30s with this change, a 40% improvement,
simply due to improvements in raw CPU efficiency. (This is also worsened
by the fact the build is currently serial, but that can easily be fixed
anyway.)

On top of that, tools distributed to users are also now run using PyPy.
Utilities such as icebox_vlog are useful for post-bitstream testing, for
instance, and also are improved due to improved CPU efficiency as well.
For example, when "decompiling" an ICE40 bitstream for HX8K devices,
containing a synthesized copy of PicoRV32 (from the NextPNR demos), the
runtime of icebox_vlog is cut from 25 seconds to 9 seconds consistently
with this change alone.

Normally, picking a Python interpreter outright for Python-based code is
a "bad idea", but in the case of IceStorm it should be perfectly safe,
and an excellent improvement for users. There are a few reasons for
this:

  - IceStorm uses pure Python 3 and nothing else. There are no
requirements for any 3rd party packages, which might cause annoying
incompatibilities, and PyPy has historically shown very strong core
Python compatibility.

  - IceStorm is NOT a set of Python libraries, it is a set of tools,
some of which, coincidentally, are written in Python. It is (normally)
bad form to fix libraries to certain interpreters versions if the reason
strictly isn't "it doesn't work/isn't compatible". That is not the case
here. These tools may later be used by other programs, such as NextPNR,
but the Python interpreter is ultimately not that important in quesion
for the user. In this sense, there is almost no downside to picking
PyPy explicitly if it offers far better performance.

(Point 2 is not actually strictly true; there are some distributed .py
files that you can import from but they are basically just static
classes that are imported by tools like nextpnr; this is expected.)

Because of this, users should see very little change except better
performance for IceStorm tools on their machines.

Note that PyPy is not supported on aarch64 -- this only applies to
x86_64 machines.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-01-11 18:03:35 -06:00
R. RyanTM a8518f976c yarn: 1.12.3 -> 1.13.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/yarn/versions
2019-01-12 00:00:57 +02:00
Jörg Thalheim 831ffbdc96
Merge pull request #53737 from dpetranek/update-leiningen
leiningen: 2.8.1 -> 2.8.3
2019-01-11 12:06:36 +00:00
Andrew Childs 42815ce8de rubocop: 0.59.1 -> 0.62.0 2019-01-11 12:12:03 +09:00
Maximilian Bosch 44a80294f7
Merge pull request #53746 from zaninime/patch-1
nexus: 3.12.1 -> 3.14.0-04
2019-01-10 23:01:26 +01:00
Elmar Athmer 539d62be3a hcloud: 1.9.1 -> 1.11.0 2019-01-10 14:02:47 -05:00
Dmitry Kalinkin 9fac2254b2
Merge pull request #53666 from ThomasMader/dlang-update
dmd: 2.083.1 -> 2.084.0, dub: 1.12.1 -> 1.13.0, dtools: 2.083.1 -> 2.084.0, Literate: 2018-12-23 -> 2019-01-08
2019-01-10 13:54:44 -05:00
Profpatsch 9e9fec640e bazel: 0.20.0 -> 0.21.0
0.21 removed the bundled openjdk-distribution. Instead, tries to fetch
the “right” distribution on-the-fly when building.
So we need to provide our own openjdk.

According to
https://github.com/bazelbuild/bazel/issues/6865#issuecomment-447261288
we should set `--host_javabase="@local_jdk//:jdk` if we want to do
that. This uses the jdk that is currently in the environment, which is
openjdk 8 in our case. 0.21 defaulted to a toolchain for JDK9, which
we don’t package in nixpkgs, so we use the JDK8 toolchain.

This commit also replaces the line-number-based sed invocations with
something more stable.
2019-01-10 18:46:25 +01:00
Will Dietz 7e31406886 bazel: greatly reduce time spent substituting, be smart which files
Files inspected: 2756 -> 40
Total size of inspected files: 20M -> 1016K
2019-01-10 18:46:25 +01:00