Michael Raskin
740d857b5c
Merge pull request #21839 from kierdavis/i3blocks-sysconfdir
...
i3blocks: search for config in correct system directory
2017-01-13 10:41:59 +00:00
Michael Raskin
ee966005a7
Merge pull request #21842 from johbo/darwin-xournal-quartz
...
xournal: Support gtk with quartz or x11 backend
2017-01-13 10:38:56 +00:00
Linus Heckemann
b91fa0f477
syncthing: remove runtime dependency on go
...
The hack used here is shamelessly stolen from buildGoPackage. If it is
going to be applied to more expressions, it may make sense to factor it
out so it can be shared.
2017-01-13 09:54:48 +00:00
Vincent Laporte
720c8e457c
jackline: fix after uutf and notty updates
2017-01-13 06:56:58 +00:00
Johannes Bornhold
71aad4c494
xournal: Support gtk backend quartz on darwin
2017-01-12 22:55:23 +01:00
Kier Davis
90b3648f9c
i3blocks: search for config in correct system directory
...
The SYSCONFDIR variable used in the Makefile servers two purposes:
1) During buildPhase, it is hardcoded into the executable as one of
the locations that will be searched for the i3blocks.conf config
file. We want this set to "/etc", so that "/etc/i3blocks.conf"
will be automatically loaded if it exists, as specified in the
manpage.
2) During installPhase, it specifies the location that the sample
i3blocks.conf should be installed to. We want this to be "$out/etc".
Case 2 was already handled correctly, but case 1 was not. This resulted
in i3blocks instead searching for i3blocks.conf in the default value of
SYSCONFDIR, which is "/usr/local/etc", a directory which generally does
not exist on NixOS. This commit remedies this problem by setting
SYSCONFDIR=/etc during buildPhase.
A minor stylistic fix (correcting a usage of "makeFlags" to "buildFlags"
in the expression) has also been applied in this commit.
2017-01-12 20:15:15 +00:00
Bjørn Forsman
05bb3fe22e
avidemux: 2.6.16 -> 2.6.18
2017-01-12 20:13:12 +01:00
Thomas Tuegel
ce26a4d3d4
Merge pull request #21826 from mdorman/emacs-updates
...
Automated emacs package updates
2017-01-12 06:48:36 -06:00
Graham Christensen
f855f4a9e2
Merge pull request #21824 from peterhoeg/u/dropbox
...
dropbox: 16.4.30 -> 17.4.33
2017-01-12 07:29:45 -05:00
Ignat Loskutov
c94c2666bb
tdesktop: 0.10.19 -> 1.0.0
...
abbradar: add vdpau to fix the build, use qt56 explicitly
Closes #21821 .
2017-01-12 15:27:24 +03:00
Aaron Bull Schaefer
715ff285b6
terraform: 0.8.2 -> 0.8.4
2017-01-12 07:29:17 +01:00
Scott R. Parish
4c1703786c
nvi: fix linking with ncurses
2017-01-11 19:21:18 -08:00
Michael Alan Dorman
ac393d299c
melpa-packages: 2017-01-11
...
removals:
- ctags: repository no longer available
- latest-clojure-libraries: removed from melpa
- slamhound: removed from melpa
2017-01-11 20:49:26 -05:00
Michael Alan Dorman
2c4ee516d5
melpa-stable-package: 2017-01-11
...
removals:
- ctags: repository no longer available
- ctags-update: version tags lost when moved to new repository
- slamhound: removed from melpa
2017-01-11 20:48:21 -05:00
Michael Alan Dorman
adbc201147
elpa-packages: 2017-01-11
2017-01-11 20:46:20 -05:00
Tim Steinbach
575b0352b9
Merge pull request #21818 from NeQuissimus/rkt_1_22_0
...
rkt: 1.21.0 -> 1.22.0
2017-01-11 20:21:37 -05:00
Peter Hoeg
ef318d01e9
dropbox: 16.4.30 -> 17.4.33
2017-01-12 09:13:36 +08:00
Etienne Laurin
3d301e384e
isabelle: 2016 -> 2016-1
2017-01-11 17:33:04 -05:00
Tim Steinbach
490c109928
rkt: 1.21.0 -> 1.22.0
2017-01-11 17:27:19 -05:00
Tim Steinbach
f124cb7611
atom: 1.12.9 -> 1.13.0
2017-01-11 17:18:24 -05:00
Jörg Thalheim
5fa5ab0eed
Merge pull request #21810 from volth/flashplayer-24.0.0.194
...
flashplayer: 24.0.0.186 -> 24.0.0.194
2017-01-11 22:31:04 +01:00
Daiderd Jordan
4488203d0c
Merge pull request #20658 from matthewbauer/gimp-darwin
...
GIMP on Darwin (use Quartz)
2017-01-11 21:47:29 +01:00
volth
a3778f6e87
flashplayer: 24.0.0.186 -> 24.0.0.194
2017-01-11 18:06:55 +00:00
Joachim F
104c3db659
Merge pull request #21202 from kierdavis/unigine-valley
...
unigine-valley: refactor
2017-01-11 18:39:05 +01:00
Frederik Rietdijk
85e170c2c1
linuxband: use python2
2017-01-11 18:25:10 +01:00
Frederik Rietdijk
e94d9cdfaa
virtmanager: use python2
2017-01-11 18:25:10 +01:00
Frederik Rietdijk
e1cd8f0f96
zim: use python2
2017-01-11 18:25:10 +01:00
Frederik Rietdijk
ba92ef0b32
gpodder: use python2
2017-01-11 18:25:09 +01:00
Jiří Daněk
0f83aa5167
idea-community: 2016.3 -> 2016.3.2 ( #21807 )
2017-01-11 16:36:25 +01:00
Graham Christensen
7158ef7514
Merge pull request #21805 from exi/update-ding
...
ding: 1.8 -> 1.8.1
2017-01-11 09:36:15 -05:00
Reno Reckling
4823b85a2b
ding: 1.8 -> 1.8.1
...
The actual tar did not change for some reason, but the version did
change.
Also make the install a bit more verbose.
2017-01-11 15:34:52 +01:00
Michael Raskin
760edeb2b6
xfractint: init at 20.04p14
2017-01-11 14:14:07 +01:00
Franz Pletz
260d97ca25
runc: add patches to fix CVE-2016-9962
2017-01-11 12:11:29 +01:00
Franz Pletz
0aa4931671
runc: 2016-06-15 -> 1.0.0-rc2
2017-01-11 10:59:27 +01:00
Franz Pletz
4df30fc74f
containerd: 0.2.3 -> 0.2.5
2017-01-11 10:59:26 +01:00
Franz Pletz
cb07316773
docker: 1.12.5 -> 1.12.6
...
Fixes CVE-2016-9962.
2017-01-11 10:59:24 +01:00
Frederik Rietdijk
aa2ce20c59
ingen: fix evaluation
2017-01-11 09:17:55 +01:00
Frederik Rietdijk
d0bfac0edf
Merge pull request #20037 from magnetophon/lv2libs
...
Lv2libs
2017-01-11 09:02:14 +01:00
Matthew Bauer
8497ef1ed2
gimp: add darwin support
2017-01-10 23:51:36 -06:00
Franz Pletz
f159279da5
mopidy: 2.0.1 -> 2.1.0
2017-01-11 06:17:03 +01:00
Bart Brouns
5abcc7d22a
lilv and sord: remove svn versions and deploy release version
2017-01-11 02:21:00 +01:00
Graham Christensen
acc889f5ed
Merge pull request #21462 from phunehehe/android-studio
...
Fontconfig for Android Studio
2017-01-10 20:05:42 -05:00
Daiderd Jordan
e590659295
Merge pull request #21720 from matthewbauer/transmission
...
Transmission: Darwin support
2017-01-11 01:21:24 +01:00
Daiderd Jordan
43266905d1
Merge pull request #21791 from LnL7/darwin-cairo-fixes
...
cairo related fixes
2017-01-11 00:45:16 +01:00
Daiderd Jordan
581a5aec88
imagemagick: add darwin frameworks
2017-01-10 23:03:49 +01:00
Stefan Götz
9280174493
mpv: 0.22.0 -> 0.23.0
2017-01-10 22:42:29 +01:00
Bart Brouns
5143998a3e
rofi: 1.3.0 -> 1.3.1
2017-01-10 21:42:37 +01:00
Vladimír Čunát
0300418a69
Merge branch 'staging'
2017-01-10 21:13:18 +01:00
Vladimír Čunát
ee2edd4527
Merge branch 'master' into staging
2017-01-10 15:38:07 +01:00
Jörg Thalheim
98bcca8813
gajim: enable omemo dependencies by default
2017-01-10 15:37:16 +01:00
Michael Raskin
8801b8d2b3
Merge pull request #21776 from peterhoeg/p/terragrunt
...
terragrunt: init at 0.8.0
2017-01-10 14:14:22 +00:00
taku0
ce11097b71
flashplayer: 24.0.0.186 -> 24.0.0.194
2017-01-10 21:12:12 +09:00
Peter Hoeg
16f4b10bba
terragrunt: init at 0.8.0
2017-01-10 15:27:30 +08:00
Hoang Xuan Phu
4b3f79b3ca
android-studio: use a dedicated fontconfig file
2017-01-10 13:36:02 +08:00
Hoang Xuan Phu
d849f00af5
android-studio: reindent wrapProgram parameters
2017-01-10 13:35:37 +08:00
Hoang Xuan Phu
1f67c179ac
android-studio: rearrange dependencies
2017-01-10 13:35:37 +08:00
Hoang Xuan Phu
4e513cbc9f
android-studio: no need for jdk anymore
...
Android Studio now bundles its own JDK ¯\_(ツ)_/¯
2017-01-10 13:35:36 +08:00
Graham Christensen
198993d6bd
Merge pull request #21772 from mguentner/subsurface_beta_fix
...
subsurface: rev update for 4.5.97
2017-01-09 21:19:06 -05:00
Graham Christensen
01e40594a9
Merge pull request #21774 from yurrriq/update/pkgs/applications/version-management/git-and-tools/hub
...
hub: 2.2.8 -> 2.2.9
2017-01-09 21:18:03 -05:00
Benjamin Staffin
eae2a12ebb
insync: add a note about trial and costing money
2017-01-09 20:58:04 -05:00
Eric Bailey
a0e5cbbd6a
hub: 2.2.8 -> 2.2.9
2017-01-09 19:10:18 -06:00
Maximilian Güntner
9112410f65
subsurface: rev update for 4.5.97
...
Signed-off-by: Maximilian Güntner <code@klandest.in>
2017-01-10 00:00:59 +01:00
Daiderd Jordan
bba12a6c90
Merge branch 'master' into staging
2017-01-09 23:57:47 +01:00
Robert Helgesson
5bf06ac710
eclipse-plugin-checkstyle: 7.2.0 -> 7.3.0
2017-01-09 23:08:10 +01:00
Pascal Wittmann
755c2929dd
pdfpc: 4.0.4 -> 4.0.5
2017-01-09 20:54:48 +01:00
Michael Raskin
39ed261c4c
Merge pull request #21632 from veprbl/sherpa_fix
...
sherpa: fix sqlite dependency
2017-01-09 09:58:22 +00:00
Michael Raskin
b9bb55c03f
Merge pull request #21638 from benley/insync
...
insync: init at 1.3.13.36129
2017-01-09 09:46:15 +00:00
Michael Raskin
94bba7de25
Merge pull request #21657 from schneefux/pkg.hugo
...
hugo: 0.17 -> 0.18.1
2017-01-09 09:44:40 +00:00
Michael Raskin
d750321f24
Merge pull request #21723 from jokogr/u/qtpass-1.1.6
...
qtpass: 1.1.4 -> 1.1.6
2017-01-09 09:31:42 +00:00
Michael Raskin
8205358261
Merge pull request #21765 from taku0/inkscape-0.92
...
inkscape: 0.91 -> 0.92
2017-01-09 09:29:39 +00:00
taku0
67573c942e
inkscape: 0.91 -> 0.92
2017-01-09 18:25:53 +09:00
Michael Raskin
e7b82bb1ae
Merge pull request #21759 from FaustXVI/update-slack
...
slack: 2.2.1 -> 2.3.4
2017-01-09 09:25:16 +00:00
Michael Raskin
e81ae666b6
Merge pull request #21760 from rasendubi/rescuetime
...
rescuetime: 2.9.10.1255 -> 2.9.11.1285
2017-01-09 09:24:07 +00:00
Gabriel Ebner
14a35a55c7
remmina: fix missing gsettings schemas
2017-01-09 09:57:39 +01:00
andjscott
0970931e74
mmex: v1.2.7 -> v1.3.1 ( #21755 )
2017-01-09 07:26:06 +01:00
edanaher
2bbbea7e8b
pidgin-osd: 0.1.0 -> 0.2.0 ( #21655 )
2017-01-09 06:47:59 +01:00
Franz Pletz
1753d8c878
irssi: 0.8.21 -> 1.0.0
2017-01-09 06:29:40 +01:00
Alexey Shmalko
b8a508364c
rescuetime: 2.9.10.1255 -> 2.9.11.1285
2017-01-09 02:41:53 +02:00
FaustXVI
510ac5221a
slack: 2.2.1 -> 2.3.4
2017-01-08 23:54:07 +01:00
Vladimír Čunát
936bc23b41
ed: avoid the useless rebuild due to #21752
2017-01-08 22:17:18 +01:00
Moritz Ulrich
efe05f9d42
notmuch: 0.23.2 -> 0.23.4.
2017-01-08 20:14:34 +01:00
FaustXVI
5c55d54db9
discord: 0.0.11 -> 0.0.13
2017-01-08 18:30:11 +01:00
Sebastian Hagen
547b203b9a
ed: Add fedoraproject mirror.
...
The existing URL has gone dark; this commit adds one from fedoraproject.org
that still works. We put the new mirror first since ed is in the bootstrap
path, and 16.09 bootstrap doesn't try later URLs.
2017-01-08 13:46:16 +00:00
Vladimír Čunát
309c63c542
Merge branch 'master' into staging
2017-01-08 14:27:01 +01:00
Vladimír Čunát
3a3b0263b0
subsurface: disable parallel make, as it fails on Hydra
...
http://hydra.nixos.org/build/46126151/nixlog/1/raw
2017-01-08 14:13:40 +01:00
Matthew Bauer
6695954d48
transmission: fix building on Darwin
...
This sets "--disable-mac" so that we use GTK instead of the macOS
backend. The macOS backend should work but currently it breaks with xcbuild.
2017-01-07 17:59:14 -06:00
Matthew Bauer
976aed886b
transmission: add enableDaemon flag
2017-01-07 17:59:05 -06:00
Matthew Bauer
30eed55410
transmission: add enableCli flag
2017-01-07 17:58:52 -06:00
Matthew Bauer
cae067f17a
transmission: add enableSystemd flag
...
This flag can be used to enable systemd daemon support in transmission.
2017-01-07 17:58:40 -06:00
schneefux
3a1da126a1
gogs: 0.9.7 -> 0.9.113
2017-01-07 14:35:20 +01:00
Joachim F
f1dc2dd552
Merge pull request #21694 from dtzWill/fix/skype-pax
...
skype: paxmark to fix execution on PaX-enabled kernels
2017-01-07 08:05:02 +01:00
Dmitry Kalinkin
0f71012fe6
sherpa: add useful dependencies
2017-01-07 01:36:51 -05:00
Daiderd Jordan
56cceca999
Merge pull request #21700 from polyrod/master
...
sakura: fixed GLib-GIO-ERROR #21698
2017-01-07 01:40:00 +01:00
Vladimír Čunát
e2cde1524d
flac: 1.3.1 -> 1.3.2
...
Version bump seems small, but it's after more than two years.
2017-01-06 21:35:13 +01:00
Ioannis Koutras
f935115ce0
qtpass: 1.1.4 -> 1.1.6
2017-01-06 22:32:24 +02:00
Frederik Rietdijk
f70f898dae
Merge pull request #21710 from peterhoeg/f/gitup
...
git-up: not a python package
2017-01-06 20:51:44 +01:00
Anmol Sethi
3799f9322a
neovim: removed unncessary man configuration
...
Latest neovim uses a rewritten man plugin that does not need
these changes.
2017-01-06 18:31:11 +01:00
Vladimír Čunát
07bf828bd9
Merge branch 'staging'; security /cc #21642
2017-01-06 16:32:47 +01:00
Pascal Wittmann
99c8e8e71f
Merge pull request #21711 from mimadrid/fix/picard
...
picard: fix compilation and remove unused buildInputs
2017-01-06 14:50:08 +01:00
Vladimír Čunát
75fc704cfe
treewide: more fixes of phases after bash 4.3 -> 4.4
2017-01-06 14:05:22 +01:00
mimadrid
0b3e1e0486
picard: remove unused buildInputs
2017-01-06 12:46:38 +01:00
Gabriel Ebner
74a97421ce
lean: 2016-12-30 -> 2017-01-06
2017-01-06 11:57:40 +01:00
Peter Hoeg
98c9db00d8
git-up: not a python package
...
1. git-up is a python package as such but an application, so move it out of python-packages.nix
2. get rid of the tests (we've already run the tests)
2017-01-06 18:56:26 +08:00
Vladimír Čunát
29e93555ec
firefox*: fixup build after updating sed
...
I failed to simply patch the bad [:space:] usage; I don't know why.
2017-01-06 11:22:28 +01:00
Maurizio Di Pietro
25e34e0bae
sakura: fixed GLib-GIO-ERROR #21698 #21700
2017-01-06 11:02:05 +01:00
Frederik Rietdijk
d30a17bc2c
Merge pull request #21707 from paperdigits/darktable-2.2.1
...
darktable 2.2.0 -> 2.2.1
2017-01-06 08:32:52 +01:00
Frederik Rietdijk
d0aa7cd7d8
Merge pull request #21699 from elasticdog/transcrypt
...
transcrypt: 1.0.0 -> 1.0.1
2017-01-06 08:31:52 +01:00
Frederik Rietdijk
4187179f7b
Merge pull request #21455 from puffnfresh/package/Natron
...
natron: init at 2.1.9
2017-01-06 08:22:08 +01:00
Mica Semrick
8f22697c62
darktable 2.2.0 -> 2.2.1
2017-01-05 21:46:33 -08:00
Brian McKenna
f133475370
natron: init at 2.1.9
2017-01-06 15:49:35 +11:00
Tim Steinbach
f2502c9d86
atom: 1.12.8 -> 1.12.9
2017-01-05 19:48:25 -05:00
Aaron Bull Schaefer
196eb75b88
transcrypt: 1.0.0 -> 1.0.1
2017-01-05 16:20:45 -08:00
Jascha Geerds
40f9eb1f22
Merge pull request #21693 from dtzWill/update/discord
...
discord: 0.0.11 -> 0.0.13, PaX fix.
2017-01-05 23:40:05 +01:00
Will Dietz
3f9cb55dce
skype: paxmark to fix execution on PaX-enabled kernels
2017-01-05 16:26:35 -06:00
Yannis Koutras
8d029efdfd
skrooge: 2.5.0 -> 2.6.0 ( #21690 )
2017-01-05 23:20:36 +01:00
Will Dietz
4e84742798
discord: 0.0.11 -> 0.0.13
2017-01-05 16:13:31 -06:00
Will Dietz
92be17aef4
discord: paxmark to fix execution
2017-01-05 15:52:34 -06:00
Vladimír Čunát
789b811e7d
thunderbird: fixup build after updating sed
2017-01-05 22:40:30 +01:00
volth
1181bdd717
chromium, google-chrome: add commandLineArgs
2017-01-05 18:19:44 +00:00
Franz Pletz
c58ac7e4d6
irssi: 0.8.20 -> 0.8.21 (security)
...
Fixes four security vulnerabilities:
https://irssi.org/security/irssi_sa_2017_01.txt
No CVEs were assigned yet at the time of this commit.
cc #21642
2017-01-05 17:25:07 +01:00
jgertm
52a7b6549f
bitbucket-server-cli: init at 0.7.0 ( #21616 )
2017-01-05 10:21:06 +00:00
Graham Christensen
15f46d60ac
Merge pull request #21615 from matthiasbeyer/update-pkgs
...
Update pkgs
2017-01-04 18:50:12 -05:00
Vladimír Čunát
ea7b252c9a
Merge branch 'master' into staging
2017-01-04 23:20:43 +01:00
Tim Steinbach
d222761121
atom: 1.12.7 -> 1.12.8
2017-01-04 17:20:00 -05:00
Evan Danaher
d4b960550b
neovim: Inherit meta into neovim-configured
...
When adding neovim's configure option to config.nix, builds fail with
error: attribute ‘platforms’ missing, at
/nix/store/*/nixos/pkgs/applications/editors/neovim/qt.nix:41:28
Inheriting meta into neovim-configured fixes this, and seems reasonable.
2017-01-04 18:33:26 +01:00
Joachim F
68ab32fbf8
Merge pull request #21644 from mdorman/emacs-updates
...
Automated Emacs package updates
2017-01-04 17:54:54 +01:00
Michael Raskin
71c1e2ffbf
irssi_otr: 1.0.1 -> 1.0.2
2017-01-04 17:46:15 +01:00
Matthias Beyer
a3d42f3999
weather: 2.0 -> 2.3
2017-01-04 16:29:35 +01:00
Matthias Beyer
d359101891
bean-add: 2016-10-03 -> 2016-12-02
2017-01-04 16:29:35 +01:00
Matthias Beyer
b1f4c1dffe
beancount: 2.0b12 -> 2.0b13
2017-01-04 16:29:34 +01:00
Matthias Beyer
cc0a5d589d
fava: 1.0 -> 1.2
2017-01-04 16:29:34 +01:00
Matthias Beyer
52d95487dd
fava: Fix github source (owner)
2017-01-04 16:29:34 +01:00
Matthias Beyer
6587d6bf1d
buku: 2.5 -> 2.7
2017-01-04 16:29:33 +01:00
Matthias Beyer
a52ac0a5c6
rtv: 1.10.0 -> 1.13.0
2017-01-04 16:29:33 +01:00
Matthias Beyer
8c2e6df52d
cli-visualizer: 2016-06-02 -> 1.5
2017-01-04 16:29:32 +01:00
Matthias Beyer
be4caf3ef7
sc-im: 0.2.1 -> 0.4.0
2017-01-04 16:29:31 +01:00
Matthias Beyer
9680f12fbe
cortex: 2014-08-01 -> 2015-08-23
2017-01-04 16:29:30 +01:00
Matthias Beyer
95d6480199
haxor-news: 0.3.1 -> 0.4.1
2017-01-04 16:29:30 +01:00
Matthias Beyer
d43479badb
mdp: 1.0.7 -> 1.0.9
2017-01-04 16:29:29 +01:00
schneefux
9ba56e0dbf
hugo: 0.17 -> 0.18.1
2017-01-04 15:23:30 +01:00
Michael Alan Dorman
080926b479
melpa-packages: 2017-01-03
2017-01-04 08:29:25 -05:00
Michael Alan Dorman
29472c62e1
melpa-stable-packages: 2017-01-03
2017-01-04 08:29:25 -05:00
Michael Alan Dorman
1b5f9394ed
elpa-packages: 2017-01-03
2017-01-04 08:29:25 -05:00
Benjamin Staffin
6afd5fbbb7
insync: init at 1.3.13.36129
2017-01-04 03:42:13 -05:00
Daiderd Jordan
118af5d2ea
Merge pull request #21605 from chris-martin/pr/stellar-core
...
stellar-core: init at 0.5.1
2017-01-04 08:40:41 +01:00
Dmitry Kalinkin
2f23d60323
sherpa: fix sqlite dependency
2017-01-04 04:59:06 +00:00
Chris Martin
1dc199d9cf
stellar-core: init at 0.5.1
2017-01-03 22:06:47 -05:00
Daiderd Jordan
27660cfdc0
Merge branch 'master' into staging
2017-01-04 01:42:26 +01:00
Graham Christensen
3080fcf616
Merge pull request #21602 from peterhoeg/u/st_1418
...
syncthing: 0.14.17 -> 0.14.18
2017-01-03 18:06:40 -05:00
Domen Kožar
af2cfc076f
haskellPackages.z3: fix #16357
2017-01-03 23:10:24 +01:00
Bjørn Forsman
26dc6dab4c
avidemux: 2.6.15 -> 2.6.16
2017-01-03 20:27:25 +01:00
Vladimír Čunát
1fe136ea8a
Make all meta.maintainers attributes lists
...
(cherry picked from commit b714f55239
2017-01-03 18:28:20 +01:00
Pascal Wittmann
c4175a071b
Merge pull request #21617 from mguentner/subsurface_beta
...
subsurface 4.5.6 -> 4.5.97
2017-01-03 17:30:38 +01:00
Maximilian Güntner
b00516ca31
subsurface: 4.5.6 -> 4.5.97 (beta 2)
...
Signed-off-by: Maximilian Güntner <code@klandest.in>
2017-01-03 16:06:50 +01:00
Thomas Tuegel
0723aa8108
Merge pull request #21466 from abbradar/kde-wrapper
...
Flatten nested kdeWrappers
2017-01-03 08:21:39 -06:00
Eelco Dolstra
b4f401104d
Fix big-parallel usage
...
requiredSystemFeatures is not a meta attribute but a derivation
attribute. So "big-parallel" was being ignored on e.g. chromium,
causing it to be built (and timing out) on slow machines.
http://hydra.nixos.org/build/45819778#tabs-buildsteps
2017-01-03 13:55:26 +01:00
Adam Stephens
586ceaf718
terraform: 0.8.1 -> 0.8.2 ( #21601 )
2017-01-03 12:29:46 +00:00
Gabriel Ebner
4620c03eb5
Merge pull request #21427 from active-group/actually-install-procmail
...
procmail: unbreak "make install"
2017-01-03 02:46:34 -05:00
Mike Sperber
20c5aa5b7d
procmail: unbreak "make install"
...
procmail's Makefile lacks a ".PHONY: install" line, which turns "make
install" into a no-op, at least on macOS. Insert one.
2017-01-03 08:41:15 +01:00
Peter Hoeg
d997ea6a38
syncthing: 0.14.17 -> 0.14.18
2017-01-03 13:16:49 +08:00
Daiderd Jordan
3ac20e92e8
Merge pull request #21598 from danielfullmer/rclone-1.35
...
rclone: 1.33 -> 1.35
2017-01-03 01:51:11 +01:00
Daniel Fullmer
76d37ce3b7
rclone: 1.33 -> 1.35
2017-01-02 19:27:42 -05:00
Nikolay Amiantov
e908442693
kdeWrapper: allow wrapping several packages
2017-01-03 02:33:15 +03:00
Frederik Rietdijk
93cabca3bd
Merge pull request #21587 from peterhoeg/f/puddletag
...
puddletag: get rid of pypkgs variable
2017-01-02 23:02:26 +01:00
Michael Raskin
7c5784d1f0
maxima: 5.38.1 -> 5.39.0
2017-01-02 21:53:21 +01:00
Michael Raskin
9fb0d83c83
compiz: 0.9.13.0 -> 0.9.13.1
2017-01-02 20:18:51 +01:00
Michael Raskin
d94706ed66
baresip: 0.4.20 -> 0.5.0
2017-01-02 20:18:46 +01:00
Karn Kallio
f16eda3fb1
eclipse-platform: add Neon 2 Platform
2017-01-02 17:57:32 +01:00
Karn Kallio
2c31127edc
eclipse-sdk-46: 4.6.1 -> 4.6.2
2017-01-02 17:55:13 +01:00
Nikolay Amiantov
3c1ade7d15
qutebrowser: 0.8.4 -> 0.9.0
2017-01-02 19:05:12 +03:00
Peter Hoeg
c049463520
puddletag: get rid of pypkgs variable
2017-01-02 23:19:59 +08:00
Michael Raskin
32197ea80b
Merge pull request #21567 from peterhoeg/p/xca
...
xca: qt4 -> qt5
2017-01-02 14:10:51 +00:00
Michael Raskin
78299dfbae
Merge pull request #21585 from bendlas/update-chromium
...
chromium: 55.0.2883.75 -> 55.0.2883.87
2017-01-02 14:01:13 +00:00
Herwig Hochleitner
08121638f8
chromium: 55.0.2883.75 -> 55.0.2883.87
2017-01-02 14:00:10 +01:00
Nikolay Amiantov
202e835852
Merge pull request #21514 from peterhoeg/audacity
...
audacity: fix library path
2017-01-02 16:33:43 +04:00
Peter Hoeg
858f8f27fa
audacity: fix library path using NIX_LDFLAGS
2017-01-02 20:24:12 +08:00
Frederik Rietdijk
21f6cb79a7
zim: remove postFixup, include checkPhase, disable tests
...
- wrap-python.nix used to set sys.argv[0] to the name of the script, but
it now sets the path so we won't have to do it here anymore
- tests were not found, so the correct file is now invoked
2017-01-02 11:29:11 +01:00
Daiderd Jordan
5a67b130b9
Merge branch 'master' into staging
2017-01-02 00:54:17 +01:00
Dmitry Kalinkin
c7bcb99ff2
root: 6.04.18 -> 6.08.02
...
This relies on
e9d60c56
2017-01-01 17:52:03 -05:00
Brandon Dimcheff
0890ce6f09
astroid: init at 0.6
2017-01-01 22:38:12 +01:00
Aaron Bull Schaefer
e98bd77ef3
transcrypt: 0.9.9 -> 1.0.0
2017-01-01 11:49:22 -08:00
Pascal Wittmann
039e90c9d3
fityk: 1.3.0 -> 1.3.1
2017-01-01 18:19:39 +01:00
Peter Hoeg
aec8872e23
xca: qt4 -> qt5
...
Compile against qt5 instead of qt4.
2017-01-02 00:17:48 +08:00
Graham Christensen
31dc66a55a
Merge pull request #21564 from peterhoeg/u/dropbox
...
dropbox: 16.4.29 -> 16.4.30
2017-01-01 10:07:43 -05:00
Peter Hoeg
c08556fea5
dropbox: 16.4.29 -> 16.4.30
2017-01-01 14:18:36 +08:00
Chris Hodapp
e3dedd4b57
darktable: 2.0.7 -> 2.2.0
2016-12-31 14:59:30 -05:00
Joachim F
01fdbac60c
Merge pull request #21550 from mimadrid/update/nano-2.7.3
...
nano: 2.7.2 -> 2.7.3
2016-12-31 16:12:10 +01:00
mimadrid
ae5c3f6fc5
nano: 2.7.2 -> 2.7.3
2016-12-31 15:37:41 +01:00
Michael Raskin
6305b85abd
Merge pull request #21549 from mimadrid/update/rofi-1.3.0
...
rofi: 1.2.0 -> 1.3.0
2016-12-31 14:30:01 +00:00
mimadrid
fc50edf497
rofi: 1.2.0 -> 1.3.0
2016-12-31 15:22:22 +01:00
Gabriel Ebner
68b2d43c88
lean: 2016-12-08 -> 2016-12-30
2016-12-31 13:51:10 +01:00
Frederik Rietdijk
6210641031
flexget: fix eval
2016-12-31 10:09:16 +01:00
Frederik Rietdijk
9a330645d1
flexget: forgot to include file in commit
2016-12-31 10:02:30 +01:00
Frederik Rietdijk
c7bff3d71d
calibre: 2.73.0 -> 2.76.0, fix html5lib, closes #21504
2016-12-31 09:12:41 +01:00
Graham Christensen
1fd97f6293
Merge pull request #21528 from veprbl/kak2
...
update rivet, kakoune, add fastnlo, sherpa, mcgrid
2016-12-30 22:36:53 -05:00
Rushmore Mushambi
b86d256e9c
Merge pull request #21489 from retrry/master
...
rustc, cargo, rustRegistry updates
2016-12-31 04:01:16 +02:00
Daiderd Jordan
9d0a9bc9d6
Merge pull request #21515 from chris-martin/ppl
...
ppl-address-book: init at 2.4.0
2016-12-30 23:42:10 +01:00
Michael Raskin
6003eeb643
Merge pull request #21207 from larkery/patch-1
...
Fiddle LD_LIBRARY_PATH to include GDAL
2016-12-30 22:01:54 +00:00
Graham Christensen
31c14bc58e
Merge pull request #21512 from Mic92/neomutt
...
neomutt: 20161104 -> 20161126
2016-12-30 15:13:05 -05:00
Dmitry Kalinkin
8fb6895614
sherpa: init at 2.2.1
2016-12-30 14:27:55 -05:00
Dmitry Kalinkin
9a5e34faca
kakoune: 2016-12-10 -> 2016-12-30, fix on Darwin
2016-12-30 14:27:49 -05:00
Joachim Fasting
f2c5bc6d7d
cvsps: use standard install phase
2016-12-30 20:27:27 +01:00
Joachim Fasting
2516472050
cvsps: fetch patches from debian 2.1-7 sources
2016-12-30 20:27:20 +01:00
Joachim Fasting
b4c5916e85
cvsps: get source from Debian, fix build
...
The cobite.com urls seem to have disappeared or been moved. I've failed
to find where they might have gone, so use debian's mirrored sources
instead.
2016-12-30 20:27:17 +01:00
Vladimír Čunát
3dbf6b4a09
font-manager: fix missing icons
...
Fixes #21454 , or at least most of it.
2016-12-30 18:59:48 +01:00
Vladimír Čunát
dbde4eb465
gitAndTools.qgitGit: remove
...
It's rather old and abandoned, the source is dead, and our stable qgit
version seems more recent. /cc @MarcWeber.
2016-12-30 12:30:35 +01:00
Frederik Rietdijk
405c18bd32
Merge pull request #21461 from ikervagyok/urlscan
...
urlscan: replace input 'isPy35' with 'pythonOlder'
2016-12-30 12:27:37 +01:00
Jörg Thalheim
74caf88a58
impressive: 0.10.5 -> 0.11.1
...
fixes #21501
2016-12-30 10:24:20 +01:00
Chris Martin
a6df66e0d8
ppl-address-book: init at 2.4.0
2016-12-30 00:34:13 -05:00
Jörg Thalheim
1cc599307f
neomutt: 20161104 -> 20161126
2016-12-30 04:04:24 +01:00
Graham Christensen
fd826a0b71
Merge pull request #21492 from vdemeester/idea-ultimate_2016_3_2
...
idea-ultimate: 2016.3.1 -> 2016.3.2
2016-12-29 21:44:35 -05:00
Charles Strahan
7ebcada020
mesos: 1.0.1 -> 1.1.0
2016-12-29 20:09:46 -05:00
Joachim F
9c52f7f083
Merge pull request #21464 from mdorman/emacs-updates
...
Automated emacs package updates
2016-12-29 23:44:17 +01:00
Alexey Shmalko
87d5e27a3d
Merge pull request #21445 from jokogr/u/syncthing-0.14.16
...
syncthing: 0.14.15 -> 0.14.17
2016-12-29 12:00:40 -08:00
taku0
93d917fa22
firefox, thunderbird: add updateScript
2016-12-29 11:19:50 +01:00
Vincent Demeester
37632cbf5f
idea-ultimate: 2016.3.1 -> 2016.3.2
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-12-29 10:31:22 +01:00
Tadas Barzdzius
d27a658846
pijul: mark as broken
2016-12-29 09:57:39 +02:00
Tadas Barzdzius
cfbbac7cb4
cfdyndns: mark as broken
2016-12-29 09:57:22 +02:00
Graham Christensen
0e400de967
Merge pull request #21488 from taku0/thunderbird-45.6.0
...
thunderbird: 45.5.1 -> 45.6.0 [Critical security fix]
2016-12-28 21:34:45 -05:00
Graham Christensen
f4568952d6
Merge pull request #21487 from taku0/thunderbird-bin-45.6.0
...
thunderbird-bin: 45.5.1 -> 45.6.0 [Critical security fix]
2016-12-28 21:34:30 -05:00
taku0
a1f595c870
thunderbird: 45.5.1 -> 45.6.0
2016-12-29 11:07:10 +09:00
Graham Christensen
f5ca9a4212
Merge branch 'roundup-15'
2016-12-28 21:04:51 -05:00
taku0
373fb99e98
thunderbird-bin: 45.5.1 -> 45.6.0
2016-12-29 10:59:37 +09:00
Antoine Eiche
bc63738c6f
qemu: fix CVE-2016-9921 and CVE-2016-9922
2016-12-28 20:37:00 -05:00
Antoine Eiche
a5dd311208
qemu: fix CVE-2016-9911
2016-12-28 20:36:53 -05:00
Robin Gloster
3f426f6f55
terminator: 0.98 -> 1.0
2016-12-29 01:42:23 +01:00
Robin Gloster
825c0d892a
terminator: fix build and use buildPythonApplication
2016-12-29 01:42:22 +01:00
Graham Christensen
5306122333
Merge pull request #21430 from rasendubi/awesome
...
awesome: 3.5.9 -> 4.0
2016-12-28 18:19:03 -05:00
Milan Svoboda
f969f42b2b
ranger 1.7.2 -> 1.8.0 ( #21480 )
2016-12-28 23:47:39 +01:00
Lengyel Balázs
e912145eae
urlscan: remove 'isPy35' dependency, as it's no longer needed
2016-12-28 18:49:49 +01:00
Michael Raskin
442623e499
qemu_28: init at 2.8.0; not updating the main Qemu expression yet because there were some claims about NixOS test fragility
2016-12-28 15:04:51 +01:00
Nicolas Pouillard
5952897ec4
ricochet: 1.1.2 -> 1.1.4 ( #21458 )
2016-12-28 13:51:28 +00:00
Michael Raskin
de99dc5049
imagemagick7: init at 7.0.4-0
2016-12-28 14:16:10 +01:00
Michael Raskin
040d5162be
imagemagick: 6.9.6-7 -> 6.9.7-0
2016-12-28 14:16:10 +01:00
Michael Alan Dorman
49992887e5
melpa-packages: 2016-12-27
2016-12-28 08:12:18 -05:00
Michael Alan Dorman
7ccd91b067
melpa-stable-packages: 2016-12-27
2016-12-28 08:12:18 -05:00
Michael Alan Dorman
4de8a35225
org-packages: 2016-12-27
2016-12-28 08:12:18 -05:00
Michael Alan Dorman
060c8493c7
elpa-packages: 2016-12-27
2016-12-28 08:12:18 -05:00
Bjørn Forsman
842a3010e1
Unbreak nixpkgs eval (urlscan lacked pythonOlder)
2016-12-28 13:52:15 +01:00
Emery Hemingway
bef1d42300
confclerk: init at 0.6.1
2016-12-28 12:42:36 +01:00
David Pätzel
2d38cad288
enhance python version check
2016-12-28 12:13:36 +01:00
David Pätzel
3414470d9d
urlscan: init at 0.8.3
2016-12-28 12:13:36 +01:00
Michael Raskin
e1b1df2bd9
Merge pull request #20028 from zraexy/qsyncthingtray
...
qsyncthingtray: init at 0.5.5rc2
2016-12-28 10:40:18 +00:00
Michael Raskin
e65cccb776
Merge pull request #21221 from rardiol/gplates
...
gplates: init at 2.0.0
2016-12-28 10:21:23 +00:00
Ioannis Koutras
474b35994b
syncthing: 0.14.15 -> 0.14.17
2016-12-27 22:56:08 +02:00
Daiderd Jordan
7d4e04c795
Merge pull request #21400 from johbo/darwin-xournal
...
Xournal: Darwin support
2016-12-27 20:23:18 +01:00
Arseniy Seroka
aa18f24f4b
Merge pull request #21269 from non-Jedi/mm
...
mm: init at 2016.11.04
2016-12-27 21:44:24 +03:00
zimbatm
02c65bdac9
google-chrome: add channel name suffix
...
Updates would always select the unstable version otherwise. This was
copies from the chromium package.
2016-12-27 16:21:56 +00:00
Bjørn Forsman
bef30f322f
cgit: 0.12 -> 1.1
2016-12-27 15:46:22 +01:00
Johannes Bornhold
346c1db2ac
xournal: Allow to build it on darwin with X11 backend
2016-12-27 14:19:25 +01:00
Alexey Shmalko
b33907075f
awesome: 3.5.9 -> 4.0
2016-12-27 11:39:51 +02:00
Eric Litak
7b2a37f5c8
remmina: add icon packages as soft deps ( #21411 )
2016-12-25 19:04:47 +00:00
zimbatm
a623ada912
flashplayer: removed obsolete files
2016-12-25 11:33:16 +00:00
taku0
f3287b0aa5
flashplayer: 11.2.202.644 -> 24.0.0.186 [Critical security fix] ( #21337 )
...
* flashplayer: 11.2.202.644 -> 24.0.0.186
* flashplayer: add debug version
* flashplayer-standalone: 11.2.202.644 -> 24.0.0.186
2016-12-25 11:32:24 +00:00
Michael Raskin
916a37cd0e
libreoffice-fresh: 5.2.3.3 -> 5.2.4.2
2016-12-25 11:10:18 +01:00
Nikolay Amiantov
4c891ac638
slade: init at 3.1.1.4
2016-12-25 03:23:57 +03:00
Alex Ivanov
c4236f65b9
qmmp: 1.1.2 -> 1.1.5
2016-12-24 11:04:13 +01:00
mimadrid
29cb10c021
igv: 2.3.77 -> 2.3.89
2016-12-23 19:37:10 -05:00
Graham Christensen
e2feddb70f
Merge pull request #21384 from mimadrid/update/shotwell-0.25.2
...
shotwell: 0.23.5 -> 0.25.2
2016-12-23 19:30:12 -05:00
mimadrid
5e3c4b2bf7
shotwell: 0.23.5 -> 0.25.2
2016-12-23 23:24:36 +01:00
Peter Simons
06f51e17fa
Merge pull request #21362 from lverns/rstudio-add-desktop-file
...
Rstudio add desktop file
2016-12-23 10:26:39 +01:00
Rory McNamara
53a44eff92
bspwm: 1.9.1 -> 1.9.2
2016-12-22 23:27:32 +00:00
John Wiegley
4888bfecc2
coq_8_6: 8.6 is now default, 8.4 optional, updated mathcomp/ssreflect
...
Addresses #14829
2016-12-22 10:35:56 -08:00
aszlig
603dbfc5a9
Merge pull request #21236 (Update mediainfo)
...
This pulls updates from @devhell for libmediainfo, mediainfo,
mediainfo-gui and libzen to their latest upstream versions.
Tested by building all of these packages plus "ums" and "sonarr" (both
depend on one or more of these updated packages) on x86_64-linux.
2016-12-22 18:44:14 +01:00
Richard Lupton
9f200422f2
kubernetes-helm: 2.0.2 -> 2.1.2 ( #21343 )
2016-12-22 17:21:00 +01:00
Laverne Schrock
9872e65037
rstudio: make mkDerivation recursive
...
Needed since we want to access desktopItem from postInstall.
2016-12-22 08:16:49 -06:00
Laverne Schrock
4154adb128
rstudio: add desktop file
...
Fixes #20230
2016-12-22 08:15:56 -06:00
Jason Daniel Augustine Gilliland
59ca5d213f
freebayes: init at 1.1.0
...
Signed-off-by: zimbatm <zimbatm@zimbatm.com>
2016-12-22 14:10:37 +00:00
ft@zeus
1b8aec421b
stellarium: 0.14.3 -> 0.15.0
...
close #21271
2016-12-21 20:22:44 -05:00
Graham Christensen
25ac14064d
Merge pull request #21341 from ftrvxmtrx/master
...
spotify: 1.0.45.182 -> 1.0.45.186
2016-12-21 19:58:06 -05:00
Nikolay Amiantov
7de8494be6
gnome15: init at 2016-06-10
2016-12-22 01:35:11 +03:00
Sigrid
84ec6f836b
spotify: 1.0.45.182 -> 1.0.45.186
2016-12-21 21:45:38 +01:00
Graham Christensen
4e6c7faf36
xen: patch for many XSAs
...
- XSA-190
- XSA-191
- XSA-192
- XSA-193
- XSA-195
- XSA-196
- XSA-198
- XSA-200
- XSA_202
- XSA-204
2016-12-21 14:37:47 -05:00
Graham Christensen
2c24ce5cfa
game-music-emu: 0.6.0 -> 0.6.1 for multiple CVEs
...
CVE-2016-9957 CVE-2016-9958 CVE-2016-9959 CVE-2016-9960 CVE-2016-9961
2016-12-21 14:37:45 -05:00
Frederik Rietdijk
4a795afdbc
Merge pull request #21318 from leenaars/ssrc
...
ssrc: init at 1.33
2016-12-21 15:03:28 +01:00
Michiel Leenaars
f4d1b6f781
ssrc: init at 1.33
2016-12-21 14:44:01 +01:00
Jörg Thalheim
8e08ed1062
Merge pull request #21329 from volhovM/update/scudcloud-1.38
...
scudcloud: 1.35 -> 1.38
2016-12-21 13:35:34 +01:00
Mikhail Volkhov
de683845b8
scudcloud: 1.35 -> 1.38
2016-12-21 10:39:05 +03:00
Frederik Rietdijk
48fa032aae
Merge pull request #21322 from mimadrid/update/meld-3.16.4
...
meld: 3.16.2 -> 3.16.4
2016-12-21 00:09:27 +01:00
mimadrid
8021c1f429
meld: 3.16.2 -> 3.16.4
2016-12-20 23:56:29 +01:00
Aristid Breitkreuz
6d75b913fd
Merge pull request #21255 from jokogr/u/syncthing-0.14.15
...
syncthing: 0.14.13 -> 0.14.15
2016-12-20 14:20:26 +01:00
Aristid Breitkreuz
978c26a465
Merge pull request #21290 from peterhoeg/u/db
...
dropbox: 15.4.22 -> 16.4.29
2016-12-20 14:12:34 +01:00
Daiderd Jordan
49e3190efa
Revert "xhyve: update and fix to use our Hypervisor framework"
...
This reverts commit f3b65f67d9
2016-12-20 13:02:27 +01:00
Eelco Dolstra
8a0843c3c4
qemu-kvm: Mark the version for tests
...
(cherry picked from commit d58a4ec1ba
2016-12-20 10:52:46 +01:00
Dan Peebles
f3b65f67d9
xhyve: update and fix to use our Hypervisor framework
2016-12-19 19:47:24 -05:00
Peter Hoeg
08b01310c6
dropbox: 15.4.22 -> 16.4.29
2016-12-20 06:44:56 +08:00
Michael Fellinger
bb80d77d84
neovim: green :CheckHealth
2016-12-19 23:05:31 +01:00
aszlig
7199f1bd94
paperwork: init at 1.0.6.1
...
I have not yet tested scanning, but the main application works so far.
A lot of patching is required here, because the upstream project
references some paths from well-known FHS locations which of course are
not available on Nix(OS).
We also use all available aspell dictionaries right now, which is maybe
a bit ugly but it makes language switching easier.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-12-19 22:25:56 +01:00
aszlig
68bc260ca2
tesseract: 3.02.02 -> 3.04.01
...
From the upstream changelog:
* Tesseract development is now done with Git and hosted at github.com
(Previously we used Subversion as a VCS and code.google.com for
hosting).
So let's move over to the GitHub repository, where the organisation also
includes a full repository for tessdata, so we no longer need to fetch
it one-by-one.
The build also got significantly simpler, because we no longer need to
run autoconf, neither do we need to patch the configure script for
Leptonica headers.
This also has the advantage that we don't need to use the
enableLanguages attribute for the test runner anymore.
Full upstream changelog can be found at:
https://github.com/tesseract-ocr/tesseract/blob/c4d273d33cc36e/ChangeLog
Tested against all NixOS tests with enabled OCR (chromium, emacs-daemon,
installer.luksroot and lightdm).
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @viric
2016-12-19 22:25:38 +01:00
volth
ac97fbab3a
fte: init at 0.50.02
2016-12-19 16:15:59 +01:00
Jiri Danek
3745be8542
zim: fix #21270 (double call of wrapPythonPrograms)
...
Fixes #21270
2016-12-19 10:31:42 +00:00
Frederik Rietdijk
2f91dd32e9
Merge pull request #20590 from rasendubi/flask-0.11.1
...
flask: 0.10.1 -> 0.11.1
2016-12-19 09:56:36 +01:00
Adam Beckmeyer
7e54f35d65
mm: init at 2016.11.04
2016-12-18 17:10:07 -05:00
Thomas Tuegel
c2e2a8120f
audaciousQt5: init at 3.8.1
2016-12-18 15:56:24 -06:00
Joachim F
40990841f3
Merge pull request #21217 from glaebhoerl/vivaldi-1.6
...
Vivaldi 1.6
2016-12-18 22:50:41 +01:00
Marcin Janczyk
d6aa35d589
spotify: 1.0.43.125 -> 1.0.45.182
2016-12-18 22:48:55 +01:00
Joachim Fasting
1ee50bc78a
electrum: manually fixup installation of share
2016-12-18 22:19:50 +01:00
Joachim Fasting
c04c9f7435
electrum: improve build determinism
...
The icon resource file captures the build timestamp, introducing an
element of indeterminism. Fix by patching out the timestamp.
This allows
```sh
nix-build --check -A electrum
```
to succeed.
2016-12-18 22:19:48 +01:00
Marcin Janczyk
bc6e9af7fa
keepass-keefox: add myself as a maintainer
2016-12-18 19:04:35 +01:00
Rok Garbas
a66b703f94
firefox-bin/thunderbird-bin: reuse the same updateScript for both
2016-12-18 16:45:33 +01:00
