Commit graph

3335 commits

Author SHA1 Message Date
Vladimír Čunát
e9520e81b3 Merge branch 'master' into staging 2016-02-17 10:06:31 +01:00
Nikolay Amiantov
7fd2cc1ea8 liferea: update upstream tarball 2016-02-16 19:35:58 +03:00
zimbatm
97bbc37b6f rekonq: fix homepage url 2016-02-16 14:11:36 +00:00
Damien Cassou
1f909b51ac Merge pull request #13025 from DamienCassou/update-backintime-1.1.12
backintime: 1.1.6 -> 1.1.12
2016-02-16 13:33:43 +01:00
Damien Cassou
5bb3ac70c6 backintime: 1.1.6 -> 1.1.12 2016-02-16 13:25:46 +01:00
zimbatm
a6ac8d7915 Merge pull request #13020 from colemickens/fix-widevine
chromium/plugins: Fix widevine substitution
2016-02-16 10:14:16 +00:00
Cole Mickens
a5a5c1d9cd chromium/plugins: Fix widevine substitution
Fixes: #12840
Related to: 61042a5

61042a5 changes the replaced token from $something to @something@. This
commit repeats that change in one additional location used by the
WideVine plugin
2016-02-15 18:04:16 -08:00
Arseniy Seroka
6b205a9eba Merge pull request #12988 from colemickens/cfdyndns
cfdyndns: init at 0.0.1
2016-02-16 00:24:32 +03:00
Cole Mickens
c7571611dc cfdyndns: init at 0.0.1 2016-02-15 12:54:04 -08:00
Samuel Rivas
d72fad9ee4 spark: export the assembly to /share/java, fixes #11961
So that we can compile applications that depend on spark
2016-02-15 21:26:03 +01:00
Samuel Rivas
704e923ad5 spark: reduce default shell log verbosity 2016-02-15 21:26:03 +01:00
Samuel Rivas
d213089a25 spark: 1.4.0 -> 1.5.2 2016-02-15 21:26:03 +01:00
Pascal Wittmann
b9db5a9574 Merge pull request #12792 from kamilchm/marathon
marathon: 0.14.1 -> 0.15.1
2016-02-15 15:05:11 +01:00
Charles Strahan
8b94aaf081 Merge pull request #12572 from kevincox/mesos-upgrade
mesos: 0.23.0 -> 0.26.0
2016-02-14 20:04:01 -05:00
Michael Raskin
874721defa baresip: 0.4.16 -> 0.4.17 2016-02-14 21:17:07 +01:00
Kevin Cox
d5ed1637b6 mesos: 0.23.0 -> 0.26.0
Update mesos to 0.26.0 and build with SSL support.
2016-02-14 08:22:47 -05:00
Franz Pletz
99b43a25dd Merge pull request #12907 from tg-x/irssi-otr
irssi-otr: 640e98c74b -> 1.0.1
2016-02-13 18:21:25 +01:00
tg(x)
d12399f3f5 irssi-otr: 1.0.0 -> 1.0.1 2016-02-13 05:50:17 +01:00
tg(x)
0137d4c6ff irssi-otr: fetchFromGithub 2016-02-12 18:43:45 +01:00
Franz Pletz
bb55126965 Merge pull request #12933 from mayflower/pkgs_upstream/nntp-proxy
nntp-proxy: init at 2014-01-06 (0358e7a)
2016-02-12 08:26:29 +01:00
Franz Pletz
657c56678c firefox-esr: 38.5.2esr -> 38.6.1esr 2016-02-12 08:02:31 +01:00
Franz Pletz
70925f0a92 firefox: 44.0 -> 44.0.2 2016-02-12 08:02:24 +01:00
Franz Pletz
b276f4f171 Merge pull request #12945 from taku0/firefox-bin-44.0.1
firefox-bin: 44.0.1 -> 44.0.2
2016-02-12 07:55:54 +01:00
taku0
6d3f909975 firefox-bin: 44.0.1 -> 44.0.2 2016-02-12 10:15:23 +09:00
Tristan Helmich
f8d0ba7447 nntp-proxy: init at 2014-01-06 (0358e7a) 2016-02-11 16:24:48 +01:00
Arseniy Seroka
885acea1dd Merge pull request #12891 from taku0/firefox-bin-44.0.1
firefox-bin: 44.0 -> 44.0.1
2016-02-11 16:57:20 +03:00
Pascal Wittmann
2b8e9cb72e Merge pull request #12917 from dasuxullebt/fix/ssvnc-perl
Bugfix: ssvnc had a hard dependency on /usr/bin/perl which is now rep…
2016-02-10 20:42:10 +01:00
Eelco Dolstra
aea262f654 Fix misspelled meta.maintainers attributes 2016-02-10 14:59:50 +01:00
Your Name
aeee493704 Bugfix: ssvnc had a hard dependency on /usr/bin/perl which is now replaced 2016-02-10 10:48:51 +01:00
tg(x)
91ac4fc0a4 irssi-otr: 640e98c74b -> 1.0.0 2016-02-10 00:02:21 +01:00
Vladimír Čunát
177464ade9 wrapFirefox: add enableAdobeReader
So far we only have 32-bit package.
It will be silently missed on 64-bit ATM.
2016-02-09 18:21:40 +01:00
taku0
74270469db firefox-bin: 44.0 -> 44.0.1 2016-02-10 00:03:00 +09:00
Kamil Chmielewski
55b7f03e3b marathon: 0.14.1 -> 0.15.1 2016-02-09 11:45:06 +01:00
Vladimír Čunát
a115bff08c Merge branch 'master' into staging 2016-02-07 13:52:42 +01:00
Guillaume Maudoux
9f358f809d Configure a default trust store for openssl 2016-02-03 12:42:01 +01:00
Jos van den Oever
ba8b7fff6a davmail: 4.7.0 -> 4.7.1
Bugfix release, mainly for Carddav regression over EWS, also includes an NTLM support enhancement.

