Commit Graph

3222 Commits

Author SHA1 Message Date
Vladimír Čunát
2e70007740
Merge #70445: firefox*: 69.0.1 -> 69.0.2 2019-10-06 10:35:28 +02:00
Joachim Fasting
bd78aa0d9f
tor-browser-bundle-bin: use hardened allocator 2019-10-05 12:51:42 +02:00
taku0
6d974eb7ce firefox: 69.0.1 -> 69.0.2 2019-10-05 18:44:22 +09:00
taku0
d274d95cef firefox-bin: 69.0.1 -> 69.0.2 2019-10-05 18:43:58 +09:00
Quentin Vaucher
5a547851b1 ephemeral: 5.3.0 -> 5.4.0 2019-10-04 12:06:40 +02:00
worldofpeace
2d9eb21602
Merge pull request #70329 from worldofpeace/wrapgapps-opera
opera: use autoPatchelfHook, use wrapGAppsHook
2019-10-03 16:08:59 +00:00
worldofpeace
68543580f4 opera: use autoPatchelfHook, use wrapGAppsHook
Fixes #70322
2019-10-03 10:30:22 -04:00
Rommel MARTINEZ
57c43ad8d0 qutebrowser: 1.7.0 -> 1.8.1 2019-10-02 22:38:40 -07:00
worldofpeace
d845b08cc7 midori: use latest vala 2019-10-02 22:54:12 -04:00
Jan Tojnar
b3fcd9375d
Merge branch 'master' into staging-next 2019-10-03 01:47:08 +02:00
worldofpeace
1252132f08
midori: 7 -> 9.0
* add libarchive and json-glib

We use vala_0_44 to avoid the issue with sqlite3 vapi [0]

[0]: a54e4d89a4.patch
2019-10-03 00:09:13 +02:00
Frederik Rietdijk
503081fa5b Merge staging into staging-next 2019-09-29 11:05:22 +02:00
worldofpeace
4a7964614f eolie: 0.9.60 -> 0.9.63 2019-09-29 01:47:13 -04:00
worldofpeace
c9b85da380
Merge pull request #69088 from jacg/webmacs
webmacs: init at version 0.8
2019-09-26 22:45:03 -04:00
Jacek Generowicz
bcecdd5822 webmacs: init at version 0.8 2019-09-26 22:44:25 -04:00
Tim Steinbach
26d6eddb56
vivaldi: 2.8.1664.38-1 -> 2.8.1664.40-1 2019-09-26 10:45:49 -04:00
Dmitry Kalinkin
b3472597b7
Merge branch 'staging-next' into staging
Fixes eval on darwin after #69072

