Commit Graph

2492 Commits

Author SHA1 Message Date
Sarah Brofeldt
feee2235b5 firefoxWrapper: Fail if deprecated enableVLC option exists 2018-08-12 18:55:49 +02:00
Vladimír Čunát
838d63eced
Merge #44885: firefox*: 61.0.1 -> 61.0.2 2018-08-11 19:47:02 +02:00
Pascal Wittmann
af8cd3c74e
Merge branch 'master' into add-missing-licenses
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
2018-08-09 13:10:27 +02:00
taku0
743677310a firefox: 61.0.1 -> 61.0.2 2018-08-09 03:13:10 +09:00
taku0
106c654af3 firefox-bin: 61.0.1 -> 61.0.2 2018-08-09 03:12:15 +09:00
jpathy
11a1c5cf6c Palemoon: 27.9.2 -> 27.9.4 (#44502)
* Palemoon update to 27.9.4

* fix hash

* disable format-security
2018-08-07 23:38:14 +02:00
adisbladis
16a44f8cfe
firefox-beta-bin: 62.0b14 -> 62.0b15 2018-08-07 14:17:13 +08:00
adisbladis
e346db09d3
firefox-devedition-bin: 62.0b14 -> 62.0b15 2018-08-07 14:17:00 +08:00
Matthew Bauer
c6d55e92bb firefoxPackages: add licenses
tor-browser is bsd3
firefox is mpl20
2018-08-06 10:15:59 -04:00
Pascal Wittmann
0efd8a8f70
remove jumanji
jumanji isn't activly developed since the end of 2015
and uses an insecure and old version of webkit.
2018-08-06 12:57:17 +02:00
Pascal Wittmann
f7be21f4c9
Merge branch 'master' into add-missing-licenses
Conflicts:
	pkgs/development/libraries/exiv2/default.nix
        Set license to gpl2Plus
2018-08-06 12:04:52 +02:00
Pascal Wittmann
5e493c9475
dillo: add license
see issue #43716
2018-08-05 16:24:34 +02:00
adisbladis
ffcaaedf75
firefox-beta-bin: 62.0b10 -> 62.0b14 2018-08-04 22:40:55 +08:00
adisbladis
6b0bed4f01
firefox-devedition-bin: 62.0b10 -> 62.0b14 2018-08-04 22:40:54 +08:00
Pascal Wittmann
1ab197b9e7
w3m: add license
see issue #43716
2018-08-04 16:08:03 +02:00
Jörg Thalheim
94cbb8e3cd
Merge pull request #44251 from kalbasit/add-browsh
browsh: init at 1.4.10
2018-07-31 11:11:37 +01:00
Jörg Thalheim
135c085924 browsh: remove wildcard argument 2018-07-31 11:02:04 +01:00
Sarah Brofeldt
cb19404faf
Merge pull request #44245 from Infinisil/add/bukubrow
bukubrow: Init at 2.4.0
2018-07-31 08:35:39 +02:00
Wael M. Nasreddine
446b72ef3b
browsh: init at 1.4.10
closes #43283
2018-07-30 23:19:38 -07:00
Silvan Mosberger
49bc1adb26
firefox: Add enableBukubrow config option 2018-07-30 23:02:32 +02:00
Sarah Brofeldt
7679891e2b chromium: Increase build timout to two days 2018-07-30 12:29:58 +02:00
Lluís Batlle i Rossell
f54b387b63 Merge remote-tracking branch 'central/master' into viric_clean 2018-07-28 19:25:14 +02:00
Yuriy Taraday
cd3283f921 chromium: 67.0.3396.99 -> 68.0.3440.75 2018-07-27 14:38:23 +02:00
adisbladis
35e7485847
firefox-beta-bin: 62.0b8 -> 62.0b10 2018-07-23 15:28:47 +08:00
adisbladis
653e439ce4
firefox-devedition-bin: 62.0b8 -> 62.0b10 2018-07-23 15:28:39 +08:00
Lluís Batlle i Rossell
66d7126255 Take me (viric) out of most maintenance
Since years I'm not maintaining anything of the list below other
than some updates when I needed them for some reason. Other people
is doing that maintenance on my behalf so I better take me out but
for very few packages. Finally!
2018-07-22 21:50:19 +02:00
Frederik Rietdijk
6c72782d36 Merge staging-next into master 2018-07-22 11:04:28 +02:00
volth
cc55a3ebcb treewide: fix build with disallowed aliases (#43872)
fixes build with disallowed aliases
2018-07-21 22:03:24 -04:00
Frederik Rietdijk
ad47d658d1 Merge master into staging-next 2018-07-21 19:43:53 +02:00
Jörg Thalheim
218298b30f
Merge branch 'master' into unused5 2018-07-21 15:41:22 +01:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
volth
6d2857a311 [bot] treewide: remove unused 'inherit' in let blocks 2018-07-20 19:38:19 +00:00
Frederik Rietdijk
1a6af9f88e
Merge pull request #43857 from volth/unused
[bot] treewide: remove unreferenced code
2018-07-20 21:06:32 +02:00
volth
87f5930c3f [bot]: remove unreferenced code 2018-07-20 18:48:37 +00:00
Frederik Rietdijk
8213ff161c Merge master into staging-next 2018-07-19 18:24:24 +02:00
Matthew Bauer
76999cc40e treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
2018-07-18 23:25:20 -04:00
Frederik Rietdijk
6d339e5863 Merge staging-next into staging 2018-07-16 17:14:44 +02:00
Franz Pletz
c673643d31
Merge pull request #43539 from YorikSar/update-chromium
chromium: 67.0.3396.87 -> 67.0.3396.99
2018-07-15 20:52:23 +00:00
Robert Schütz
18774d4173 Merge branch 'master' into staging 2018-07-15 12:31:18 +02:00
Yuriy Taraday
06ec2a9f19 chromium: fix 68 (beta) build
Also replace openh264 patch with one landed in upstream.
2018-07-14 23:07:46 +04:00
adisbladis
fccdc1be81
firefox-beta-bin: 62.0b7 -> 62.0b8 2018-07-14 10:52:07 +08:00
adisbladis
4a01bd4a3c
firefox-devedition-bin: 62.0b7 -> 62.0b8 2018-07-14 10:51:59 +08:00
Yuriy Taraday
c283323c1e chromium: 67.0.3396.87 -> 67.0.3396.99 2018-07-14 01:38:41 +04:00
Frederik Rietdijk
3e31d23d99 Merge master into staging 2018-07-13 19:34:19 +02:00
taku0
900617bd30 firefox, firefox-bin: add dependencies for flashplayer 2018-07-12 22:05:52 +09:00
taku0
a19c7135ca flashplayer: fix hashes 2018-07-12 22:05:17 +09:00
xeji
90380d0fa9
Merge pull request #43394 from volth/flash-30.0.0.113
flash: 30.0.0.113 -> 30.0.0.134
2018-07-12 13:06:27 +02:00
goibhniu
c23b4d36be
Flash: Fix the sha256 for linux x86_64 2018-07-12 11:30:05 +01:00
volth
2dee9d4a80 flash: 30.0.0.113 -> 30.0.0.134 2018-07-11 23:34:16 +00:00
Alyssa Ross
a269e5ab92
tor-browser-bundle: update license to free
The Tor Browser Bundle is free software under various licenses:

> Can I distribute Tor?
> 
> Yes.
> 
> The Tor software is free software. This means we give you the rights
> to redistribute the Tor software, either modified or unmodified,
> either for a fee or gratis. You don't have to ask us for specific
> permission.
> 
> However, if you want to redistribute the Tor software you must follow
> our LICENSE. Essentially this means that you need to include our
> LICENSE file along with whatever part of the Tor software you're
> distributing.
> 
> Most people who ask us this question don't want to distribute just the
> Tor software, though. They want to distribute the Tor Browser. This
> includes Firefox Extended Support Release, and the NoScript and
> HTTPS-Everywhere extensions. You will need to follow the license for
> those programs as well. Both of those Firefox extensions are
> distributed under the GNU General Public License, while Firefox ESR is
> released under the Mozilla Public License. The simplest way to obey
> their licenses is to include the source code for these programs
> everywhere you include the bundles themselves. 

(https://www.torproject.org/docs/faq.html.en#DistributingTor)

tor-browser-bundle-bin is already marked as licenses.free, so it doesn't
really make sense that this one is marked as unfree.
2018-07-11 23:55:58 +02:00