Enhancement:
- Improve NTLM support try to send hostname as workstation name instead of UNKNOWN
- Fix notification dialog message
- Prepare ExchangeSessionFactory refactoring
- Fix typo in french translation
- Fix broken Sourceforge link in About dialog

Carddav:
- Carddav: fix regression on contact update with empty field triggering DeleteItemField

(cherry picked from commit cf327c3dcfd442cea4368d76c59f72dcd5da6768)

[Bjørn: Cherry-picked from release-15.09 to master. (I guess merging
first to release-15.09 was a mistake.)]
2016-02-02 19:25:43 +01:00
aszlig
61042a5b6a
chromium/plugins: Use @var@ for passing variables
There is already a pull request from @colemickens, who has just reversed
the variable references $flash and $flashVersion but the fix is kinda
fragile as he points out himself in #12713.

The reason the wrong substition was made is that both variables begin
with the same name and we do a simple replace instead of a more
complicated one using builtins.match.

So staying simple but to still not raising issues with other variables
that begin with the same name I'm now using @var@ instead, like we use
in substituteAll and other substituters (like the ones in CMake or
autotools) deal with it.

Note that I'm not using $var$ here to make sure it doesn't get confused
with real shell variables.

So with this fix in place, the wrapper now has the following flags:

  --ppapi-flash-path=/nix/store/.../lib/libpepflashplayer.so
  --ppapi-flash-version=20.0.0.294

Previously we had (#12710):

  --ppapi-flash-path=/nix/store/.../lib/libpepflashplayer.so
  --ppapi-flash-version=/nix/store/...-binary-plugins-flashVersion

Thanks to @colemickens for reporting and putting up a pull request.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Fixes: #12710
Fixes: #12713
2016-02-02 17:39:08 +01:00
aszlig
ff90f52375
chromium: Remove import-from-derivation again
This reverts commit f7af2272a2.

We're going to fix #12710 properly by reintroducing 38c77bb and fixing
the shell variable substitution.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-02-02 17:39:08 +01:00
Domen Kožar
0b3becb269 Merge pull request #12701 from mayflower/builder-def-cleanup
builderDefsPackage cleanup
2016-02-01 21:09:34 +00:00
Tobias Geerinckx-Rice
c55c909e56 liferea: 1.10.17 -> 1.10.18
This is a maintenance release that brings the following changes:
- Fixes #287: media:content support broken
- Fixes #279: Rules not visible in searchdialog
- Fixes #83: Segfault when sorting feeds in folder
- Fixes #302: Broken compilation with --disable-notify
2016-02-01 19:39:18 +01:00
Franz Pletz
1026673f37 firefox: 43.0.4 -> 44.0 2016-02-01 18:10:47 +01:00
Tony White
8491d0d1ca chromium: 47.0.2526.106 - > 48.0.2564.97
- Fixes CVE-2016-1612 CVE-2016-1613 CVE-2016-1614 CVE-2016-1615
  CVE-2016-1616 CVE-2016-1617 CVE-2016-1618 CVE-2016-1619 CVE-2016-1620.
- Moves chromium stable and beta channels up one version major.
  vcunat made dev channel stay for now, as it wouldn't download otherwise.
  This is most of PR #12717.
2016-02-01 12:12:07 +01:00
Franz Pletz
8ec3bce8f8 links: Remove package & deprecate for links2
This package is deprecated and superseeded by links2 which also provides the
links binary this maintaining backwards-compatibility.

Debian removed links back in 2008:

  https://packages.qa.debian.org/l/links.html

Fixes #12623.
2016-01-31 11:46:35 +01:00
Vladimír Čunát
f7af2272a2 Revert "chromium: Do not rely on import-from-derivation"
This reverts commit 38c77bb72c.
In this form it causes problems #12710.
2016-01-31 10:03:57 +01:00
Robin Gloster
ecc580f379 carrier: deleted pidgin fork
not updated in >5 years and broken build
2016-01-30 20:31:03 +00:00
Franz Pletz
ead58a86ba clawsMail: 3.13.1 -> 3.13.2 (security fix) 2016-01-30 21:16:22 +01:00
Arseniy Seroka
f8c1d61f12 Merge pull request #12673 from kamilchm/marathon
marathon: 0.8.1 -> 0.14.1
2016-01-30 21:45:32 +03:00
Franz Pletz
562a41e696 Merge pull request #12584 from nathanielbaxter/dev/teamspeak
teamspeak client: bump 3.0.18.1 -> 3.0.18.2
2016-01-30 17:10:16 +01:00
Franz Pletz
90f987718c Merge pull request #12689 from obadz/citrix
citrix-receiver: 13.2.1 -> 13.3.0
2016-01-30 15:48:34 +01:00
Pascal Wittmann
13e13c38cd mcabber: 1.0.0 -> 1.0.1 2016-01-29 22:33:47 +01:00