BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
78187 commits 1 branch 0 tags 3.8 GiB
Commit graph

67699 commits

Author SHA1 Message Date
zimbatm
fa4499cc8c pythonPackages.acme-tiny: fixup duplicate declaration 2016-02-29 11:06:02 +00:00
zimbatm
4704b81e8a Merge pull request #13467 from zimbatm/letsencrypt-0.4.0 
letsencrypt: 0.1.0 -> 0.4.0
 2016-02-29 11:02:43 +00:00
zimbatm
29e78b1126 Merge pull request #13568 from timbertson/gup 
gup: 0.5.3 -> 0.5.4
 2016-02-29 10:59:09 +00:00
Tobias Pflug
8625d2f8aa nodejs-5_x: 5.6.0 -> 5.7.0 2016-02-29 11:35:51 +01:00
zimbatm
de8c119a4b redmine: fix compilation with ruby 2.3 
Just bumped the JSON dependency manually to the one bundled with ruby 2.3
 2016-02-29 10:02:59 +00:00
Domen Kožar
45160101e9 Merge pull request #13547 from teh/master 
wtforms: Update to 2.1, make work on python3, disable tests for now.
 2016-02-29 09:57:04 +00:00
Vladimír Čunát
0294fc5bbd haskellPackages: fix evaluation 
It seems `self` was wanted instead of `pkgs` by the author of 3844206.
 2016-02-29 10:54:25 +01:00
Tim Cuthbertson
70df5bf9ea gup: 0.5.3 -> 0.5.4 2016-02-29 20:15:19 +11:00
Matthew Bauer
818f2cd19f nethack: fix darwin support 2016-02-28 21:04:23 -06:00
Cole Mickens
f91f3a4c5a plex: 0.9.15.3.1674 -> 0.9.15.6.1714 2016-02-28 14:30:05 -08:00
Cole Mickens
e1338ad121 plexpass: 0.9.15.5.1712 -> 0.9.15.6.1714 2016-02-28 14:30:03 -08:00
Tom Hunger
baeedda1a5 wtforms: Update to 2.1, make work on python3, disable tests for now. 2016-02-28 22:25:20 +00:00
zimbatm
57f7ff00fe Merge pull request #13368 from nathan7/fish-ul 
fish: fix hidden dependency on ul(1) on Linux
 2016-02-28 22:09:32 +00:00
zimbatm
79c3725185 Merge pull request #13498 from tsion/fish-darwin 
Remove fish's kbd dependency on darwin.
 2016-02-28 22:08:54 +00:00
Arseniy Seroka
8c7ccdd556 Merge pull request #13557 from KoviRobi/inferno-update 
inferno: 645 -> 785
 2016-02-29 01:04:30 +03:00
