Commit Graph

31485 Commits

Author SHA1 Message Date
Sandro
3337ef145a
Merge pull request #107912 from fabaff/aiodnsbrute
aiodnsbrute: init at 0.3.2
2021-01-18 01:11:52 +01:00
eropleco
822e677f0a
smartmontools: 7.1 -> 7.2 and devicedb updated to latest (#109566)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-01-18 00:09:10 +01:00
github-actions[bot]
4bdb892722
Merge master into staging-next 2021-01-17 18:50:34 +00:00
Sandro
e53c43bebb
Merge pull request #109567 from dali99/add_metapixel
metapixel: init at 1.0.2
2021-01-17 19:49:11 +01:00
Sandro
d4d7440bcc
Merge pull request #108701 from fabaff/cantoolz 2021-01-17 19:46:21 +01:00
Sandro
9ecaa3ce76
Merge pull request #107227 from vq/add/lxi-tools
lxi-tools: init at 1.21
2021-01-17 19:45:47 +01:00
Jörg Thalheim
1279bf812c
Merge remote-tracking branch 'upstream/master' into HEAD 2021-01-17 18:08:59 +01:00
Ben Siraphob
d6aeae8f90 pkgs/tools: pkgconfig -> pkg-config (2) 2021-01-17 23:27:27 +07:00
Guillaume Girol
979e6e67d3
Merge pull request #96762 from kampka/source-highlight
source-highlight: Skip building docs when cross-compiling
2021-01-17 16:03:35 +00:00
Sandro
4e292b04af
Merge pull request #109632 from siraben/stdenv-lib-2 2021-01-17 16:29:40 +01:00
Sandro
d4682547f8
Merge pull request #109587 from LeSuisse/djvu2pdf-fix-broken-homepage-url
djvu2pdf: fix broken homepage URL
2021-01-17 16:27:09 +01:00
Daniel Olsen
a67d49dfef metapixel: init at 1.0.2 2021-01-17 15:44:27 +01:00
Ben Siraphob
d1852aca3c pkgs/tools, pkgs/applications: [sS]tdenv.*lib -> lib 2021-01-17 20:59:15 +07:00
Sandro
055fa3a647
Merge pull request #109606 from fabaff/bump-amass
amass: 3.10.5 -> 3.11.1
2021-01-17 14:14:43 +01:00
Sandro
17830a521a
Merge pull request #109593 from Wulfsta/psw
psw: 0.1.2 -> 0.2.0
2021-01-17 14:13:49 +01:00
Sandro
73f1ed5f4b
Merge pull request #109610 from raboof/reckon-0.4.4-to-0.6.0
reckon: 0.4.4 -> 0.6.0
2021-01-17 14:12:03 +01:00
Sandro
ff9a7c6dc1
Merge pull request #109549 from LeSuisse/bursuite-2020.12.1
burpsuite: 2020.1 -> 2020.12.1
2021-01-17 13:40:34 +01:00
github-actions[bot]
9541eb734d
Merge master into staging-next 2021-01-17 12:38:49 +00:00
Daniel Nilsson
143091fae6 lxi-tools: init at 1.21
Apply suggestions from code review

Co-authored-by: Ivar <41924494+IvarWithoutBones@users.noreply.github.com>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-01-17 12:27:36 +01:00
Sandro
4a2481f0c7
Merge pull request #109570 from marsam/update-peco
peco: 0.5.3 -> 0.5.8
2021-01-17 11:53:03 +01:00
Fabian Affolter
a79ef12d0b cantoolz: init at 3.7.0 2021-01-17 11:40:49 +01:00
Thomas Gerbet
7d886df96d djvu2pdf: fix broken homepage URL
Also updated to the appropriate license.
2021-01-17 11:12:52 +01:00
Sandro
e399e5fa8d
Merge pull request #109597 from austinbutler/extrafiles-lib-fix
beats: fix missing lib in extrafiles plugin
2021-01-17 10:27:04 +01:00
Mario Rodas
faed1fc0eb
Merge pull request #109601 from cole-h/age
age: 1.0.0-beta5 -> 1.0.0-beta6
2021-01-17 04:18:38 -05:00
Arnout Engelen
f60ce0313d
reckon: 0.4.4 -> 0.6.0 2021-01-17 10:03:10 +01:00
Fabian Affolter
6db50a0943 amass: 3.10.5 -> 3.11.1 2021-01-17 09:44:04 +01:00
Ben Siraphob
76f93cc731 pkgs/tools: pkgconfig -> pkg-config 2021-01-16 23:49:59 -08:00
Cole Helbling
a018f7c35d
age: 1.0.0-beta5 -> 1.0.0-beta6
https://github.com/FiloSottile/age/compare/v1.0.0-beta5...v1.0.0-beta6
2021-01-16 21:34:23 -08:00
Jan Tojnar
e6f926d910
Merge branch 'master' into staging-next 2021-01-17 05:52:23 +01:00
Mario Rodas
9483d11a4c mcfly: 0.5.2 -> 0.5.3 2021-01-17 04:20:00 +00:00
Mario Rodas
bdbbd013bd psw: enable on darwin 2021-01-17 04:20:00 +00:00
Austin Butler
1e72aa1feb beats: fix missing lib in extrafiles plugin 2021-01-16 19:15:03 -08:00
Wulfsta
727cb67dfb psw: 0.1.2 -> 0.2.0 2021-01-16 19:54:36 -05:00
Michael Weiss
a6d138c7ad
Merge pull request #109405 from primeos/ffmpeg-full-disable-rav1e
ffmpeg-full: disable rav1e by default (in favor of svt-av1)
2021-01-16 20:35:27 +01:00
Mario Rodas
2476f4aa21
Merge pull request #109558 from jojosch/mycli-1.23.2
mycli: 1.23.0 -> 1.23.2
2021-01-16 14:17:24 -05:00
Mario Rodas
b30f0e0ad4
Merge pull request #109524 from dotlambda/routino-3.3.3
routino: 3.3.2 -> 3.3.3
2021-01-16 14:16:38 -05:00
Sandro Jäckel
ea6ae87eed pythonPackages.swaglyrics: Fix dependencies 2021-01-16 10:56:42 -08:00
github-actions[bot]
f46cb85082
Merge master into staging-next 2021-01-16 18:51:05 +00:00
Johannes Schleifenbaum
cda449e23c
mycli: 1.23.0 -> 1.23.2 2021-01-16 19:26:01 +01:00
Thomas Gerbet
2c29f2ad85 burpsuite: 2020.1 -> 2020.12.1
Moved to Java 11 to avoid warnings when launching Burp Suite.
Burp Suite only officially supports Java versions 9 to 14 [0].

[0] https://portswigger.net/burp/documentation/desktop/getting-started/launching/command-line#checking-your-java-version
2021-01-16 17:39:16 +01:00
Jörg Thalheim
d8d06d1cec
Merge pull request #109455 from siraben/remove-stdenv-lib 2021-01-16 16:17:07 +00:00
Sandro
1fb0c48cf2
Merge pull request #107759 from mweinelt/kea
kea: 1.5.0-P1 -> 1.8.2
2021-01-16 16:04:58 +01:00
Robert Schütz
bb971b16de routino: 3.3.2 -> 3.3.3 2021-01-16 13:54:00 +01:00
github-actions[bot]
2445824f40
Merge master into staging-next 2021-01-16 12:40:04 +00:00
Ben Siraphob
badf51221d treewide: stdenv.lib -> lib 2021-01-16 17:58:11 +07:00
Sandro
046e4edfce
Merge pull request #109502 from danieldk/1password-gui-0.9.8
_1password-gui: 0.9.7 -> 0.9.8
2021-01-16 11:40:25 +01:00
Sandro
a9bb54359e
Merge pull request #108099 from siraben/double-quotes-fix 2021-01-16 11:27:58 +01:00
Daniël de Kok
20566f7d63 _1password-gui: 0.9.7 -> 0.9.8
Release notes:

https://releases.1password.com/linux/0.9/#1password-for-linux-0.9.8
2021-01-16 10:36:23 +01:00
R. RyanTM
bcdca92787
abcmidi: 2020.11.07 -> 2020.12.10 (#106639) 2021-01-16 09:52:53 +01:00
github-actions[bot]
c435fdab0a
Merge master into staging-next 2021-01-16 06:41:35 +00:00
Poscat
e5d652a32d
fcitx5-table-other: 5.0.1 -> 5.0.2 2021-01-16 13:16:40 +08:00
Poscat
b46049c09a
fcitx5-table-extra: 5.0.1 -> 5.0.2 2021-01-16 13:16:39 +08:00
Poscat
f0766ab3ae
fcitx5-chinese-addons: 5.0.2 -> 5.0.3 2021-01-16 13:16:38 +08:00
Poscat
1d89ec0c2c
fcitx5-rime: 5.0.2 -> 5.0.3 2021-01-16 13:16:37 +08:00
Poscat
c2de5a5f61
fcitx5-lua: 5.0.1 -> 5.0.2 2021-01-16 13:16:36 +08:00
Poscat
eb6007055d
fcitx5-configtool: 5.0.1 -> 5.0.2 2021-01-16 13:16:33 +08:00
Poscat
937ea70a98
libsForQt5.fcitx5-qt: 5.0.1 -> 5.0.2 2021-01-16 13:16:20 +08:00
Poscat
15f2be29d6
fcitx5-gtk: 5.0.1 -> 5.0.3 2021-01-16 13:16:09 +08:00
Ben Siraphob
8dd78bb4fb treewide: fix double quoted strings in meta.description 2021-01-16 11:29:30 +07:00
Mario Rodas
568424435a peco: 0.5.3 -> 0.5.8 2021-01-16 04:20:00 +00:00
Poscat
c0e0b52174
fcitx5: 5.0.3 -> 5.0.4 2021-01-16 12:02:54 +08:00
Poscat
13f5c8013f
Add an update script for fcitx packages 2021-01-16 12:02:43 +08:00
zowoq
11434e2040 youtube-dl: 2021.01.08 -> 2021.01.16
https://github.com/ytdl-org/youtube-dl/releases/tag/2021.01.16
2021-01-16 12:56:23 +10:00
github-actions[bot]
3269d4d3a3
Merge master into staging-next 2021-01-15 18:52:54 +00:00
Sandro
36ff80b7c8
Merge pull request #109445 from iAmMrinal0/update/google-cloud-sdk
google-cloud-sdk: 322.0.0 -> 323.0.0
2021-01-15 18:34:14 +01:00
Sandro
0eb69dab67
Merge pull request #109446 from jojosch/mycli-1.23.0
mycli: 1.22.2 -> 1.23.0
2021-01-15 18:33:03 +01:00
Jan Tojnar
c0d2951fa6
Merge branch 'master' into staging-next 2021-01-15 17:46:46 +01:00
Sandro
f6a9596c4a
Merge pull request #109450 from msteen/patch-2
nix-prefetch: 0.3.1 -> 0.4.0
2021-01-15 16:55:33 +01:00
Tim Steinbach
7bead9b8fa
awscli: 1.18.211 -> 1.18.215 2021-01-15 10:39:10 -05:00
msteen
a4e13d2a1a nix-prefetch: 0.3.1 -> 0.4.0 2021-01-15 16:21:08 +01:00
Mrinal Purohit
7370d2346b google-cloud-sdk: 322.0.0 -> 323.0.0 2021-01-15 19:21:14 +05:30
Johannes Schleifenbaum
be9bda4fa0
mycli: 1.22.2 -> 1.23.0 2021-01-15 14:50:31 +01:00
Michael Weiss
2345e374af
svt-av1: Extend the meta attributes
I've merged my local package definitions with the ones in Nixpkgs.
2021-01-15 14:21:07 +01:00
Jörg Thalheim
147270c1c9
Merge pull request #109434 from siraben/pkgs-tools-stdenv
pkgs/tools: stdenv.lib -> lib
2021-01-15 10:48:18 +00:00
Ben Siraphob
8c5d37129f pkgs/tools: stdenv.lib -> lib 2021-01-15 17:12:36 +07:00
Sandro
ebd22859f2
Merge pull request #108969 from lourkeur/update/xpra 2021-01-15 10:52:16 +01:00
Michael Raskin
35da03c298
Merge pull request #93321 from chessai/puppeteer-init
puppeteer-cli: init
2021-01-15 09:36:52 +00:00
Maximilian Bosch
9e3a6eaec1
Merge pull request #109082 from delroth/sudo-1.9.5p1
sudo: 1.9.4p2 -> 1.9.5p1
2021-01-15 09:30:01 +01:00
Sarah Brofeldt
c6c1319d13
Merge pull request #109286 from johanot/ceph-15.2.8
ceph: 15.2.7 -> 15.2.8
2021-01-15 08:44:08 +01:00
github-actions[bot]
9f69dadafd
Merge master into staging-next 2021-01-15 01:16:33 +00:00
Alyssa Ross
3893d6c6d7 gitAndTools: move everything to the top level
The comment at the top of git-and-tools/default.nix said:

    /* All git-relates tools live here, in a separate attribute set so that users
     * can get a fast overview over what's available.

but unfortunately that hasn't actually held up in practice.

Git-related packages have continued to be added to the top level, or
into gitAndTools, or sometimes both, basically at random, so having
gitAndTools is just confusing.  In fact, until I looked as part of
working on getting rid of gitAndTools, one program (ydiff) was
packaged twice independently, once in gitAndTools and once at the top
level (I fixed this in 98c3490196).

So I think it's for the best if we move away from gitAndTools, and
just put all the packages it previously contained at the top level.
I've implemented this here by just making gitAndTools an alias for the
top level -- this saves having loads of lines in aliases.nix.  This
means that people can keep referring to gitAndTools in their
configuration, but it won't be allowed to be used within Nixpkgs, and
it won't be presented to new users by e.g. nix search.

The only other change here that I'm aware of is that
appendToName "minimal" is not longer called on the default git
package, because doing that would have necessitated having a private
gitBase variable like before.  I think it makes more sense not to do
that anyway, and reserve the "minimal" suffix only for gitMinimal.
2021-01-14 21:27:48 +00:00
Sandro
1fa1ae39f5
Merge pull request #108563 from mkuettel/plantuml-1.2020.26
plantuml: 1.2020.19 -> 1.2020.26
2021-01-14 20:58:38 +01:00
zowoq
2299a66b88 gdu: 2.2.0 -> 2.3.0
https://github.com/dundee/gdu/releases/tag/v2.3.0
2021-01-15 05:36:04 +10:00
Michael Weiss
7fb79605a7
inxi: 3.2.02-1 -> 3.2.02-2 2021-01-14 20:32:59 +01:00
github-actions[bot]
183b673b64
Merge master into staging-next 2021-01-14 18:54:05 +00:00
Fabian Möller
f213aa3ae0
nixpart0: stdenv.lib -> lib
This fixes an evaluation error indroduced by #108978
2021-01-14 16:57:44 +01:00
Sandro
55ebc2e2c2
Merge pull request #109358 from oxzi/reuse-0.12.1
reuse: 0.11.1 -> 0.12.1
2021-01-14 16:11:53 +01:00
Alvar Penning
8f81d7554f reuse: 0.11.1 -> 0.12.1
Next to the version bump, the tests are now executed.
2021-01-14 15:55:10 +01:00
Sandro
7dd624a450
Merge pull request #109311 from bbigras/zenith
zenith: 0.11.0 -> 0.12.0
2021-01-14 15:29:58 +01:00
Michael Raskin
f62ab91aa7
Merge pull request #104912 from helsinki-systems/upd/p7zip
p7zip: 17.01 -> 17.03
2021-01-14 14:10:42 +00:00
github-actions[bot]
730ff71234
Merge master into staging-next 2021-01-14 12:42:20 +00:00
Emery Hemingway
f385802067 gnuvd: remove
The backend service for this dictionary has been discontinued or is
incompatible.
2021-01-14 13:36:21 +01:00
ajs124
0004c16701 p7zip: 17.01 -> 17.03 2021-01-14 02:58:41 +01:00
Jan Tojnar
b813710c04
Merge branch 'master' into staging-next 2021-01-14 02:24:17 +01:00
Bruno Bigras
3e367bdcba zenith: 0.11.0 -> 0.12.0 2021-01-13 15:28:38 -05:00
llathasa-veleth
92803d781b disfetch: 1.12 -> 1.13 2021-01-13 22:33:51 +03:00
Mogria
2025ca9528 plantuml: 1.2020.22 -> 1.2020.26
PlantUML complains that it's too old when a diagram is generated to PNG an
error occurs.
2021-01-13 16:31:10 +01:00
Johan Thomsen
423b9b2a70 ceph: 15.2.7 -> 15.2.8 2021-01-13 15:51:18 +01:00
Sirio Balmelli
097d0836b4
gopass: 1.10.1 -> 1.11.0
Remove workaround introduced in dda50e73:
https://github.com/gopasspw/gopass/issues/1662
has now been fixed upstream.

Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
2021-01-13 14:14:48 +01:00
Sandro
fa0253297e
Merge pull request #109258 from oxzi/go-shadowsocks2-0.1.3
go-shadowsocks2: 0.0.11 -> 0.1.3
2021-01-13 12:11:54 +01:00
Sandro
568a5bb6b8
Merge pull request #108911 from davegallant/awscli2-2.1.17
awscli2: 2.1.7 -> 2.1.17
2021-01-13 12:08:00 +01:00
Alvar Penning
7c395b756d go-shadowsocks2: 0.0.11 -> 0.1.3 2021-01-13 10:12:29 +01:00
Jörg Thalheim
dbb48b45a5
Merge pull request #107961 from KAction/par-static
par: fix static build
2021-01-13 09:05:40 +00:00
Jörg Thalheim
11033cbb6b
par: fix build 2021-01-13 10:00:45 +01:00
Sandro
8b5d1a9e74
Merge pull request #109097 from sternenseemann/lowdown-0.7.9
lowdown: 0.7.5 -> 0.7.9
2021-01-13 09:16:33 +01:00
Sandro
7b596e48b8
Merge pull request #107616 from fabaff/hakrawler
hakrawler: init at 20201224-e39a514
2021-01-13 08:45:31 +01:00
Sandro
5173a75d4f
Merge pull request #107752 from fabaff/terrascan 2021-01-13 08:45:02 +01:00
Sandro
cc0d004530
Merge pull request #109124 from fabaff/bump-socat
socat: 1.7.3.4 -> 1.7.4.1
2021-01-13 08:43:49 +01:00
github-actions[bot]
3edc776d77
Merge master into staging-next 2021-01-13 01:11:17 +00:00
Sandro
9c043cf029
Merge pull request #109084 from r-ryantm/auto-update/tmuxp
tmuxp: 1.6.3 -> 1.7.0
2021-01-12 23:00:17 +01:00
Fabian Affolter
af94d8ca0c terrascan: init at 1.2.0 2021-01-12 22:09:15 +01:00
Fabian Affolter
93b5742b15 hakrawler: init at 20201224-e39a514 2021-01-12 21:43:05 +01:00
github-actions[bot]
f47a1ddfe4
Merge master into staging-next 2021-01-12 18:47:24 +00:00
Jonathan Ringer
8aaba2790d ytcc: 1.8.4 -> 2.0.1 2021-01-12 10:19:06 -08:00
Fabian Affolter
bde9c12b59 socat: 1.7.3.4 -> 1.7.4.1 2021-01-12 17:32:58 +01:00
Sandro
d61322ad92
Merge pull request #108912 from TredwellGit/languagetool
languagetool: 5.1 -> 5.2
2021-01-12 16:57:18 +01:00
Jörg Thalheim
26787436b3
Merge pull request #109109 from Mic92/ofono
ofono: load configuration from outside the nix store
2021-01-12 15:05:10 +00:00
Fabian Affolter
8484a73059
netsniff-ng: 0.6.7 -> 0.6.8 (#109049) 2021-01-12 15:56:36 +01:00
Jonathan Ringer
c0f8f2de40 azure-cli: 2.17.0 -> 2.17.1 2021-01-12 06:24:34 -08:00
Dmitry Kalinkin
4faa65a09c
Merge pull request #108895 from veprbl/pr/texlive_2020_20210109
texlive: 2020.20201009 -> 2020.20210109
2021-01-12 09:20:35 -05:00
adisbladis
7412b9f065
trillian: init at 1.3.11 2021-01-12 13:18:33 +01:00
Jörg Thalheim
65bf177b0b
ofono: load configuration from outside the nix store 2021-01-12 13:13:36 +01:00
sternenseemann
cd62625b47 lowdown: 0.7.5 -> 0.7.9 2021-01-12 10:33:03 +01:00
Michael Weiss
d88ad75767 gnupg: 2.2.26 -> 2.2.27
Announcement: https://lists.gnupg.org/pipermail/gnupg-announce/2021q1/000452.html

Luckily this fixes a regression from GnuPG 2.2.26 that broke the build
of libsForQt5.qgpgme (a test failed). Fix #109009.
2021-01-12 08:33:48 +01:00
Michael Weiss
d4af169467 gnupg: 2.2.26 -> 2.2.27
Announcement: https://lists.gnupg.org/pipermail/gnupg-announce/2021q1/000452.html

Luckily this fixes a regression from GnuPG 2.2.26 that broke the build
of libsForQt5.qgpgme (a test failed). Fix #109009.
2021-01-12 08:32:37 +01:00
github-actions[bot]
bfcc20a149
Merge master into staging-next 2021-01-12 06:34:30 +00:00
zowoq
bab15d6bcd gdu: 2.1.0 -> 2.2.0
https://github.com/dundee/gdu/releases/tag/v2.2.0
2021-01-12 16:13:13 +10:00
R. RyanTM
b3daf3ebc5 tmuxp: 1.6.3 -> 1.7.0 2021-01-12 05:52:09 +00:00
Pierre Bourdon
ae6a8f9457
sudo: 1.9.4p2 -> 1.9.5p1 2021-01-12 05:56:35 +01:00
github-actions[bot]
32a46d68f3
Merge master into staging-next 2021-01-12 01:04:47 +00:00
Sandro
a588b71b37
Merge pull request #107720 from freezeboy/update-bacula
bacula: 9.6.6 -> 11.0.0
2021-01-12 01:51:25 +01:00
Sandro
1760d488e4
Merge pull request #99565 from fishi0x01/fishi0x01/vsh
vsh: init at 0.7.2
2021-01-12 01:51:03 +01:00
Sandro
5bbd3a63a0
Merge pull request #108980 from nagy/poedit-gtk3
poedit: use gtk3
2021-01-12 01:46:41 +01:00
Dmitry Bogatov
a5f92046ce par: fix static build
This change causes rebuild of both glibc and musl dynamic variants, but
no cascade rebuilds.
2021-01-12 00:00:00 +00:00
Michael Weiss
87d2f1d2b0
inxi: 3.2.01-1 -> 3.2.02-1 2021-01-11 22:25:22 +01:00
Martin Weinelt
f07cef2e7f
kea: 1.5.0-P1 -> 1.8.2
Enables kea-shell and perfdhcp, drops several unused dependencies.
2021-01-11 20:04:42 +01:00
Frederik Rietdijk
04dcf88df6 efivar: don't use lto at all
https://github.com/NixOS/nixpkgs/pull/109007#issuecomment-758150833
2021-01-11 19:51:10 +01:00
github-actions[bot]
757ad34b82
Merge master into staging-next 2021-01-11 18:42:29 +00:00
Sandro
91c82426f0
Merge pull request #108925 from SuperSandro2000/fix-collection2 2021-01-11 19:26:51 +01:00
Dmitry Kalinkin
c5787e5b8c
texlive: 2020.20201009 -> 2020.20210109 2021-01-11 13:02:54 -05:00
Daniel Nagy
51cb6bffed
poedit: use gtk3 2021-01-11 19:02:23 +01:00
Dmitry Kalinkin
ac255ab62e
texlive: put snapshot date into the version 2021-01-11 13:01:39 -05:00
Sandro
98ac3af455
Merge pull request #108774 from iAmMrinal0/update/google-cloud-sdk
google-cloud-sdk: 321.0.0 -> 322.0.0
2021-01-11 18:43:15 +01:00
Jan Tojnar
2b9372b2ca
Merge branch 'master' into staging-next 2021-01-11 13:36:42 +01:00
TredwellGit
8b2edefcd6 languagetool: 5.1 -> 5.2
https://github.com/languagetool-org/languagetool/blob/v5.2/languagetool-standalone/CHANGES.md
2021-01-11 11:17:26 +00:00
Sandro Jäckel
0e780ce872
nagstamon: Mark as broken 2021-01-11 12:08:18 +01:00
Louis Bettens
e3dac9b6b3 xpra: 4.0.2 -> 4.0.6 2021-01-11 11:05:59 +01:00
Louis Bettens
a129a5e2d9 xpra: add update script 2021-01-11 11:05:53 +01:00
Profpatsch
4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
github-actions[bot]
75bb36a66f
Merge staging-next into staging 2021-01-11 06:33:34 +00:00
github-actions[bot]
db7b9735f9
Merge master into staging-next 2021-01-11 06:33:30 +00:00
Wulfsta
5ca3562611 psw: init at 0.1.2 2021-01-10 22:22:28 -08:00
Sandro
0e99531c54
Merge pull request #108953 from fgaz/urn/init
urn-timer: init at unstable-2017-08-20
2021-01-11 02:19:40 +01:00
Sandro
6af32a6878
Merge pull request #108963 from fabaff/crlfuzz
crlfuzz: init at 1.4.0
2021-01-11 02:11:04 +01:00
github-actions[bot]
1cce663933
Merge staging-next into staging 2021-01-11 01:02:25 +00:00
github-actions[bot]
36bab113bf
Merge master into staging-next 2021-01-11 01:02:21 +00:00
Sandro
f337a3fc22
Merge pull request #107640 from fabaff/monsoon
monsoon: init at 0.6.0
2021-01-11 02:02:17 +01:00
Sandro
0a9371b7c4
Merge pull request #108936 from Atemu/squashfsTools-lz4Support
squashfsTools: unconditionally build with lz4Support
2021-01-11 02:00:03 +01:00
Sandro
e7fe0bbc91
Merge pull request #108805 from servalcatty/v2ray
v2ray: 4.33.0 -> 4.34.0
2021-01-11 01:40:33 +01:00
Sandro
c9234f3a99
Merge pull request #93917 from zaninime/openzone 2021-01-11 01:38:00 +01:00
Sandro
39229a3398
Merge pull request #108572 from fabaff/bump-sortedcollections 2021-01-11 01:36:33 +01:00
Jan Tojnar
dd72357155
Merge branch 'master' into staging-next 2021-01-10 23:24:33 +01:00
Francesco Gazzetta
5dc817a54c urn-timer: init at unstable-2017-08-20 2021-01-10 22:29:48 +01:00
Anderson Torres
1373f75002
Merge pull request #108801 from AndersonTorres/update-argtable
argtable: 3.0.1 -> 3.1.5 
libmicrohttpd: init at 0.9.72
libjson-rpc-cpp: 0.7.0 -> 1.3.0
2021-01-10 16:59:03 -03:00
Sandro
903ebabea6
Merge pull request #108110 from fabaff/badchars
badchars: init at 0.4.0
2021-01-10 20:56:46 +01:00
Sandro
a657c03fd8
Merge pull request #108120 from fabaff/ldeep 2021-01-10 20:55:14 +01:00
Sandro
f41dc35387
Merge pull request #108799 from SuperSandro2000/fix-collection 2021-01-10 20:04:46 +01:00
Fabian Affolter
45bb37cfbf crlfuzz: init at 1.4.0 2021-01-10 17:30:15 +01:00
AndersonTorres
db27acb1c8 argtable: 3.0.1 -> 3.1.5 2021-01-10 12:43:48 -03:00
Dave Gallant
d05e7e6cc4
awscli2: 2.1.7 -> 2.1.17 2021-01-10 10:04:51 -05:00
Fabian Affolter
93f7742d61 google-music-scripts: fix build 2021-01-10 15:56:55 +01:00
Frederik Rietdijk
0c42bb5027 Merge master into staging-next 2021-01-10 15:50:49 +01:00
Matthieu Coudron
9f8b7cb4a8
Merge pull request #104658 from poscat0x04/add-fcitx5
Add fcitx5
2021-01-10 15:26:27 +01:00
Serval
0f34b4c439
v2ray: 4.33.0 -> 4.34.0 2021-01-10 22:06:46 +08:00
Sandro Jäckel
511c7203b0
urlwatch: Disable tests, name -> pname 2021-01-10 13:18:37 +01:00
Atemu
579b25b5a8 squashfsTools: unconditionally build with lz4Support
Can't think of a reason to not enable that.
2021-01-10 12:56:46 +01:00
Sandro
b80f4f1a31
Merge pull request #108638 from andrewchambers/bupstash
bupstash: init at 0.6.4
2021-01-10 12:47:51 +01:00
Sandro
d25225b014
Merge pull request #96039 from MilesBreslin/evscript 2021-01-10 12:18:27 +01:00
Sandro
a5969bcd23
Merge pull request #108850 from andir/pcsc-cyberjack
pcsc-cyberjack: fix compilation with gcc10
2021-01-10 11:52:12 +01:00
Sandro
e08f29f997
Merge pull request #108889 from fabaff/bump-sn0int 2021-01-10 11:37:10 +01:00
Andrew Chambers
0380ee437b bupstash: init at 0.6.4 2021-01-10 22:58:42 +13:00
Mario Rodas
f7c4e825aa
Merge pull request #105438 from alerque/sile-0.10.13
sile: 0.10.12 → 0.10.13
2021-01-10 02:21:18 -05:00
Sandro
345206baf3
Merge pull request #108874 from fabaff/deepsea
deepsea: init at 0.9
2021-01-10 08:09:39 +01:00
github-actions[bot]
add2d89082
Merge master into staging-next 2021-01-10 06:32:12 +00:00
Poscat
4ef6482261
fcitx5-table-other: Init at 5.0.1 2021-01-10 14:31:10 +08:00
Poscat
7b99329edd
fcitx5-table-extra: Init at 5.0.1 2021-01-10 14:31:09 +08:00
Poscat
1b06ca4b0d
fcitx5-with-addons: Init 2021-01-10 14:31:07 +08:00
Poscat
3dbd3d11e3
fcitx5-chinese-addons: Init at 5.0.2 2021-01-10 14:31:06 +08:00
Poscat
208b419ab5
fcitx5-lua: Init at 5.0.1 2021-01-10 14:31:05 +08:00
Poscat
ea50300499
fcitx5-rime: Init at 5.0.2 2021-01-10 14:31:03 +08:00
Poscat
1da3fbf0eb
fcitx5-configtool: Init at 5.0.1 2021-01-10 14:31:02 +08:00
Poscat
5409030ea1
fcitx5-gtk: Init at 5.0.1 2021-01-10 14:31:01 +08:00
Poscat
e42b4d312f
fcitx5-qt: Init at 5.0.1 2021-01-10 14:30:58 +08:00
Poscat
85a30b1fd8
fcitx5: Init at 5.0.3 2021-01-10 13:24:20 +08:00
zowoq
2032339e5b mmv-go: 0.1.2 -> 0.1.3
https://github.com/itchyny/mmv/releases/tag/v0.1.3
2021-01-10 11:54:57 +10:00
github-actions[bot]
433c7b069c
Merge master into staging-next 2021-01-10 01:03:35 +00:00
Mario Rodas
69dc12e045
Merge pull request #108873 from fabaff/cloudbrute
cloudbrute: init 1.0.7
2021-01-09 18:29:49 -05:00
Sandro
fc93c76c7c
Merge pull request #108778 from Ma27/tigervnc-cve-2020-26117
tigervnc: 1.10.1 -> 1.11.0 (CVE-2020-26117)
2021-01-09 23:25:53 +01:00
Fabian Affolter
a186a06922 sn0int: specify license 2021-01-09 23:20:25 +01:00
Fabian Affolter
c26ae5ead8 sn0int: 0.19.1 -> 0.20.0 2021-01-09 22:44:19 +01:00
Michele Guerini Rocco
dca46f6bd9
Merge pull request #108858 from fabaff/bump-masscan
masscan: 1.0.5 -> 1.3.0
2021-01-09 20:06:52 +01:00
github-actions[bot]
fcbe48c797
Merge master into staging-next 2021-01-09 18:41:27 +00:00
Fabian Affolter
9b0c54618d deepsea: init at 0.9 2021-01-09 18:27:54 +01:00
Fabian Affolter
30ad59abc0 cloudbrute: init 1.0.7 2021-01-09 18:12:41 +01:00
Sandro Jäckel
5112d49007
nix-update: 0.3.1 -> 0.3.2 2021-01-09 17:03:41 +01:00
Michael Weiss
fa2b9b890a
Merge pull request #103104 from Artturin/add-pciutils-inxi
inxi: add pciutils
2021-01-09 16:46:47 +01:00
Guillaume Girol
67ff28aca0
Merge pull request #108789 from thiagokokada/add-tests-to-opentabletdriver
nixos/opentabletdriver: add tests
2021-01-09 15:20:52 +00:00
Fabian Affolter
6db65fa554 masscan: 1.0.5 -> 1.3.0 2021-01-09 15:05:54 +01:00
Artturin
a91459c929
inxi: add pciutils (optional dependency) 2021-01-09 14:47:17 +01:00
Andreas Rammhold
e1684ef555
pcsc-cyberjack: fix compilation with gcc10
The change to GCC 10 did break this package as it does some conversation
from 32bit integer to the type "int" which might be "narrower" depending
on the platform. By default GCC 10 errors in these cases. Since this
code is fine (and has been for a long time) it is okay to disable the
error in this case.
2021-01-09 12:53:24 +01:00
github-actions[bot]
e251591528
Merge master into staging-next 2021-01-09 01:00:25 +00:00
Bernardo Meurer
6ddc2e93cd
Merge pull request #108814 from MasseGuillaume/pulumi-bump-2
pulumi: 2.15.0 -> 2.17.0
2021-01-08 22:45:16 +00:00
Benjamin Hipple
a091507c98
Merge pull request #108278 from alexameen/conda-shell
conda: Source conda.sh during conda-shell setup
2021-01-08 16:51:56 -05:00
Guillaume Massé
fbfcc8a002 pulumi: 2.15.0 -> 2.17.0 2021-01-08 16:03:10 -05:00
Niklas Hambüchen
22b9910f4e
Merge pull request #108804 from ketzacoatl/amazon-ec2-utils
Amazon ec2 utils
2021-01-08 20:43:12 +01:00
Anderson Torres
69534f39a7
Merge pull request #106985 from Technical27/master
auto-cpufreq: init at 1.5.1
2021-01-08 16:16:45 -03:00
Ketzacoatl
630d0163ae amazon-ec2-utils: init at 1.3 2021-01-08 14:14:38 -05:00
github-actions[bot]
f89e74dbcc
Merge master into staging-next 2021-01-08 18:37:56 +00:00
Thiago Kenji Okada
41c50cc505 nixos/opentabletdriver: add tests 2021-01-08 14:27:40 -03:00
Maximilian Bosch
c15be8d685
tigervnc: 1.10.1 -> 1.11.0 (CVE-2020-26117)
ChangeLog: https://github.com/TigerVNC/tigervnc/releases/tag/v1.11.0
Also fixes CVE-2020-26117[1].

[1] https://nvd.nist.gov/vuln/detail/CVE-2020-26117, #100324
2021-01-08 16:50:16 +01:00
Mrinal Purohit
64d09c76d5 google-cloud-sdk: 321.0.0 -> 322.0.0 2021-01-08 20:27:57 +05:30
Tim Steinbach
137859bc9d
awscli: 1.18.210 -> 1.18.211 2021-01-08 09:00:19 -05:00
github-actions[bot]
ecebf82121
Merge master into staging-next 2021-01-08 12:29:36 +00:00
Pavol Rusnak
922b041809
Merge pull request #108009 from nima2007/mcrypt1
mcrypt: patch to include stdlib.h instead of malloc.h to build on darwin
2021-01-08 13:19:29 +01:00
zowoq
752fce151b youtube-dl: 2021.01.03 -> 2021.01.08
https://github.com/ytdl-org/youtube-dl/releases/tag/2021.01.08
2021-01-08 16:34:54 +10:00
github-actions[bot]
67bbf2c845
Merge master into staging-next 2021-01-08 06:28:59 +00:00
Joachim Breitner
a00f391174 coreutils: Do not autoreconfHook on Musl
as suggested by @tobim, fixes #108661
2021-01-08 05:43:28 +00:00
Mario Rodas
c33c9cefe3 sile: mark as broken on Darwin 2021-01-08 04:20:00 +00:00
Mario Rodas
f0b9468613 lxd: 4.9 -> 4.10
https://discuss.linuxcontainers.org/t/lxd-4-10-has-been-released/9894
2021-01-08 04:20:00 +00:00
Mario Rodas
ba410c2647
Merge pull request #108533 from purcell/hdf4-darwin-libtirpc
[hdf4] Fix build on Darwin, which blocked gdal, postgis and more
2021-01-07 22:35:06 -05:00
Jan Tojnar
e6c0c98940
Merge branch 'master' into staging-next
zynaddsubfx conflict has been updated to 3.0.1, which conflicted with rewrite after 3.0.5 update on a different branch.
2021-01-08 02:07:34 +01:00
Sandro
610ec6fe8f
Merge pull request #108704 from acowley/aux2bib
bibtex2html: add perl dependency
2021-01-08 00:30:04 +01:00
Miles Breslin
8ac4b7c7fd evscript: Init at git-47f86f0 2021-01-07 14:13:00 -08:00
Sandro
a72b5fd784
Merge pull request #108684 from Emantor/new/mpris-scrobbler
mpris-scrobbler: init at 0.4.0.1
2021-01-07 22:56:58 +01:00
Sandro
7a2a45cfc0
Merge pull request #108622 from bbigras/tab-rs
tab-rs: init at 0.5.5
2021-01-07 22:56:40 +01:00
Francesco Zanini
50e0de1232 icon-slicer: init at 0.3 2021-01-07 22:46:40 +01:00
Guillaume Girol
d52f984624
Merge pull request #108591 from iblech/patch-24
dsniff: unbreak the build
2021-01-07 21:40:32 +00:00
Sandro
e587f393dd
Merge pull request #108660 from fabaff/subjs
subjs: init at 1.0.1
2021-01-07 21:07:03 +01:00
Daniël de Kok
7b72e86481
Merge pull request #108396 from nagy/ceph-aarch64
ceph: enable aarch64-linux platform
2021-01-07 19:54:51 +01:00
github-actions[bot]
5c072a088d
Merge master into staging-next 2021-01-07 18:40:50 +00:00
Anthony Cowley
d620de4a69 bibtex2html: add perl dependency
The `aux2bib` tool that is part of the bibtex2html package requires
perl. Without this dependency, the `aux2bib` script is installed with
a shebang pointing to `/usr/bin/perl`.
2021-01-07 12:51:16 -05:00
David Wood
70e7255831
mdcat: 0.22.1 -> 0.22.2 2021-01-07 17:08:11 +00:00
Rouven Czerwinski
cf2c95a19f mpris-scrobbler: init at 0.4.0.1
Minimalistic scrobbler using the the MPRIS specification to scrobble to
libre.fm and last.fm.
2021-01-07 16:45:53 +01:00
Tim Steinbach
10149d6954
awscli: 1.18.209 -> 1.18.210 2021-01-07 09:57:23 -05:00
Fabian Affolter
15da30e04a subjs: init at 1.0.1 2021-01-07 13:55:55 +01:00
Jan Tojnar
f19eb635b4
Merge branch 'master' into staging-next
b04fc593e7 seems to have accidentally changed mkDerivation function for dfilemanager and solarus-quest-editor so I have reverted that here.
2021-01-07 13:04:31 +01:00
Sandro
5796227734
Merge pull request #108633 from tckmn/add-foma 2021-01-07 12:20:28 +01:00
Sandro
e96424dc1e
Merge pull request #108648 from djanatyn/pkg/rdrview
rdrview: init at unstable-2020-12-22
2021-01-07 12:00:06 +01:00
Sandro
4c87452cab
Merge pull request #108605 from fabaff/grype
grype: init at 0.6.1
2021-01-07 11:47:40 +01:00
Bruno Bigras
4d76eb1621 tab-rs: init at 0.5.5
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-01-07 05:43:09 -05:00
Sandro
fcc81bc974
Merge pull request #108483 from andresilva/mdbook-0.4.5
mdbook: 0.4.4 -> 0.4.5
2021-01-07 11:31:43 +01:00
Sandro
61ecc6e467
Merge pull request #108593 from fabaff/urlhunter
urlhunter: init at 0.1.1
2021-01-07 11:15:08 +01:00
Jonathan Strickland
cddd4fe84a rdrview: init at unstable-2020-12-22 2021-01-07 04:44:47 -05:00
Sandro Jäckel
ffc02499d6
evdevremapkeys: Disable tests, remove name use 2021-01-07 10:43:52 +01:00
Sandro
3f132c79ac
Merge pull request #108536 from SuperSandro2000/small-fixes 2021-01-07 10:38:49 +01:00
Andy Tockman
926854440f foma: init at 0.9.18alpha 2021-01-06 21:13:20 -06:00
Sandro
400ab9c999
Merge pull request #108515 from roosemberth/bump-wtype
wtype: 2020-09-14 -> 0.3
2021-01-07 02:51:44 +01:00
Ingo Blechschmidt
0f15ca239d dsniff: unbreak the build
We revert to using GCC 9 for compilation, in order to work around a GCC 10 bug
resulting in a segfault when compiling.

The alternative would be to restrict to optimization level -O1, but this
disables fortify.
2021-01-07 00:30:10 +01:00
Sandro
de2c770f3e
Merge pull request #108510 from zowoq/fzf
fzf: 0.24.4 -> 0.25.0
2021-01-07 00:14:22 +01:00
Sandro Jäckel
ac391fdc0b
pythonPackages:google*: Noramlize names by replacing _ with - 2021-01-06 23:59:50 +01:00
Steve Purcell
0f4be28af5 hdf4: fix build on darwin
The fix here is to not include libtirc on Darwin, on which platform
the library is unavailable.
2021-01-07 11:51:22 +13:00
Sandro
210b6509ed
Merge pull request #108501 from Ma27/tcpdump-cve-2020-8037
tcpdump: fix CVE-2020-8037
2021-01-06 22:51:42 +01:00
Tim Steinbach
631af2143f
awscli: 1.18.208 -> 1.18.209 2021-01-06 14:28:39 -05:00
Michael Weiss
b9cbe0f8e7
fim: Fix the build by switching back to GCC 9
GCC 10 breaks the build: https://hydra.nixos.org/build/134272249
There are workarounds to fix the build with GCC 10 [0] but since
upstream is inactive it's probably best to deprecate fim soon.

[0]: https://aur.archlinux.org/cgit/aur.git/commit/?h=fim&id=66258387a099da72f7758495fb0e3c93e16068e7
2021-01-06 19:45:39 +01:00
Fabian Affolter
0fcc27a666 grype: init at 0.6.1 2021-01-06 19:11:00 +01:00
Fabian Affolter
90dc95e41e urlhunter: init at 0.1.1 2021-01-06 17:37:10 +01:00
Roosembert Palacios
f782b23bbd
wtype: 2020-09-14 -> 0.3
Signed-off-by: Roosembert Palacios <roosemberth@posteo.ch>
2021-01-06 16:40:43 +01:00
Peter Hoeg
8436064b26 clinfo: make it build again 2021-01-06 22:53:39 +08:00
Mario Rodas
dfd0182493
Merge pull request #108552 from marsam/update-nfpm
nfpm: 1.10.2 -> 2.2.2
2021-01-06 09:43:43 -05:00
Doron Behar
41d68e4e13
Merge pull request #94561 from cpcloud/shipyard
shipyard: init at 0.1.17
2021-01-06 16:08:13 +02:00
Sandro
106576b2cd
Merge pull request #108561 from marsam/update-fastlane
fastlane: 2.148.1 -> 2.171.0
2021-01-06 13:44:48 +01:00
Mario Rodas
f936bda720
Merge pull request #108364 from Chili-Man/vault-1.6.1-update
vault: 1.6.0 -> 1.6.1
2021-01-06 06:08:40 -05:00
Phillip Cloud
6780f6c607 shipyard: init at 0.1.17 2021-01-06 05:44:09 -05:00
Sandro
fd0c2add78
Merge pull request #108555 from Enzime/remove/maintainer-status
treewide: stop maintaining most packages
2021-01-06 11:42:54 +01:00
Sandro Jäckel
ffced65cee
grab-site: Fix package 2021-01-06 11:05:14 +01:00
Michael Hoang
31f9051cf6 treewide: stop maintaining most packages 2021-01-06 17:06:03 +11:00
Mario Rodas
4e885b9a7e nfpm: 1.10.2 -> 2.2.2 2021-01-05 23:38:10 -05:00
Mario Rodas
109c2c7e06 fastlane: 2.148.1 -> 2.171.0 2021-01-06 04:20:00 +00:00
Mario Rodas
5ca9b52719 vorbisgain: enable on darwin 2021-01-06 04:20:00 +00:00
Orivej Desh
4e2a4fc133 nixUnstable: 2.4pre20201201_5a6ddb3 -> 2.4pre20201205_a5d85d0
It support newer aws-cpp-sdk since https://github.com/NixOS/nix/pull/4316
2021-01-06 06:05:52 +00:00
Orivej Desh
b07089cd1a nix: patch to support newer aws-sdk-cpp
Upstream PR: https://github.com/NixOS/nix/pull/4404
2021-01-06 06:05:52 +00:00
Orivej Desh
4cb0e9e1c4 nix: update aws-sdk-cpp TransferManager ContentEncoding patch for 1.8.113 2021-01-06 06:05:51 +00:00
Diego Rodriguez
1017399b7a
vault-bin: 1.6.0 -> 1.6.1 2021-01-05 21:00:25 -07:00
Mario Rodas
81754da8c8
Merge pull request #108521 from lovesegfault/vale-2.6.8
vale: 2.6.5 -> 2.6.8
2021-01-05 21:10:27 -05:00
Sandro
cde7613874
Merge pull request #108051 from SuperSandro2000/luxcorerender-build
luxcorerender: Fix build
2021-01-06 01:59:34 +01:00
Sandro
91f3a87b16
Merge pull request #108508 from zowoq/nix-update
nix-update: 0.3 -> 0.3.1
2021-01-06 01:17:08 +01:00
Phillip Cloud
014007ff20 consul-template: 0.19.4 -> 0.25.1 2021-01-05 14:51:10 -08:00
Bernardo Meurer
0c1a71e855
vale: 2.6.5 -> 2.6.8 2021-01-05 13:45:11 -08:00
zowoq
8710256ef4 fzf: 0.24.4 -> 0.25.0
https://github.com/junegunn/fzf/releases/tag/0.25.0
2021-01-06 06:11:26 +10:00
zowoq
4abbfd83d9 nix-update: 0.3 -> 0.3.1
https://github.com/Mic92/nix-update/releases/tag/0.3.1
2021-01-06 05:46:08 +10:00
Maximilian Bosch
08d77caac0
tcpdump: fix CVE-2020-8037
https://nvd.nist.gov/vuln/detail/CVE-2020-8037
2021-01-05 19:39:28 +01:00
Jörg Thalheim
a14ea3aecc
Merge pull request #97740 from ju1m/tor
nixos/tor: improve type-checking and hardening
2021-01-05 16:00:40 +00:00
Tim Steinbach
84df1a4f1b
awscli: 1.18.207 -> 1.18.208 2021-01-05 10:30:28 -05:00
André Silva
397c5a3d08
mdbook: 0.4.4 -> 0.4.5 2021-01-05 14:58:19 +00:00
Anderson Torres
0972bbc12d
Merge pull request #108445 from AndersonTorres/updates
Misc updates
2021-01-05 11:54:15 -03:00
Kevin Cox
e10ef1faec
Merge pull request #108131 from thiagokokada/opentabletdriver-misc-improvements
opentabletdriver: misc improvements to package/module
2021-01-05 08:20:39 -05:00
zowoq
517241f354 gdu: 2.0.0 -> 2.1.0
https://github.com/dundee/gdu/releases/tag/v2.1.0
2021-01-05 18:44:43 +10:00
zowoq
ef5cb37c30 miniserve: 0.10.3 -> 0.10.4
https://github.com/svenstaro/miniserve/releases/tag/v0.10.4
2021-01-05 17:46:36 +10:00
John Ericson
4a6916aba3
Merge pull request #108350 from Ericson2314/no-static-overlay
treewide: Inline more of the static overlay
2021-01-04 22:30:00 -05:00
Sandro
51e2708f58
Merge pull request #108372 from fabaff/gdu
gdu: init at 2.0.0
2021-01-05 03:12:00 +01:00