Tested using maintainers/scripts/eval-release.sh before and after to see
that the fix works
2019-09-25 19:31:32 -04:00
Tim Steinbach
a7e1051f62
vivaldi: 2.8.1664.35-1 -> 2.8.1664.38-1 2019-09-24 09:32:30 -04:00
Vladimír Čunát
192fb9d11b
Merge branch 'staging-next' into staging 2019-09-24 08:15:01 +02:00
Joachim F
fb5f43a486
Merge pull request #69335 from oxij/pkgs/tor-browser-856
firefoxPackages.tor-browser: 8.5.4 -> 8.5.6
2019-09-24 04:57:16 +00:00
Jörg Thalheim
f121c52389
Merge pull request #69283 from NixOS/update-brave-browser
brave: 0.68.131 -> 0.69.128
2019-09-24 04:01:36 +01:00
Jan Malakhovski
54c8da0787 firefoxPackages.tor-browser: 8.5.4 -> 8.5.6 2019-09-24 01:54:11 +00:00
Michael Raskin
4342f5e413
Merge pull request #68453 from nlewo/pr-next
Add the browser `next`
2019-09-23 09:39:35 +00:00
Pascal Wittmann
4235d8b07c
brave: 0.68.131 -> 0.69.128 2019-09-23 10:34:49 +02:00
Jan Tojnar
f80e55fc2e
gtk3.setupHook: clear icon-theme.cache in preFixup (#68552)
gtk3.setupHook: clear icon-theme.cache in preFixup
2019-09-22 16:30:42 +02:00
Jörg Thalheim
8fc3fe400c
Firefox bin 69.0.1 (#69099)
Firefox bin 69.0.1
2019-09-21 08:28:57 +01:00
Matthew Bauer
abbb9ea848 firefox: mark broken on darwin
this has been broken for a while, best to not make hydra keep building it.
2019-09-20 23:20:32 -04:00
Graham Christensen
8dbca5e3ca
Merge pull request #69054 from ivan/chromium-77.0.3865.90
chromium: 77.0.3865.75 -> 77.0.3865.90
2019-09-19 18:01:06 -04:00
Graham Christensen
a81f8304d8
Merge pull request #68991 from ivan/chromium-77-font-fix
chromium: add patch to fix performance regression with fonts
2019-09-19 18:00:36 -04:00
Antoine Eiche
1c7d3389e4 next: init at 1.3.1 2019-09-19 22:28:36 +02:00
Tim Steinbach
b24afa9294
vivaldi: 2.7.1628.33-1 -> 2.8.1664.35-1 2019-09-19 10:01:19 -04:00
taku0
a4edff0fec firefox: 69.0 -> 69.0.1 2019-09-19 21:50:43 +09:00
taku0
ae20db1f21 firefox-bin: 69.0 -> 69.0.1 2019-09-19 21:43:32 +09:00
Ivan Kozik
5456def6b3 chromiumDev: fix widevine support
Upstream moved libwidevinecdm.so from
./opt/google/chrome-unstable/libwidevinecdm.so
to
./opt/google/chrome-unstable/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
2019-09-19 00:05:30 +00:00
Ivan Kozik
44957a9f30 chromiumDev: fix build by disabling jumbo
This fixes:

FAILED: obj/chrome/browser/ui/ui/ui_jumbo_3.o
../../third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF obj/chrome/browser/ui/ui/ui_jumbo_3.o.d -DUSE_DBUS -DUSE_UDEV -DUSE_AURA=1 -DUSE_GLIB=1 -DUSE_NSS_CERTS=1 -DUSE_X11=1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -DCR_CLANG_REVISION=\"371202-8455294f-1\" -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D_FORTIFY_SOURCE=2 -D_LIBCPP_ABI_UNSTABLE -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCPP_ENABLE_NODISCARD -DCR_LIBCXX_REVISION=361348 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DUSE_CUPS -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32 -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26 -DENABLE_IPC_FUZZER -DTOOLKIT_VIEWS=1 -DVK_NO_PROTOTYPES -DGL_GLEXT_PROTOTYPES -DUSE_GLX -DUSE_EGL -DSYNC_PASSWORD_REUSE_DETECTION_ENABLED -DON_FOCUS_PING_ENABLED -DEXPAT_RELATIVE_PATH -DGOOGLE_PROTOBUF_NO_RTTI -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DHAVE_PTHREAD -DLEVELDB_PLATFORM_CHROMIUM=1 -DLEVELDB_PLATFORM_CHROMIUM=1 -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DUSE_CHROMIUM_ICU=1 -DU_STATIC_IMPLEMENTATION -DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE -DUCHAR_TYPE=uint16_t -DWEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0 -DWEBRTC_CHROMIUM_BUILD -DWEBRTC_POSIX -DWEBRTC_LINUX -DABSL_ALLOCATOR_NOTHROW=1 -DNO_MAIN_THREAD_WRAPPING -DV8_USE_EXTERNAL_STARTUP_DATA -DSK_GL -DSK_HAS_PNG_LIBRARY -DSK_HAS_WEBP_LIBRARY -DSK_USER_CONFIG_HEADER=\"../../skia/config/SkUserConfig.h\" -DSK_HAS_JPEG_LIBRARY -DSK_VULKAN_HEADER=\"../../skia/config/SkVulkanConfig.h\" -DSK_VULKAN=1 -DSK_SUPPORT_GPU=1 -DSK_GPU_WORKAROUNDS_HEADER=\"gpu/config/gpu_driver_bug_workaround_autogen.h\" -DVK_NO_PROTOTYPES -DV8_DEPRECATION_WARNINGS -DI18N_ADDRESS_VALIDATION_DATA_URL=\"https://chromium-i18n.appspot.com/ssl-aggregate-address/\" -DPERFETTO_IMPLEMENTATION -I. -I../.. -Igen -Igen/shim_headers/snappy_shim -I../../third_party/libyuv/include -Igen/shim_headers/libpng_shim -Igen/shim_headers/libwebp_shim -I../../third_party/khronos -I../../gpu -I../../third_party/vulkan/include -Igen/shim_headers/opus_shim -Igen/third_party/dawn -I../../third_party/dawn/src/include -Igen/shim_headers/flac_shim -I../../third_party/protobuf/src -Igen/protoc_out -I../../third_party/protobuf/src -I../../third_party/boringssl/src/include -I../../third_party/cacheinvalidation/overrides -I../../third_party/cacheinvalidation/src -Igen/third_party/metrics_proto -I../../third_party/leveldatabase -I../../third_party/leveldatabase/src -I../../third_party/leveldatabase/src/include -I../../third_party/ced/src -I../../third_party/icu/source/common -I../../third_party/icu/source/i18n -I../../third_party/webrtc_overrides -I../../third_party/webrtc -Igen/third_party/webrtc -I../../third_party/abseil-cpp -I../../third_party/skia -I../../third_party/vulkan/include -I../../third_party/skia/third_party/vulkanmemoryallocator -I../../third_party/vulkan/include -I../../third_party/libwebm/source -I../../v8/include -Igen/v8/include -I../../third_party/perfetto/include -Igen/third_party/perfetto/build_config -Igen/third_party/perfetto -Igen/third_party/perfetto -Igen/third_party/perfetto -Igen/third_party/perfetto -Igen/third_party/perfetto -Igen/third_party/perfetto -I../../third_party/re2/src -I../../third_party/mesa_headers -Igen -Igen -Igen -Igen -I../../third_party/libaddressinput/src/cpp/include -Igen/components/sync/protocol -I../../third_party/flatbuffers/src/include -I../../third_party/perfetto -I../../third_party/perfetto/include -Igen/third_party/perfetto/build_config -I../../third_party/brotli/include -I../../third_party/zlib -I../../third_party/fontconfig/src -Igen -Igen -Igen -Igen -Igen -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -funwind-tables -fPIC -pthread -fcolor-diagnostics -fmerge-all-constants -fcrash-diagnostics-dir=../../tools/clang/crashreports -Xclang -mllvm -Xclang -instcombine-lower-dbg-declare=0 -fcomplete-member-pointers -m64 -march=x86-64 -Wno-builtin-macro-redefined -D__DATE__= -D__TIME__= -D__TIMESTAMP__= -no-canonical-prefixes -Wall -Wextra -Wimplicit-fallthrough -Wthread-safety -Wextra-semi -Wno-missing-field-initializers -Wno-unused-parameter -Wno-c++11-narrowing -Wno-unneeded-internal-declaration -Wno-undefined-var-template -Wno-ignored-pragma-optimize -Wno-implicit-int-float-conversion -Wno-xor-used-as-pow -Wno-c99-designator -Wno-reorder-init-list -Wno-final-dtor-non-final-class -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g0 -fvisibility=hidden -Wheader-hygiene -Wstring-conversion -Wtautological-overlap-compare -Wexit-time-destructors -I/nix/store/fn0ag3ahbrjjjbsqb2846x321zj4jika-glib-2.60.7-dev/include -I/nix/store/fn0ag3ahbrjjjbsqb2846x321zj4jika-glib-2.60.7-dev/include/glib-2.0 -I/nix/store/ilk1606qj4pqzsplnnzycsxpzl6pjss8-glib-2.60.7/lib/glib-2.0/include -Wno-shorten-64-to-32 -Wno-header-guard -I/nix/store/c3i4il1c0n9mjhzm1dsvcw8h8d973s0b-nspr-4.21-dev/include -I/nix/store/qk3racv0a2967wsk0g9ps9wlbfn17faj-nss-3.46-dev/include/nss -I/nix/store/v85mz845m1hv2xlhp0zvxv36pmsfbc3q-dbus-1.12.16-dev/include/dbus-1.0 -I/nix/store/j3sv2g9s6dnlh672rwx0mmlkcm37v1k8-dbus-1.12.16-lib/lib/dbus-1.0/include -std=c++14 -fno-exceptions -fno-rtti -nostdinc++ -isystem../../buildtools/third_party/libc++/trunk/include -isystem../../buildtools/third_party/libc++abi/trunk/include -fvisibility-inlines-hidden -c gen/chrome/browser/ui/ui_jumbo_3.cc -o obj/chrome/browser/ui/ui/ui_jumbo_3.o
warning: unknown warning option '-Wno-implicit-int-float-conversion'; did you mean '-Wno-implicit-float-conversion'? [-Wunknown-warning-option]
warning: unknown warning option '-Wno-xor-used-as-pow'; did you mean '-Wno-unused-macros'? [-Wunknown-warning-option]
warning: unknown warning option '-Wno-c99-designator'; did you mean '-Wno-gnu-designator'? [-Wunknown-warning-option]
warning: unknown warning option '-Wno-reorder-init-list'; did you mean '-Wno-empty-init-stmt'? [-Wunknown-warning-option]
warning: unknown warning option '-Wno-final-dtor-non-final-class'; did you mean '-Wno-abstract-final-class'? [-Wunknown-warning-option]
In file included from gen/chrome/browser/ui/ui_jumbo_3.cc:24:
./../../chrome/browser/ui/views/profiles/profile_menu_view.cc:68:25: error: redefinition of 'GetProfileAttributesEntry'
ProfileAttributesEntry* GetProfileAttributesEntry(Profile* profile) {
                        ^
./../../chrome/browser/ui/views/profiles/avatar_toolbar_button.cc:49:25: note: previous definition is here
ProfileAttributesEntry* GetProfileAttributesEntry(Profile* profile) {
                        ^
5 warnings and 1 error generated.
2019-09-19 00:05:24 +00:00
Ivan Kozik
2e2a9ae22a chromium: 77.0.3865.75 -> 77.0.3865.90
CVE-2019-13685 CVE-2019-13688 CVE-2019-13687 CVE-2019-13686
2019-09-18 22:19:08 +00:00
worldofpeace
b0c2aea20b
treewide: drop adding hicolor-icon-theme where possible
This was either for the setup-hook to remove caches or added
even though the respective icon theme propagated it.
2019-09-18 22:47:26 +02:00
Ivan Kozik
19d730df85 chromium: add patch to fix performance regression with fonts
This reverts a commit to fix a serious performance regression
introduced in Chromium 77:

https://bugs.chromium.org/p/chromium/issues/detail?id=1003997
2019-09-17 23:42:11 +00:00
Herwig Hochleitner
dd57bf928b
Merge pull request #60833 from jflanglois/chromium-widevine
chromium: fix widevine
2019-09-14 14:30:29 +02:00
Ivan Kozik
d66430be79 chromium: 76.0.3809.132 -> 77.0.3865.75
CVE-2019-5870 CVE-2019-5871 CVE-2019-5872 CVE-2019-5873
CVE-2019-5874 CVE-2019-5875 CVE-2019-5876 CVE-2019-5877
CVE-2019-5878 CVE-2019-5879 CVE-2019-5880 CVE-2019-5881
CVE-2019-13659 CVE-2019-13660 CVE-2019-13661 CVE-2019-13662
CVE-2019-13663 CVE-2019-13664 CVE-2019-13665 CVE-2019-13666
CVE-2019-13667 CVE-2019-13668 CVE-2019-13669 CVE-2019-13670
CVE-2019-13671 CVE-2019-13673 CVE-2019-13674 CVE-2019-13675
CVE-2019-13676 CVE-2019-13677 CVE-2019-13678 CVE-2019-13679
CVE-2019-13680 CVE-2019-13681 CVE-2019-13682 CVE-2019-13683
2019-09-14 14:29:35 +02:00
Vladimír Čunát
92604b88b3
Merge #68753: firefox-60-esr: 60.8.0esr -> 60.9.0esr 2019-09-14 09:42:42 +02:00
Will Dietz
a209776db9
firefox-60-esr: 60.8.0esr -> 60.9.0esr 2019-09-13 22:32:33 -05:00
Henrik Jonsson
154c9a863d
tor-browser-bundle-bin: Drop github mirror
The github.com mirror for tor-browser hasn't been updated since
8.0.2, released in Oct 2018 (~11 months ago; currently latest
released version is 8.5.6):

https://github.com/TheTorProject/gettorbrowser/releases/
2019-09-13 10:09:47 +02:00
Henrik Jonsson
ac975ddd8f
tor-browser-bundle-bin: 8.5.4 -> 8.5.5 2019-09-12 16:38:41 +02:00
Dmitry Kalinkin
9e1cd30e3b
Merge pull request #68503 from taku0/flashplayer-32.0.0.255
flashplayer: 32.0.0.238 -> 32.0.0.255 [Critical security fixes]
2019-09-11 17:03:28 -04:00
taku0
c8802e1aed flashplayer: add maintainer 2019-09-11 22:59:24 +09:00
Tadeo Kondrak
863589ad4d
qutebrowser: add setuptools as a dependency 2019-09-11 01:32:10 -06:00
taku0
dac340737a flashplayer: 32.0.0.238 -> 32.0.0.255 2019-09-10 21:13:06 +09:00
Vladimír Čunát
41ce0c2a53
Merge #67924: firefox: 68.0.2 -> 69.0 2019-09-07 09:36:47 +02:00
Julien Langlois
7d9578819b
Comment about handling widevine in default.nix. 2019-09-06 15:19:49 -04:00
Jan Tojnar
f9237f3152
Merge branch 'master' into staging-next 2019-09-06 16:55:11 +02:00
Jan Tojnar
cdf426488b
Merge branch 'master' into staging-next
Fixed trivial conflicts caused by removing rec.
2019-09-06 03:20:09 +02:00
Aaron Andersen
22fb70a996
Merge pull request #66669 from OPNA2608/update-palemoon
palemoon: 28.6.0.1 -> 28.7.0, drop hardeningDisable
2019-09-05 21:03:48 -04:00
Jan Tojnar
ed54a5b51d
Merge branch 'gtk-no-plus' 2019-09-06 02:57:51 +02:00
Jan Tojnar
72e7d569a7
tree-wide: s/GTK+/GTK/g
GTK was renamed.
2019-09-06 02:54:53 +02:00
Julien Langlois
ea7c012e4b
Explicitly check for channels in widevine plugin unpack command. 2019-09-05 17:43:58 -04:00
Julien Langlois
c28eb26100
Set package to unfree when widevine is enabled. 2019-09-05 17:27:04 -04:00
Julien Langlois
aeeb67bfcb
Rework to avoid a full rebuild for widevine. 2019-09-05 17:20:09 -04:00
Julien Langlois
545d58a1ef
chromium: fix widevine
This change allows widevine to work in chromium (it was previously
broken due to a segfault). Newer versions of chromium do not use the
libwidevinecdmadapter.so. Instead, libwidevinecdm.so should be installed
in the chromium libExec directory.
2019-09-05 17:20:06 -04:00
Tim Steinbach
a4fcea49fc
vivaldi: 2.7.1628.30-1 -> 2.7.1628.33-1 2019-09-05 09:23:40 -04:00
OPNA2608
999cb95738 palemoon: remove rnhmjoj from maintainers
As requested, see: https://github.com/NixOS/nixpkgs/pull/66669#issuecomment-527797128
2019-09-04 13:06:11 +02:00
Andreas Rammhold
6dce809b32
firefox-esr: 68.0.2esr -> 68.1.0esr 2019-09-04 11:03:32 +02:00
Vladimír Čunát
4aad2947f8
Merge branch 'master' into staging-next 2019-09-04 11:00:56 +02:00
Will Dietz
8f78177924
links: 2.19 -> 2.20
http://links.twibright.com/download/ChangeLog

(search for '2.20' if newer entries exist)
2019-09-03 19:29:01 -05:00
Andreas Rammhold
87e261843c
firefox/wrapper: Set new style override for legacy profiles & allow downgrades
While Firefox 68 started messing with our profiles and required new
profiles on binary location changes Firefox 69 now verifies that we
aren't downgrading to an older Firefox even of the same version. If you
switch between two channel versions and/or between nixpkgs releases
Firefox will refuse to start and demand a fresh profile. Disabling the
downgrade protection works around that issue.
2019-09-04 02:14:53 +02:00
Andreas Rammhold
91c7f8b99f
firefox-bin: 68.0.2 -> 69.0 2019-09-03 08:49:00 +02:00
Vladimír Čunát
f21211ebfe
Merge branch 'master' into staging 2019-09-02 23:25:24 +02:00
Andreas Rammhold
77fc386344
firefox: 68.0.2 -> 69.0 2019-09-02 20:58:57 +02:00
OPNA2608
d53efd8188 palemoon: 28.6.0.1 -> 28.7.0, drop hardeningDisable 2019-09-02 20:15:06 +02:00
Andreas Rammhold
f3d3377477 firefox: support building firefox 69 2019-09-02 16:13:19 +02:00
Alexei Robyn
a7297610a2 luakit: Update for Lua search path handling change 2019-09-01 17:42:20 +02:00
Ivan Kozik
0e703ce075 chromium: 76.0.3809.100 -> 76.0.3809.132 (#67610)
CVE-2019-5869
2019-08-31 22:22:58 -04:00
Frederik Rietdijk
ad1d58c622 Merge staging-next into staging 2019-08-31 10:04:20 +02:00
Frederik Rietdijk
fc74ba8291 Merge master into staging-next 2019-08-31 09:50:38 +02:00
worldofpeace
003697b32a
Merge pull request #67757 from Kjuvi/master
ephemeral: 5.2.1 -> 5.3.0
2019-08-30 11:42:26 -04:00
adisbladis
cb7d0d226e
firefox-beta-bin: 69.0b14 -> 69.0b16 2019-08-30 15:58:11 +01:00
adisbladis
c205c66fb5
firefox-devedition-bin: 69.0b10 -> 70.0b2 2019-08-30 15:58:11 +01:00
Quentin Vaucher
359a5ca5eb ephemeral: 5.2.1 -> 5.3.0 2019-08-30 13:39:59 +02:00
taku0
a278d1d0c3 firefox-bin: add maintainer 2019-08-30 20:11:21 +09:00
rnhmjoj
a39b763080 falkon: use qt5's mkDerivation
See #65399
2019-08-29 15:02:00 -04:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Frederik Rietdijk
5061fe0c2c Merge staging-next into staging 2019-08-28 08:26:42 +02:00
Vika
19fbc4a1da brave: 0.67.123 -> 0.68.131 2019-08-27 19:31:06 +03:00
Frederik Rietdijk
98640fd482 Merge master into staging-next 2019-08-27 16:36:47 +02:00
volth
35d68ef143 treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00
Tim Steinbach
e19411ecc0
vivaldi: 2.6.1566.51-1 -> 2.7.1628.30-1 2019-08-25 09:43:52 -04:00
Vladimír Čunát
bc238b8df5
firefoxPackages: fix builds based on ESR 60
Attributes: firefox-esr-60, tor-browser(-8-5), icecat
Thanks to Symphorien: #67426
2019-08-25 14:54:46 +02:00
Asad Saeeduddin
17775d538b flashplayer: 32.0.0.223 -> 32.0.0.238 2019-08-25 06:05:10 -04:00
Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
worldofpeace
0552f4dc73
Merge pull request #67214 from stefano-m/master
adoptopenjdk-icedtea-web: rename from icedtea_web
2019-08-23 16:43:52 -04:00
Stefano Mazzucco
a6d234e9e9 adoptopenjdk-icedtea-web: rename from icedtea_web
This is a follow up of https://github.com/NixOS/nixpkgs/pull/66422

- rename icedtea_web to adoptopenjdk-icedtea-web to reflect the new governance
- add icedtea_web and icedtea8_web to aliases.nix for backwards compatibility
- update the attribute name where icedtea_web is used
2019-08-23 21:12:59 +01:00
Linus Heckemann
25559a5597
Merge pull request #22357 from NixOS/openssl-1.1
Use openssl 1.1 by default
2019-08-23 17:51:52 +02:00
Okinan
32ce5c3e35 qtchan: 0.100 -> 1.0.1 2019-08-23 01:56:24 -05:00
Robin Gloster
f4fc845e5b
Merge remote-tracking branch 'upstream/master' into openssl-1.1 2019-08-21 14:25:13 +02:00
Robin Gloster
86e1839847
esteidfirefoxplugin: remove
id.ee has removed it and doesn't build with openssl 1.1, there seems to
be a new plugin available
2019-08-21 00:05:18 +02:00
Rickard Nilsson
225e412edb Remove myself as maintainer of some packages. 2019-08-20 15:24:01 +02:00
Ben Wolsieffer
8b0a684d21 chromium: remove obsolete patches
One of these patches was causing a warning message, which broke ofborg
evaluation.
2019-08-19 18:54:48 -04:00
Nikolay Amiantov
b7d04d6e6b flashplayer: 32.0.0.223 -> 32.0.0.238 2019-08-19 02:04:37 +03:00
worldofpeace
3a26957d91
Merge pull request #66721 from emmanuelrosa/brave-desktop-file-fix
brave: fix path to brave in *.desktop file
2019-08-18 17:30:35 -04:00
volth
c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00