Nathan Zadoks
010271d47a fish: fix hidden dependency on ${glibc}/bin/getent on Linux 2016-02-28 22:27:53 +01:00
Nathan Zadoks
da1f465b94 fish: fix hidden dependency on utillinux on Linux 2016-02-28 22:27:53 +01:00
Scott Olson
a93a2e2360 fish: remove kbd dependency on Darwin 2016-02-28 14:55:51 -06:00
Michael Ekstrand
b3faef0d93 nano: build info manual (close #13527) 
Make nano depend use texinfo, so that the built packages include the
info manual, and put it into a separate output.
 2016-02-28 21:50:17 +01:00
Nikolay Amiantov
29852f9d24 samba: fix evaluation 2016-02-28 23:45:53 +03:00
Kovacsics Robert (NixOS)
5e5cd7c93c inferno: 645 -> 785 2016-02-28 20:16:08 +00:00
Arseniy Seroka
2d05e4d5a4 Merge pull request #13551 from osener/wring-1.0.0 
wring: init at 1.0.0
 2016-02-28 22:51:04 +03:00
Nikolay Amiantov
a693d5cc99 Merge pull request #13514 from abbradar/samba-closure 
samba: reduce closure size
 2016-02-28 22:30:13 +03:00
Louis Taylor
3747aef768 linux-testing: 4.5-rc5 -> 4.5-rc6 2016-02-28 19:13:36 +00:00
Danny Wilson
850a1a3323 Fix "nix" stdenv (close #13554) 
Broken by changes introduced in d96893647d
 2016-02-28 19:49:35 +01:00
Franz Pletz
a9d24cedeb Merge pull request #12487 from hrdinka/refactor/nsd 
Refactor NSD service and update to 4.1.7
 2016-02-28 17:13:21 +01:00
Ozan Sener
3a6b06f1be wring: init at 1.0.0 2016-02-28 18:05:56 +02:00
Christoph Hrdinka
ae2ad0dfc1 Merge pull request #13504 from leenaars/duckmarines 
duckmarines: init at 1.0b
 2016-02-28 16:55:52 +01:00
Thomas Tuegel
ab746ec902 ibus: consolidate wrappers 2016-02-28 09:30:09 -06:00
Bjørn Forsman
070dccae7b gitstats: init at 2016-01-08 
Upstream does not make releases, using latest commit from master branch.
 2016-02-28 15:00:52 +01:00
Thomas Tuegel
41204574be ibus-m17n: use Python 3 2016-02-28 07:12:55 -06:00
Thomas Tuegel
3a8a887cfd ibus-with-plugins: replace ibus wrappers 2016-02-28 07:12:55 -06:00
Nikolay Amiantov
1af8a3498c apitrace: add qapitrace and backtracing support 2016-02-28 15:55:45 +03:00
zimbatm
3344f02b3b Merge pull request #13485 from zimbatm/cide-0.9.0 
cide: 0.8.1 -> 0.9.0
 2016-02-28 12:51:41 +00:00
zimbatm
c08f18df63 cide: 0.8.1 -> 0.9.0 2016-02-28 12:49:20 +00:00
zimbatm
69ce5cb656 use the sourceforge mirrors everywhere 
find pkgs -name "*.nix" -exec sed -r \
    "s|https?://downloads.sourceforge.net/|mirror://sourceforge/|g" -i {} \;
 2016-02-28 12:07:42 +00:00
Franz Pletz
b871649530 quicktun: init at 2.2.4 2016-02-28 12:23:12 +01:00
Michael Alan Dorman
3844206366 Make sure we use the older version of hjsonpointer 2016-02-28 11:34:59 +01:00
Michael Alan Dorman
08a02a84de Make sure an older version of hjsonpointer is included 2016-02-28 11:34:59 +01:00
Peter Simons
4ee5a8865d mwc-random: drop obsolete overrides 2016-02-28 11:34:59 +01:00
Peter Simons
073dd0c1ba Add LTS Haskell 5.4. 2016-02-28 11:34:59 +01:00
Peter Simons
6dd798f67f hackage-packages.nix: update Haskell package set 
This update was generated by hackage2nix v20151217-12-g567601b using the following inputs:

  - Nixpkgs: 82be4306ae
  - Hackage: 300be01a10
  - LTS Haskell: 45f9a3dc16
  - Stackage Nightly: 18441cd11a
 2016-02-28 11:34:59 +01:00
Bjørn Forsman
d589391202 gitinspector: 0.4.1 -> 0.4.4 2016-02-28 11:32:09 +01:00
Peter Simons
0ac7cbe334 Merge pull request #13536 from phunehehe/postfix-symlinks 
postfix: use relative symlinks for mailq and newaliases
 2016-02-28 11:28:46 +01:00
Domen Kožar
67b9053d29 Merge pull request #13530 from danielfullmer/zerotier-fix 
zerotierone: hardcoded path fix
 2016-02-28 10:20:04 +00:00
Nikolay Amiantov
82560aefd7 samba: reduce closure size 2016-02-28 12:49:34 +03:00
Michael Raskin
c0f20c5912 Merge pull request #13518 from leenaars/love2 
love: fix broken 0.8.2 + added version 0.72
 2016-02-28 09:35:54 +00:00
Michael Raskin
a08c8b12f0 Add Apache Jena Fuseki instead of obsolete and unavailable Jena Joseki 2016-02-28 10:39:33 +01:00
Michiel Leenaars
ad23ac715e duckmarines: init at 1.0b 2016-02-28 09:53:46 +01:00
Robert Helgesson
762678d6af perl-Readonly: 2.00 -> 2.01 2016-02-28 09:33:59 +01:00
Robert Helgesson
033fd6ad44 perl-Log-Any: 1.038 -> 1.040 2016-02-28 09:33:59 +01:00
Robert Helgesson
3a9842c7c5 perl-LWP: 6.13 -> 6.15 
Also remove no longer needed patch.
 2016-02-28 09:33:59 +01:00
Robert Helgesson
d9e0cd9302 perl-URI: 1.69 -> 1.71 2016-02-28 09:33:59 +01:00
Robert Helgesson
ae385fb25c perl-Redis: 1.981 -> 1.982 2016-02-28 09:33:59 +01:00
Robert Helgesson
affb893831 perl-Log-Any: 1.032 -> 1.038 2016-02-28 09:33:59 +01:00
Robert Helgesson
13a6b7e623 perl-CGI: 4.25 -> 4.26 2016-02-28 09:33:59 +01:00
Robert Helgesson
98625b331b perl-DateTime-Format-MySQL: 0.05 -> 0.06 2016-02-28 09:33:58 +01:00
Robert Helgesson
cf463bbd1a perl-DBIx-Class: 0.082820 -> 0.082821 
Also remove patches for issues that have been resolved upstream.
 2016-02-28 09:33:58 +01:00
Hoang Xuan Phu
6bb016101f postfix: use relative symlinks for mailq and newaliases 2016-02-28 16:19:18 +08:00
Christoph Hrdinka
a0753c7cb2 nsd: 4.1.6 -> 4.1.7 2016-02-28 09:17:46 +01:00
Bart Brouns
8fa1fb4920 connman-dmenu: init at git-29-9-2015 
fix indentation
 2016-02-28 05:18:35 +01:00
Franz Pletz
bc4dbca2b3 Merge pull request #13513 from grahamc/omnibus-cves 
Several CVEs
 2016-02-28 04:14:20 +01:00
Daniel Fullmer
110dfca988 zerotierone: hardcoded path fix 
New code in zerotier broke the previous substitution where we refer to
the correct path for "ip".
 2016-02-27 22:13:41 -05:00
Tuomas Tynkkynen
f71676481d Merge pull request #13526 from rnhmjoj/bdf2psf 
bdf2psf: 1.134 -> 1.137
 2016-02-28 04:00:25 +02:00
Tuomas Tynkkynen
b2587e88d0 Merge pull request #13525 from rnhmjoj/btfs 
btfs: 2.7 -> 2.8
 2016-02-28 03:58:19 +02:00
rnhmjoj
838379f117 bdf2psf: 1.134 -> 1.137 2016-02-28 02:56:22 +01:00
rnhmjoj
bd737b105c btfs: 2.7 -> 2.8 2016-02-28 02:39:05 +01:00
Christoph Hrdinka
729171eac6 Merge pull request #13501 from leenaars/90secondportraits 
90secondportraits: init at 1.01b
 2016-02-28 02:36:58 +01:00
Christoph Hrdinka
6a30044df5 Merge pull request #13502 from leenaars/sienna 
sienna: init at 1.0c
 2016-02-28 02:29:26 +01:00
Graham Christensen
1aed3948d7 pythonmagick: 0.9.11 -> 0.9.12 2016-02-27 17:22:14 -06:00
zimbatm
de124cfa79 Merge pull request #11671 from timbertson/fetchgit 
fetchgit: output improvements
 2016-02-27 22:45:07 +00:00
zimbatm
6a518e51dd Merge pull request #13475 from rimmington/collectd-no-mysql 
collectd: allow mysql to be null
 2016-02-27 22:24:57 +00:00
Graham Christensen
4a54794d18 xara: broken due to patch-tracker.debian.org being missing. 2016-02-27 16:13:47 -06:00
Michiel Leenaars
62c3ad1dde love: fix broken 0.8 + added version 0.72 2016-02-27 22:37:36 +01:00
Graham Christensen
73f6410851 cgit: 0.11.2 -> 0.12 for CVE-2016-1899 CVE-2016-1900 CVE-2016-1901 2016-02-27 15:35:19 -06:00
Graham Christensen
0a2c3ec971 mysql: 5.5.45 -> 5.5.48 for multiple CVEs: CVE-2015-4792 CVE-2015-4802 CVE-2015-4815 CVE-2015-4816 CVE-2015-4819 CVE-2015-4826 CVE-2015-4830 CVE-2015-4836 CVE-2015-4858 CVE-2015-4861 CVE-2015-4870 CVE-2015-4879 CVE-2015-4913 2016-02-27 15:31:52 -06:00
Eelco Dolstra
8726c6d506 webkitgtk: Disable Hydra build 
This package takes an excessive amount of time to build (e.g., right
now Hydra is showing eight concurrent builds of webkitgtk, some of
them running for more than 6 hours). This may also delay channel
updates.
 2016-02-27 22:29:24 +01:00
Eelco Dolstra
be4ebe0046 perl: 5.22.0 -> 5.22.1 2016-02-27 22:22:26 +01:00
Eelco Dolstra
7627bf6f3f perl: Unify 5.20 and 5.22 expressions 2016-02-27 22:22:26 +01:00
Michiel Leenaars
7281144f4b 90secondportraits: init at 1.01b 2016-02-27 22:08:18 +01:00
Michiel Leenaars
41d00c436d sienna: init at 1.0c 2016-02-27 22:01:53 +01:00
Graham Christensen
77134ea4a5 jasper: patch for CVE-2016-1867 2016-02-27 14:48:29 -06:00
Arseniy Seroka
c39cc6cd60 Merge pull request #13512 from magnetophon/yoshimi-1.3.8.2 
yoshimi: 1.3.7.1 -> 1.3.8.2
 2016-02-27 23:38:45 +03:00
Graham Christensen
a1b69275af libbsd: 0.7.0 -> 0.8.2 for CVE-2016-2090 2016-02-27 14:32:56 -06:00
Graham Christensen
3e1b8935c0 mbedtls: 1.3.14 -> 1.3.16 for CVE-2015-8036 2016-02-27 14:23:56 -06:00
Arseniy Seroka
a6347a3477 Merge pull request #13511 from magnetophon/ardour-4.7 
ardour: 4.4-> 4.7
 2016-02-27 22:46:04 +03:00
Bart Brouns
4deefc15ef yoshimi: 1.3.7.1 -> 1.3.8.2 2016-02-27 20:29:44 +01:00
Eelco Dolstra
e6f61b4cf3 fetchurlBoot: Use Nix's builtin fetchurl function 
This removes the need for curl in bootstrapTools, and enables https
for bootstrap tarballs.
 2016-02-27 20:27:24 +01:00
Bart Brouns
6f8db5b12e ardour: 4.4-> 4.7 2016-02-27 20:26:20 +01:00
Arseniy Seroka
824a1fb5b9 Merge pull request #13496 from zimbatm/no-dots-at-end-of-description 
Remove all dots at end of descriptions
 2016-02-27 21:34:06 +03:00
Franz Pletz
0a9076b5f8 socat: 2.0.0-b8 -> 2.0.0-b9 (CVE-2016-2217) 
https://lwn.net/Vulnerabilities/674840/

http://www.dest-unreach.org/socat/contrib/socat-secadv7.html
http://www.dest-unreach.org/socat/contrib/socat-secadv8.html
 2016-02-27 19:10:38 +01:00
Franz Pletz
88d1564985 socat: 1.7.3.0 -> 1.7.3.1 (CVE-2016-2217) 
https://lwn.net/Vulnerabilities/674840/

http://www.dest-unreach.org/socat/contrib/socat-secadv7.html
http://www.dest-unreach.org/socat/contrib/socat-secadv8.html
 2016-02-27 19:10:38 +01:00
Tuomas Tynkkynen
58f0071a9e renoise: Don't use builtins.currentSystem 
stdenv.system should be almost always used instead of builtins.currentSystem
or cross-evaluation (e.g. evaluating a i686 NixOS system on a 64-bit nix)
will be subtly broken.
 2016-02-27 19:58:18 +02:00
zimbatm
6ea526462b splix: cleanup 
* remove commented code
* remove unused patch
* fix package naming
 2016-02-27 17:36:10 +00:00
zimbatm
17348dc094 Remove all dots at end of descriptions 
Specially crafted for @JagaJaga

    find pkgs -name "*.nix" -exec \
      sed -e 's|\(description.*\)\.";|\1";|g' -i {} \;
 2016-02-27 17:30:29 +00:00
Tuomas Tynkkynen
0fc6de6c3a U-Boot: Fix ubootTools 
Oops, I forgot to test build this...
 2016-02-27 19:30:17 +02:00
Franz Pletz
158ff99ae4 chrony: 2.2 -> 2.3 2016-02-27 18:00:07 +01:00
Franz Pletz
6b20b7c4d7 qemu: 2.4.1 -> 2.5.0 (multiple CVEs) 
https://lwn.net/Vulnerabilities/666755/
 2016-02-27 17:53:22 +01:00
Franz Pletz
ca2611650a nghttp2: 1.3.4 -> 1.7.1 (CVE-2016-1544) 
https://lwn.net/Vulnerabilities/675696/
 2016-02-27 17:53:22 +01:00
Christoph Hrdinka
0c0312d342 Merge pull request #13048 from bendlas/update-i2p 
i2p: 0.9.23 -> 0.9.24
 2016-02-27 17:49:20 +01:00
Franz Pletz
7dc5ad835a http-parser: 2.5.0 -> 2.6.1 (CVE-2016-2086, CVE-2016-2216) 
Fixes build of nodejs-0_10 and nodejs-4_x.
 2016-02-27 17:27:17 +01:00
Franz Pletz
e5bd913ea5 pixman: 0.32.8 -> 0.34.0 (security release) 2016-02-27 17:06:24 +01:00
Franz Pletz
e3ecee8b13 nodejs: 5.5.0 -> 5.6.0 (CVE-2016-2086, CVE-2016-2216) 
https://nodejs.org/en/blog/vulnerability/february-2016-security-releases/
 2016-02-27 17:06:24 +01:00
Franz Pletz
6fd20ad747 nodejs: 4.2.3 -> 4.3.0 (CVE-2016-2086, CVE-2016-2216) 
https://nodejs.org/en/blog/vulnerability/february-2016-security-releases/
 2016-02-27 17:06:24 +01:00
Franz Pletz
3673c5bf52 nodejs: 0.10.41 -> 0.10.42 (CVE-2016-2086, CVE-2016-2216) 
https://nodejs.org/en/blog/vulnerability/february-2016-security-releases/
 2016-02-27 17:06:24 +01:00
Franz Pletz
c6b1f48e31 libgcrypt: 1.6.4 -> 1.6.5 (CVE-2015-7511) 
https://www.cs.tau.ac.il/~tromer/ecdh/
 2016-02-27 17:06:24 +01:00
Arseniy Seroka
ead0fe5b71 Merge pull request #13500 from leenaars/mr_rescue 
mrrescue: init at 1.02
 2016-02-27 18:42:15 +03:00
Arseniy Seroka
18bf70619f Merge pull request #13503 from hrdinka/add/retrofe 
retrofe: init at 0.6.169
 2016-02-27 18:41:28 +03:00
Arseniy Seroka
3030dec0d7 yandex-disk: 0.1.5.940 -> 0.1.5.948 2016-02-27 18:39:42 +03:00
Franz Pletz
73e0c261c2 linux: 4.4.2 -> 4.4.3 2016-02-27 16:34:02 +01:00
Franz Pletz
c691b6a858 ntp: 4.2.8p4 -> 4.2.8p6 (multiple CVEs) 
http://support.ntp.org/bin/view/Main/SecurityNotice#Recent_Vulnerabilities
 2016-02-27 16:34:02 +01:00
Franz Pletz
571f5b74ed ffmpeg: 2.8.5 -> 2.8.6 (CVE-2016-2329) 2016-02-27 16:34:02 +01:00
Franz Pletz
6ae6016d15 libxmp: 4.3.8 -> 4.3.11 (security release) 
https://lwn.net/Alerts/676256/
 2016-02-27 16:31:35 +01:00
Michiel Leenaars
ebe7856983 mrrescue: init at 1.02 2016-02-27 16:15:02 +01:00
Christoph Hrdinka
d1c35db920 retrofe: init at 0.6.169 2016-02-27 15:41:21 +01:00
Vladimír Čunát
9d092e324c xfce.gvfs: don't depend on samba 
It seems a better fit for Xfce now.
https://github.com/NixOS/nixpkgs/commit/ca3690d426dce3
 2016-02-27 15:23:15 +01:00
Vladimír Čunát
c59c1f9fe0 e19.efl: remove the openjpeg override 
/cc #12599, discussed on:
https://github.com/NixOS/nixpkgs/pull/12599/files#r50664194
 2016-02-27 15:23:15 +01:00
Jeffrey David Johnson
bbf113f24a bitcoin-classic: init at 0.11.2.cl1.b1 
From #12706, commits re-split by vcunat.
 2016-02-27 15:23:15 +01:00
Jeffrey David Johnson
127edf1194 bitcoin-xt: update 0.11A -> 0.11D 
From #12706, commits re-split by vcunat.
 2016-02-27 15:23:15 +01:00
Matt McHenry
98a0484471 eclipse: run with the jdk, not the jre 
This is necessary so that tools like native2ascii are available to
maven eclipse integration (m2e).
 2016-02-27 13:40:38 +01:00
Vladimír Čunát
d18a8904c0 kde5.libksysguard: fix build with glibc-2.23 
... using an upstream patch.
 2016-02-27 13:22:22 +01:00
Sheena Artrip
b6a8348a4b clamav: 0.98.7 -> 0.99 2016-02-27 06:59:06 -05:00
Tim Cuthbertson
21547a61ba nix-prefetch-git: print out valid nix expression; make --quiet very quiet 2016-02-27 21:26:35 +11:00
Vladimír Čunát
13afef0d8e webkitgtk: fix build with glibc-2.23 
... by a patch accepted upstream.
2.4 seems to build fine without patching.
 2016-02-27 11:07:56 +01:00
Marius Bakke
a8b44c74d3 goPackages.oh: 2015-11-21 -> 2016-02-23 2016-02-27 09:58:58 +01:00
Marius Bakke
8a3308d5da goPackages.liner: git 2016-01-24 2016-02-27 09:58:58 +01:00
Michael Raskin
a519416a92 libreoffice: Taking a fix from BLFS for using Glibc 2.23 (isnan is not std::isnan) 2016-02-27 09:10:50 +01:00
Michael Raskin
b9853c0b9b ecl: fix source URL 2016-02-27 08:14:01 +01:00
Tim Cuthbertson
456cbb29d9 nix-prefetch-git: add --quiet flag and minor cleanup 2016-02-27 16:56:38 +11:00
Rhys
ac94a5d86c collectd: allow mysql to be null 2016-02-27 12:02:44 +11:00
Adam Bell
c267f5b711 Updating to postgis 2.2.1 2016-02-26 19:37:57 -05:00
Thomas Tuegel
272cf5c44f Merge branch 'ibus' 2016-02-26 18:10:11 -06:00
Thomas Tuegel
cb10990fdc ibus-anthy: upgrade to Python 3 2016-02-26 18:08:48 -06:00
Thomas Tuegel
f7f965baaa ibus-hangul: download release from GitHub 2016-02-26 18:08:48 -06:00
Thomas Tuegel
6c85f72a91 ibus-table: 1.9.6 -> 1.9.11 2016-02-26 18:08:48 -06:00
Thomas Tuegel
f058f1c1d3 ibus-with-plugins: rewrite wrapper 2016-02-26 18:08:48 -06:00
Thomas Tuegel
10e3664c97 ibus: 1.5.11 -> 1.5.13 2016-02-26 18:08:48 -06:00
zimbatm
90525b718f Merge pull request #11141 from cresh/darwin-msmtp 
msmtp: Enable on OS X with Keychain integration.
 2016-02-27 00:02:53 +00:00
zimbatm
2f38c1be69 Merge pull request #11142 from cresh/darwin-sshpass 
sshpass: Enable on OS X.
 2016-02-27 00:00:01 +00:00
Arseniy Seroka
766ad682f1 Merge pull request #13471 from Profpatsch/networkmanager-link-local 
networkmanager: fix link-local ip addresses
 2016-02-27 02:55:31 +03:00
zimbatm
7feaf55b7e Merge pull request #11314 from anderspapitto/flamegraph 
FlameGraph: init at 182b24fb
 2016-02-26 23:16:27 +00:00
zimbatm
4ecb1ce679 Merge pull request #11274 from robgssp/ldap 
ldap-client: don't break on test failures
 2016-02-26 23:13:27 +00:00
zimbatm
1f00c52880 Merge pull request #11210 from mitchty/munge-on-osx 
Munge is buildable/usable on OS X/most unices
 2016-02-26 23:10:53 +00:00
zimbatm
35ab3d301f Merge remote-tracking branch 'upstream/staging' 2016-02-26 22:37:04 +00:00
Tobias Geerinckx-Rice
c3ed0a2494 btrfs-progs: 4.4 -> 4.4.1 
Bugfix release. Changes:
https://btrfs.wiki.kernel.org/index.php/Changelog#By_version_.28btrfs-progs.29
 2016-02-26 23:23:01 +01:00
zimbatm
a7d34722b2 Merge pull request #13493 from zimbatm/alphabetize 
Alphabetize
 2016-02-26 22:16:43 +00:00
zimbatm
9f57b24b01 all-packages: alphabetize deprecated packages 2016-02-26 22:15:41 +00:00
Arseniy Seroka
c80a1baa15 Merge pull request #13486 from zimbatm/vim-default-config 
vim: provide a default vimrc
 2016-02-27 01:09:52 +03:00
zimbatm
951dc57716 Merge pull request #13482 from nico202/qnotero 
qnotero: init at 1.0.0
 2016-02-26 22:09:41 +00:00
Michael Raskin
73a9cd8aee Revert accidental revert of all-packages.nix gitlab changes during revert of revert of libreoffice update 2016-02-26 23:12:12 +01:00
zimbatm
89f0e25189 vim: provide a default vimrc 
Minimal sane defaults imported from ArchLinux.

This is basically `set :nocompatible` with some other small changes.
 2016-02-26 21:58:21 +00:00
Arseniy Seroka
c373daff17 Merge pull request #13495 from heydojo/kernel--use-cdn 
fetchurl: use kernel.org cdn by default
 2016-02-27 00:54:16 +03:00
Michael Raskin
a94e433936 libreoffice: 5.0.4.2 -> 5.1.0.3 (a new attempt); set XDG_DATA_DIRS for access to GSettings schemas 2016-02-26 22:58:27 +01:00
Graham Christensen
483a130f89 cpio: patch CVE-2016-2037, out of bounds write (close #13489) 2016-02-26 22:46:13 +01:00
Tony White
4806cddda3 fetchurl: use kernel.org cdn by default 
- use http://cdn.kernel.org/pub/ as the default mirror
for kernel source requests.
Discovered by browsing :
 https://www.kernel.org/introducing-fastly-cdn.html
 2016-02-26 21:32:00 +00:00
=
728b1ce557 qnotero: init at 1.0.0 2016-02-26 22:09:54 +01:00
Arseniy Seroka
b9ab76c2b2 Merge pull request #13479 from hrdinka/add/pcsx2 
pcsx2: init at 1.4.0
 2016-02-26 23:56:55 +03:00
Tobias Pflug
3386d73d06 Add galen to all-packages.nix 2016-02-26 21:01:41 +01:00
aszlig
54b4912566
chromium: Regenerate sources.nix with new updater 
No changes in functionality, but to make future source updates a bit
easier on the eyes when viewing the diff.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2016-02-26 20:55:17 +01:00
aszlig
28b289efa6
chromium: Refactor updater entirely in Nix 
The update.sh shell script now is only a call to nix-build, which does
all the hard work of updating the Chromium source channels and the
plugins. It results in a store path with the new sources.nix that
replaces the already existing sources.nix.

Along the way, this has led to a quite massive workaround, which abuses
MD5 collisions to detect whether an URL is existing, because something
like builtins.tryEval (builtins.fetchurl url) unfortunately doesn't
work. Further explanations and implementation details are documented in
the actual implementation.

The drawback of this is that we don't have nice status messages anymore,
but on the upside we have a more robust generation of the sources.nix
file, which now also should work properly on missing upstream
sources/binaries.

This also makes it much easier to implement fetching non-GNU/Linux
versions of Chromium and we have all values from omahaproxy available as
an attribute set (see the csv2nix and channels attributes in the update
attribute).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2016-02-26 20:55:17 +01:00
Jude Taylor
f6c3b13c7c ghcjs: pull in ghcjsi branch 2016-02-26 11:27:47 -08:00
zimbatm
26b59efa8a Merge pull request #13491 from grahamc/patch-1 
go-1.6: remove the cacert 1.5 patch
 2016-02-26 18:58:59 +00:00
Franz Pletz
082cd3edd3 Merge pull request #13473 from grahamc/libssh2-1.7.0 
libssh2: 1.6.0 -> 1.7.0
 2016-02-26 19:34:54 +01:00
Graham Christensen
8132a5ae76 go-1.6: remove the cacert 1.5 patch 
Removed in 58dbaf69b7
 2016-02-26 12:32:33 -06:00
zimbatm
c183117aee Merge pull request #13441 from gilligan/add-galen-package 
galen init at 2.2.1
 2016-02-26 18:05:40 +00:00
Benjamin Staffin
8104b8ff1d letsencrypt: 0.1.0 -> 0.4.0 
Closes #12123
 2016-02-26 18:03:07 +00:00
zimbatm
7e8faf022f rubygems: 2.4.8 -> 2.5.2 
Closes #11950
 2016-02-26 18:02:24 +00:00
zimbatm
accc1f1484 go: 1.4: disable failing test in sandbox 2016-02-26 18:00:11 +00:00
zimbatm
58dbaf69b7 go: remove ssl certs patches 
Those are not needed since we now use a standard location to store our
bundles.

See bfebc7342e
 2016-02-26 17:58:58 +00:00
Charles Strahan
53ea7dee75 emacs: fix priority for ctags 
This fixes the previous attempt (in commit 46d1dd5) to make ctags' ctags
override emacs' ctags. The higher the value of the priority attribute,
the higher the priority (see the definition of `buildEnv`).
 2016-02-26 12:27:04 -05:00
Michael Raskin
32e954db64 Reverting dependency src for revert 2016-02-26 16:28:08 +01:00
Nikolay Amiantov
d9c10d6f56 gutenprint: fix cups and gimp paths 
Also disable GIMP support by default to reduce closure
 2016-02-26 18:27:41 +03:00
Michael Raskin
66febbdfa7 Temporarily revert LibreOffice update 2016-02-26 16:26:34 +01:00
Christoph Hrdinka
13f0bb7a53 libretro-mame: init at git-2016-02-10 2016-02-26 14:21:43 +01:00
Peter Simons
2bcec4272f Merge pull request #13480 from phile314/master 
uhc: 1.1.9.2 -> 1.1.9.3
 2016-02-26 13:18:13 +01:00
zimbatm
3833591d95 Merge pull request #13164 from romildo/fix/eclipse-plugin-cup 
eclipse-plugins-cup: fix plugin file names
 2016-02-26 11:23:28 +00:00
zimbatm
8d4c2340d3 Merge pull request #13396 from mayflower/pkg/gitlab 
gitlab: 8.0.5 -> 8.5.1, service improvements
 2016-02-26 11:19:28 +00:00
Domen Kožar
a469681a51 Merge pull request #13365 from abbradar/cups-second-attempt 
CUPS update (second attempt)
 2016-02-26 11:13:30 +00:00
Philipp Hausmann
fbd857ab72
uhc: 1.1.9.2 -> 1.1.9.3 2016-02-26 12:12:53 +01:00
Domen Kožar
c99d589162 Merge pull request #13116 from kragniz/requests2-2.9.1 
requests2: 2.8.1 -> 2.9.1
 2016-02-26 11:11:36 +00:00
Domen Kožar
fe9f5dbbbc Merge pull request #6600 from 4z3/tlsdate 
tlsdate doesn't build on x86_64-darwin
 2016-02-26 10:59:00 +00:00
zimbatm
d8c3a83b5c Merge pull request #13477 from cstrahan/vte-ng 
vte-ng: 0.42.1.a -> 0.42.4.a
 2016-02-26 10:46:06 +00:00
vbgl
d39595c54f Merge pull request #13404 from knedlsepp/fix-darwin-tcl-tk 
Fix darwin tcl tk
 2016-02-26 11:38:26 +01:00
Frederik Rietdijk
48085add39 Merge pull request #13461 from FRidh/kcalc 
kde5.kcalc: init at 15.12
 2016-02-26 11:33:42 +01:00
Franz Pletz
0bbe8e1884 Merge pull request #13454 from grahamc/xerces 
xerces-c: 3.1.1 -> 3.1.3
 2016-02-26 11:25:25 +01:00
zimbatm
6035c3a136 Merge pull request #9400 from Mathnerd314/package-overrides-fix 
all-packages: Apply packageOverrides package-by-package
 2016-02-26 10:17:53 +00:00
Franz Pletz
ef0325e940 Merge pull request #13435 from tg-x/calc 
calc: init at 2.12.5.3
 2016-02-26 11:16:11 +01:00
Franz Pletz
d5a2c4cb05 libinput: Add libwacom dependency 
Fixes #13476 & #13147.
 2016-02-26 11:03:28 +01:00
aszlig
716b79d3a5
chromium: Provide SHA256s for beta/dev plugins 
As stated in the parent commit, the 32bit Chrome package is not
available upstream, so let's at least provide the SHA256 hash for the
64bit package.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2016-02-26 10:55:51 +01:00
aszlig
459642b8de
chromium/updater: Allow a single plugin arch 
Until now, if we have a failure to fetch either the 32bit Debian package
or the 64bit Debian package, neither of these will be put into
sources.nix.

Unfortunately the beta/dev channels do not have a 32bit Debian package,
so even though there is a 64bit Debian package available we don't get
plugins *at* *all*.

This also introduces a nicer error message rather than just failing with
an assertion in fetchurl because we did not provide url/urls.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2016-02-26 10:55:51 +01:00
José Romildo Malaquias
0e94a1be40 eclipse-plugins-cup: add dependency on the zest plugin 2016-02-26 06:42:04 -03:00
José Romildo Malaquias
205398c427 eclipse-plugin-zest: init at 3.9.101 
eclipse-plugins-cup: remove plugins.nix.orig that was wrongly added.
 2016-02-26 06:42:04 -03:00
José Romildo Malaquias
ef11f77c8f eclipse-plugins-cup: fix plugin file names 2016-02-26 06:42:04 -03:00
Christoph Hrdinka
bd5e2d723c pcsx2: init at 1.4.0 2016-02-26 10:21:31 +01:00
Franz Pletz
af17efd014 Merge pull request #13466 from benley/git-stree-0.4.5 
git-stree: init at 0.4.5
 2016-02-26 09:59:47 +01:00
Franz Pletz
db2b0c8406 Merge pull request #13430 from nico202/yarp 
yarp (+ libace): init at 2.3.64
 2016-02-26 09:29:21 +01:00
Franz Pletz
c2412bd700 fixup! gitlab: 8.0.5 -> 8.5.0, service improvements 
8.5.0 -> 8.5.1
 2016-02-26 08:31:21 +01:00
Franz Pletz
bcfa59bf82 gitlab: 8.0.5 -> 8.5.0, service improvements 
Updates gitlab to the current stable version and fixes a lot of features that
were broken, at least with the current version and our configuration.

Quite a lot of sweat and tears has gone into testing nearly all features and
reading/patching the Gitlab source as we're about to deploy gitlab for our
whole company.

Things to note:

 * The gitlab config is now written as a nix attribute set and will be
   converted to JSON. Gitlab uses YAML but JSON is a subset of YAML.
   The `extraConfig` opition is also an attribute set that will be merged
   with the default config. This way *all* Gitlab options are supported.

 * Some paths like uploads and configs are hardcoded in rails  (at least
   after my study of the Gitlab source). This is why they are linked from
   the Gitlab root to /run/gitlab and then linked to the  configurable
   `statePath`.

 * Backup & restore should work out of the box from another Gitlab instance.

 * gitlab-git-http-server has been replaced by gitlab-workhorse upstream.
   Push & pull over HTTPS works perfectly. Communication to gitlab is done
   over unix sockets. An HTTP server is required to proxy requests to
   gitlab-workhorse over another unix socket at
   `/run/gitlab/gitlab-workhorse.socket`.

 * The user & group running gitlab are now configurable. These can even be
   changed for live instances.

 * The initial email address & password of the root user can be configured.

Fixes #8598.
 2016-02-26 07:08:31 +01:00
Charles Strahan
ce7aa71880 vte-ng: 0.42.1.a -> 0.42.4.a 2016-02-26 00:48:39 -05:00
Charles Strahan
e08dd09c25 emacs: add optional support for 24-bit color ttys 2016-02-26 00:33:56 -05:00
Graham Christensen
737e808913 libssh2: 1.6.0 -> 1.7.0 
This release includes the following changes:
      o libssh2_session_set_last_error: Add function
      o mac: Add support for HMAC-SHA-256 and HMAC-SHA-512
      o WinCNG: support for SHA256/512 HMAC
      o kex: Added diffie-hellman-group-exchange-sha256 support
      o OS/400 crypto library QC3 support
    This release includes the following security advisory:
      o diffie_hellman_sha256: convert bytes to bits
        CVE-2016-0787: http://www.libssh2.org/adv_20160223.html
    This release includes the following bugfixes:
      o SFTP: Increase speed and datasize in SFTP read
      o openssl: make libssh2_sha1 return error code
      o openssl: fix memleak in _libssh2_dsa_sha1_verify()
      o cmake: include CMake files in the release tarballs
      o Fix builds with Visual Studio 2015
      o hostkey.c: Fix compiling error when OPENSSL_NO_MD5 is defined
      o GNUmakefile: add support for LIBSSH2_LDFLAG_EXTRAS
      o GNUmakefile: add -m64 CFLAGS when targeting mingw64
      o kex: free server host key before allocating it (again)
      o SCP: add libssh2_scp_recv2 to support large (> 2GB) files on windows
      o channel: Detect bad usage of libssh2_channel_process_startup
      o userauth: Fix off by one error when reading public key file
      o kex: removed dupe entry from libssh2_kex_methods
      o _libssh2_error: Support allocating the error message
      o hostkey: fix invalid memory access if libssh2_dsa_new fails
      o hostkey: align code path of ssh_rsa_init to ssh_dss_init
      o libssh2.pc.in: fix the output of pkg-config --libs
      o wincng: fixed possible memory leak in _libssh2_wincng_hash
      o wincng: fixed _libssh2_wincng_hash_final return value
      o add OpenSSL 1.1.0-pre2 compatibility
      o agent_disconnect_unix: unset the agent fd after closing it
      o sftp: stop reading when buffer is full
      o sftp: Send at least one read request before reading
      o sftp: Don't return EAGAIN if data was written to buffer
      o sftp: Check read packet file offset
      o configure: build "silent" if possible
      o openssl: add OpenSSL 1.1.0-pre3-dev compatibility
      o GNUmakefile: list system libs after user libs
 2016-02-25 22:09:21 -06:00
Profpatsch
70c02402c8 networkmanager: fix link-local ip addresses 
NetworkManager needs an additional avahi-user to use link-local
IPv4 (and probably IPv6) addresses. avahi-autoipd also needs to be
patched to the right path.
 2016-02-26 03:28:56 +01:00
zimbatm
b9db67d8e2 Merge pull request #8393 from hrdinka/update/hugin 
hugin: update 2013.0.0 -> 2015.0.0
 2016-02-26 01:03:47 +00:00
zimbatm
d2f3e250cf Merge pull request #8576 from obadz/nix-prefetch-zip 
Add --ext option to nix-prefetch-zip
 2016-02-26 00:57:30 +00:00
zimbatm
b5407d402d Merge pull request #11812 from bnikolic/recoll-update 
recoll: 1.20.6 -> 1.21.3
 2016-02-26 00:41:47 +00:00
zimbatm
30891166be Merge pull request #11997 from benley/google-chrome-variants 
google-chrome: add -beta and -unstable variants
 2016-02-26 00:13:00 +00:00
zimbatm
428e12d23f Merge pull request #13154 from zimbatm/git-rebase-fix-v2 
git: fixes references to gettext properly
 2016-02-26 00:03:17 +00:00
zimbatm
853a213698 Merge pull request #13323 from rycee/ddclient/platform 
ddclient: add meta.platforms
 2016-02-26 00:02:06 +00:00
zimbatm
d4e29d0e6d Merge pull request #12896 from rycee/bump/udiskie 
udiskie: 1.1.2 -> 1.4.8
 2016-02-26 00:01:34 +00:00
zimbatm
06a12136a5 Merge pull request #12824 from cransom/aws_shell 
aws_shell: init at 0.1.0
 2016-02-26 00:00:10 +00:00
zimbatm
1b0e81c41e Merge pull request #13453 from mayflower/pkgs_upstream/gti 
gti: init at 2015-05-21 (edaac79)
 2016-02-25 23:57:17 +00:00
zimbatm
e3da8a40e2 Merge pull request #12235 from deeky666/update-php-packages-attributes 
phpPackages: init php56Packages and php70Packages
 2016-02-25 23:56:18 +00:00
zimbatm
71e1fd1a0b Merge pull request #12599 from ftrvxmtrx/e19-update-1.16.1 
e19: update
 2016-02-25 23:50:31 +00:00
zimbatm
35f47333d0 Merge pull request #13463 from avnik/feature/gimp-with-plugins 
Feature: gimp with plugins
 2016-02-25 23:27:25 +00:00
Benjamin Staffin
fe6ad9e912 git-stree: init at 0.4.5 2016-02-25 15:26:06 -08:00
zimbatm
0b33cd7b59 Merge pull request #13465 from benley/git-alphabetize 
git-and-tools: alphabetize attributes before it gets too huge
 2016-02-25 23:24:32 +00:00
Pascal Wittmann
48db4391e8 Merge pull request #13464 from zimbatm/termite-11 
Termite 11
 2016-02-25 23:58:13 +01:00
Benjamin Staffin
ca5f243697 git-and-tools: alphabetize attributes before it gets too huge 2016-02-25 14:23:34 -08:00
zimbatm
3f3599f6be termite: split terminfo into it's own output 
Fixes #6141
 2016-02-25 22:14:58 +00:00
zimbatm
f1df89f902 termite: 10 -> 11 2016-02-25 22:14:55 +00:00
Tim Steinbach
7506c58d74 linux_3_10: 3.10.96 -> 3.10.97 (close #13405) 2016-02-25 23:09:08 +01:00
Tuomas Tynkkynen
0e1319f03f linux-3.10: fixup config by a slightly hacky way 
For explanation see:
https://github.com/NixOS/nixpkgs/pull/13405#issuecomment-188357637
 2016-02-25 23:07:47 +01:00
Alexander V. Nikolaev
0649c8bde7 gimp: add gimp-with-plugin derivation 
By default all plugins from pkgs.gimpPlugins set are enabled.

Default location of plugins changed from $out/${gimp.name} to
$out/lib/gimp/${majorVersion}. Resulting derivation for gimp+plugins
is set as search path for plugins by default (additional tweaking in
gimprc done for old plugin scheme should be removed)
 2016-02-25 23:34:28 +02:00
Alexander V. Nikolaev
fdd11c2c2b gimp: Use http link as gimp-gap sources 2016-02-25 23:34:17 +02:00
Frederik Rietdijk
4a4c432f06 pythonPackages.ipykernel: 4.2.2 -> 4.3.0 2016-02-25 22:32:40 +01:00
Frederik Rietdijk
05608d50f4 kde5.kcalc: init at 15.12 2016-02-25 22:21:56 +01:00
Frederik Rietdijk
b2298b02cf kde5.filelight: init at 15.12 (close #13456) 
vcunat also added himself to maintainers,
as filelight has been extremely helpful on closure-size branch.
 2016-02-25 21:56:23 +01:00
Frederik Rietdijk
db54eed69c Merge pull request #13460 from nlewo/master 
ledger-autosync: fix ofxclient propagation
 2016-02-25 21:26:34 +01:00
Antoine Eiche
359ff7d230 ledger-autosync: fix ofxclient propagation 
Closes #13411
 2016-02-25 21:21:27 +01:00
Tobias Geerinckx-Rice
2179b1d491 geolite-legacy 2016-02-08 -> 2016-02-25 2016-02-25 20:54:39 +01:00
Tobias Geerinckx-Rice
500132ab5c sane-backends-git -> 2016-02-25 2016-02-25 20:54:24 +01:00
Tobias Geerinckx-Rice
1eb8139100 libpsl: 2016-02-16 -> 2016-02-25 2016-02-25 20:54:24 +01:00
Pascal Wittmann
8106d61c12 libfilezilla: 0.3.1 -> 0.4.0 2016-02-25 19:57:39 +01:00
Eelco Dolstra
1b4b7d53c1 Merge pull request #13455 from grahamc/chromium 
chromium{,Beta,Dev}: 48.0.2564.97 -> 48.0.2564.116
 2016-02-25 19:25:38 +01:00
Graham Christensen
712d59225e chromium{,Beta,Dev}: 48.0.2564.97 -> 48.0.2564.116 
From the debian security mailing list:

Several vulnerabilities have been discovered in the chromium web browser.

CVE-2016-1622

    It was discovered that a maliciously crafted extension could bypass
    the Same Origin Policy.

CVE-2016-1623

    Mariusz Mlynski discovered a way to bypass the Same Origin Policy.

CVE-2016-1624

    lukezli discovered a buffer overflow issue in the Brotli library.

CVE-2016-1625

    Jann Horn discovered a way to cause the Chrome Instant feature to
    navigate to unintended destinations.

CVE-2016-1626

    An out-of-bounds read issue was discovered in the openjpeg library.

CVE-2016-1627

    It was discovered that the Developer Tools did not validate URLs.

CVE-2016-1628

    An out-of-bounds read issue was discovered in the pdfium library.

CVE-2016-1629

    A way to bypass the Same Origin Policy was discovered in Blink/WebKit,
    along with a way to escape the chromium sandbox.
 2016-02-25 12:00:12 -06:00
Tristan Helmich
3234ca49d1 gti: init at 2015-05-21 (edaac79) 2016-02-25 18:52:19 +01:00
Arseniy Seroka
edeb5480fc Merge pull request #13438 from kamilchm/nimble 
nimble: init at 0.7.2
 2016-02-25 20:50:46 +03:00
Graham Christensen
f91c979f8a xerces-c: 3.1.1 -> 3.1.3 2016-02-25 11:25:00 -06:00
Josef Knedl
5e1da18b6d tk: Fixes NixOS/nixpkgs#13377 (bad install_name) 
Patch is based on: https://trac.macports.org/changeset/100816
of bug report: https://trac.macports.org/ticket/37395
 2016-02-25 17:57:22 +01:00
Edward Tjörnhammar
77d11ec577 idea.idea-{community,ultimate}: 15.0.3 -> 15.0.4 2016-02-25 17:48:07 +01:00
Robin Gloster
40c586b7ce Merge pull request #13427 from k0ral/mercurial 
mercurial: 3.5.1 -> 3.7.1
 2016-02-25 17:00:58 +01:00
Robin Gloster
84a10edede Merge pull request #13449 from matthiasbeyer/update-taskwarrior 
taskwarrior: 2.5.0 -> 2.5.1
 2016-02-25 16:59:10 +01:00
Robin Gloster
c087af0d8c Merge pull request #13450 from zimbatm/cide-dependency-fix 
cide: add missing git runtime dependency
 2016-02-25 16:58:44 +01:00
Franz Pletz
c459ba8f85 ratools: init at 0.6.2 2016-02-25 16:56:48 +01:00
Franz Pletz
6a27fc57b7 radvd: 2.11 -> 2.12 2016-02-25 16:56:48 +01:00
Robin Gloster
46e1af9bba Merge pull request #13444 from gilligan/update-sauce-connect 
sauce-connect: 4.3.6 -> 4.3.13
 2016-02-25 16:56:44 +01:00
Domen Kožar
a2c8bee109 linuxPackages: set to 4.4 (latests LTS) fixes #13394 2016-02-25 15:54:50 +00:00
Nikolay Amiantov
69932f905a blueman: fix networking, settings 2016-02-25 18:43:21 +03:00
Tobias Geerinckx-Rice
d9f5e94bae proot: 4.0.3 -> 5.1.0 
New features
------------
* Processes under PRoot now appear with their real names, that is,
  they are not renamed ld-linux.so or prooted-... anymore.
* Own ELF loader.

Fixes
-----
* Most bugs related to shebang support -- ie. #! at the beginning of
  a program -- were fixed.
* It is now possible to use GDB against multi-threaded programs under
  PRoot x86_64 and x86.
* It is possible to execute x86_64 programs from x86 programs again.
* It is possible to use x86 ptrace-based programs (strace, gdb, ...)
  under PRoot x86_64 again.
* The loader is now built with the build-id linker option explicitly
  disabled.  This special section might interfere with loaded
  programs.
* The loader can now load relocatable objects that have a predefined
  base address.
 2016-02-25 16:21:47 +01:00
Tobias Geerinckx-Rice
ebc9ba92d2 proot: generate and install manual page 2016-02-25 16:21:46 +01:00