JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
143,779 Commits 2 Branches 0 Tags 13 GiB
de9abc0d9e
Commit Graph

1329 Commits

Author SHA1 Message Date
Michael Raskin
7be7698612
Merge pull request #25552 from antonxy/master 
lightworks: init at 14.0.0
 2017-11-05 00:01:48 +00:00
Peter Hoeg
93cc9b93e0 kmplayer: add missing X dependencies 2017-10-27 13:07:44 +08:00
Peter Hoeg
a47c892bf5 Merge pull request #30784 from zraexy/kmplayer 
kmplayer: fix desktop file exec
 2017-10-25 23:42:05 +08:00
zraexy
9e1ef99fc2 kmplayer: fix desktop file exec 2017-10-25 06:57:43 -08:00
Stefan Huchler
72f441d090 kodi: downgrades kodiPlugin.joystick to compatible version 1.3.2 2017-10-25 13:56:32 +02:00
Cillian de Róiste
9e0b37944b obs-studio: 20.0.1 -> 20.1.0 + support more features 2017-10-24 23:09:33 +02:00
Clemens Lutz
794ecdd8b8 makemkv: 1.10.6 -> 1.10.7 2017-10-22 00:28:31 +02:00
Heitham Omar
dc60c1e3d0 mpv: enable dvb on Linux 2017-10-15 21:26:00 +01:00
Vladimír Čunát
3ee33f35f8
Merge branch 'staging' 
Contains security fixes in X server and X libs.
On Hydra, the amount to rebuild on master is now higher than on staging;
the comparison looks OK.
 2017-10-15 13:59:18 +02:00
Vladimír Čunát
b1d32c0538
aegisub: fixup build with icu-59 
Thanks to https://github.com/gentoo/gentoo/commit/779fbc09c456a
 2017-10-15 10:44:16 +02:00
vbgl
fcfeda5544 Merge pull request #30206 from romildo/upd.mkvtoolnix 
mkvtoolnix: 15.0.0 -> 16.0.0;  libmatroska: 1.4.7 -> 1.4.8
 2017-10-14 21:48:44 +02:00
José Romildo Malaquias
d49181676b mkvtoolnix: 15.0.0 -> 16.0.0 2017-10-07 18:12:29 -03:00
Unknown
20b48cbd97 kmplayer: 0.11.3d -> 0.12.0b 2017-10-07 12:30:41 -08:00
Orivej Desh
f137004179 Merge branch 'master' into staging 
* master: (81 commits)
  Add NixOS 17.09 AMIs
  gradle: 4.2 -> 4.2.1
  maintainers.nix: use my GitHub handle as maintainer name
  fcitx-engines.rime: init at 0.3.2
  brise: init at 2017-09-16
  librime: init at 1.2.9
  marisa: init at 0.2.4
  opencc: build shared library and programs
  josm: 12712 -> 12914
  exa: 0.7.0 -> 0.8.0
  krb5: add deprecation date for old configuration
  rustRegistry: 2017-09-10 -> 2017-10-03
  go-ethereum: Fix libusb segmentation faults on Darwin
  tor-browser-bundle-bin: 7.0.5 -> 7.0.6
  libsodium: 1.0.13 -> 1.0.15
  tor-browser-bundle: geoip support
  tor-browser-bundle: support transports obfs2,obfs3
  tor-browser-bundle: bump https-everywhere to 2017.9.12
  tint2: limit platforms to Linux since macOS is not supported and fails the tests
  eclipse-plugin-vrapper: init at 0.72.0
  ...
 2017-10-03 17:46:39 +00:00
Franz Pletz
ad2ae842bb
vlc: add patch to fix CVE-2017-9300 2017-10-02 18:54:43 +02:00
Orivej Desh
fda26c8476 Merge branch 'master' into staging 
* master: (271 commits)
  pysmbc: clarify license
  pysmbc: fix license
  bazel: 0.5.4 -> 0.6.0 (#29990)
  googler: init at 3.3
  go: declare support for aarch64
  firefox-beta-bin: 56.0b5 -> 57.0b4
  spotify: 1.0.64.401.g9d720389-21 -> 1.0.64.407.g9bd02c2d-26
  gogs: 0.11.19 -> 0.11.29
  grafana: 4.5.1 -> 4.5.2
  mopidy-iris: 3.4.1 -> 3.4.9
  nextcloud: 12.0.2 -> 12.0.3
  haskell-json-autotype: jailbreak to fix build within LTS 9.x
  kore: fix up
  kore: init at 2.0.0
  glusterfs service: fix issues with useRpcbind
  tig: 2.2.2 -> 2.3.0
  haskell-hspec-core: enable test suite again
  hackage-packages.nix: automatic Haskell package set update
  librsvg: fix thumbnailer path
  awscli: 1.11.108 -> 1.11.162
  ...
 2017-10-02 00:22:12 +00:00
Orivej Desh
432f9925a6 Merge pull request #29745 from mgdelacroix/gpac-update 
gpac: 0.5.0 -> 0.7.1
 2017-10-01 09:01:56 +00:00
Orivej Desh
2847acf517 gpac: fix up 2017-10-01 08:59:12 +00:00
Robin Gloster
40ed226507 treewide: mark a bunch of failing builds as broken 
(cherry picked from commit 23fdbaa37599f490435056b9865023870656571b)
[dezgeg: Un-mark shotcut, tokei & uchiwa that do build on master]
 2017-10-01 00:26:52 +03:00
John Ericson
f037625f87 Merge remote-tracking branch 'upstream/staging' into deps-reorg 2017-09-28 12:32:57 -04:00
Robin Gloster
1a681a6ecb
shotcut: 17.02 -> 17.09 
fixes the previously broken build
 2017-09-27 00:51:20 +02:00
Miguel de la Cruz
4994e3f2c2 gpac: 0.5.0 -> 0.7.1 2017-09-24 17:45:47 +01:00
Samuel Leathers
694e7e08d6 kodi: 17.3 -> 17.4 2017-09-23 16:59:45 +02:00
Tuomas Tynkkynen
ab71280823 darwin: Disable some packages that have never built successfully 
mate.mate-desktop: https://hydra.nixos.org/build/61110037
gdmap: https://hydra.nixos.org/build/61144743
redsocks: https://hydra.nixos.org/build/61123106
resolv_wrapper: https://hydra.nixos.org/build/61121132
ogmtools: https://hydra.nixos.org/build/61108726
mp3info: https://hydra.nixos.org/build/61139015
lxappearance-gtk3: https://hydra.nixos.org/build/61126327
hdf5-fortran: https://hydra.nixos.org/build/61146631
pqiv: https://hydra.nixos.org/build/61124724
 2017-09-22 17:25:38 +03:00
John Ericson
ed14223f8c treewide: Manual fix more pkg-config build-inputs 2017-09-21 15:49:54 -04:00
John Ericson
531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs 
Only acts on one-line dependency lists.
 2017-09-21 15:49:53 -04:00
John Ericson
fd9c7eb2e8 misc pkgs: Make solitary pkgconfig buildInputs nativeBuildInputs 2017-09-21 15:49:53 -04:00
Jonathan Rudenberg
84bfe7ed78
kodiPlugins: fix path for shared object links 
Signed-off-by: Jonathan Rudenberg <jonathan@titanous.com>
 2017-09-19 08:10:12 +02:00
Frederik Rietdijk
3c30b5dc3d Merge pull request #29356 from zraexy/streamlink 
streamlink: 0.7.0 -> 0.8.1
 2017-09-14 10:29:36 +02:00
Joachim F
d1f0affe33 Merge pull request #28869 from symphorien/bombono 
bombono: init at 1.2.4
 2017-09-13 18:46:13 +00:00
dywedir
15002fbf7e mpv: 0.26.0 -> 0.27.0 2017-09-13 12:23:04 +02:00
zraexy
e87a72caef streamlink: 0.7.0 -> 0.8.1 2017-09-12 12:39:08 -08:00
Vincent Laporte
b5c9a47b85 smplayer: 17.8.0 -> 17.9.0 2017-09-09 14:45:26 +02:00
Frederik Rietdijk
fc75bcec48 Revert "pitivi: fix path to gst-python" 
This reverts commit c10a1c6e1c.

Not needed anymore since the issue is fixed properly in 23cc97f16b.
 2017-09-08 21:54:10 +02:00
Robert Helgesson
c10a1c6e1c
pitivi: fix path to gst-python 
This fixes the `object() takes no parameters` error that shows up on
startup.
 2017-09-08 20:51:03 +02:00
John Ericson
f152a5d7bb mplayer: depsBuildBuild isn't (yet) a parameter, so don't use it 
Thanks @dezgeg for catching my error.
 2017-09-06 00:37:15 -04:00
John Ericson
5b6d78194c Merge pull request #29028 from obsidiansystems/cross-cleanup 
misc pkgs: Clean up cross
 2017-09-05 13:59:50 -04:00
John Ericson
10b2bb8288 mplayer: Simplify cross, no crossAttrs or crossConfig 2017-09-05 13:45:34 -04:00
Franz Pletz
df92ed29a5
avidemux: 2.6.20 -> 2.7.0 2017-09-05 14:24:58 +02:00
Symphorien Gibol
945f346f60 bombono: init at 1.2.4 2017-09-02 21:09:41 +02:00
Profpatsch
b35972b3fa mpvScripts.convert: fix for mpv >0.26.0 
See https://gist.github.com/Zehkul/25ea7ae77b30af959be0#gistcomment-2189556
 2017-08-31 01:23:11 +02:00
Samuel Leathers
d99d9026b3 k9copy: fix build with gcc6 2017-08-30 21:27:36 +02:00
Bastian Köcher
bebcef8892 libopenshot-audio: 0.1.2 -> 0.1.4 2017-08-29 12:31:50 +02:00
Bastian Köcher
f5f0d83890 libopenshot: 0.1.4 -> 0.1.7 
Removes ruby to fix compilation errors.
 2017-08-29 12:30:47 +02:00
Bastian Köcher
75f86ae831 Openshot: 2.3.1 -> 2.3.4 2017-08-29 12:30:10 +02:00
Vincent Laporte
c4a156ed45 qarte: 3.2.0+158 -> 3.10.0+188 2017-08-27 10:03:00 +02:00
Orivej Desh
383f3f3a1b smplayer: 17.7.0 -> 17.8.0 2017-08-26 16:48:51 +00:00
romildo
66b78476be mkvtoolnix: 14.0.0 -> 15.0.0 2017-08-26 10:34:23 -03:00
Cray Elliott
1995dbf772 obs-studio: 20.0.0 -> 20.0.1 2017-08-13 14:47:31 -07:00
Frederik Rietdijk
13bbaee21d Merge pull request #27881 from mimadrid/fix/http-https 
Update homepage attributes: http -> https
 2017-08-13 21:53:20 +02:00
Frederik Rietdijk
7ebcd39a0f Merge commit '4c49205' into HEAD 2017-08-13 18:34:59 +02:00
Cray Elliott
ef026e02fc obs-studio: 19.0.3 -> 20.0.0 2017-08-12 15:50:55 -07:00
romildo
da93220fff mkvtoolnix: 13.0.0 -> 14.0.0 2017-08-09 17:11:01 -03:00
davidak
3270aa896b replace "Mac OS X" and "OS X" with "macOS" 
as it is the official name since 2016

https://en.wikipedia.org/wiki/Macintosh_operating_systems#Desktop

exception are parts refering to older versions of macOS like

"GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later [...]"
 2017-08-07 21:41:30 +02:00
Franz Pletz
07106fb508
mpv: bump waf version to 1.9.8 
The bootstrap.py file from mpv downloads this exact version.
 2017-08-04 04:09:19 +02:00
Cillian de Róiste
2244b1815d shotcut: fix homepage 2017-08-03 23:03:04 +02:00
Cillian de Róiste
7c17925aae key-mon: fix download and homepage URLs 2017-08-03 23:03:03 +02:00
mimadrid
09e0cc7cc7
Update homepage attributes: http -> https 
Homepage link "http://.../" is a permanent redirect to "https://.../" and should be updated
https://repology.org/repository/nix_stable/problems
 2017-08-03 11:56:15 +02:00
Silvan Mosberger
f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809) 
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
 2017-08-01 22:03:30 +02:00
Vincent Laporte
01c8e4fe81 mplayer: adds dvdread support 2017-07-28 06:38:53 +00:00
Nikolay Amiantov
2803d0ddd7 avidemux: 2.6.18 -> 2.6.20 2017-07-27 17:07:44 +03:00
Johannes Frankenau
7e62e8d036 mpv: 0.25.0 -> 0.26.0 
Add option for archive support and fix dvdread and dvdnav support.
 2017-07-23 11:00:00 +02:00
Peter Hoeg
9c4b1c8fdd handbrake: remove leftover file 2017-07-18 20:52:02 +08:00
Tobias Geerinckx-Rice
46dc5394cd
Update e-mail address for nckx 2017-07-10 20:54:18 +02:00
Vincent Laporte
645f11b13d smplayer: 17.6.0 -> 17.7.0 2017-07-08 13:53:04 +02:00
Clemens Lutz
4c1ecbb669 makemkv: 1.10.5 -> 1.10.6 2017-07-02 22:28:28 +02:00
zraexy
afb27bd4eb streamlink: 0.6.0 -> 0.7.0 2017-07-02 00:44:23 -08:00
Cray Elliott
20d31d7f49 obs-studio: 19.0.2 -> 19.0.3 2017-06-30 19:29:59 -07:00
romildo
e521b75b9e mkvtoolnix: 12.0.0 -> 13.0.0 2017-06-30 14:01:25 -03:00
John Ericson
e1faeb574a Merge pull request #26884 from obsidiansystems/purge-stdenv-cross 
Purge stdenv cross
 2017-06-28 21:39:16 -04:00
John Ericson
9c163cebdd omxplayer: Don't use stdenv.cross 2017-06-28 18:21:05 -04:00
Frederik Rietdijk
8a62a9b064 Merge pull request #26125 from volth/webkitgtk-naming 
rename webkitgtk24x⇒webkitgtk24x-gtk3; webkitgtk2⇒webkitgtk24x-gtk2
 2017-06-28 13:54:38 +02:00
John Ericson
594d264205 cross stdenv adaptor: Support --host --build --target across the board 
Packages get --host and --target by default, but can explicitly request
any subset to be passed as needed. See docs for more info.

rustc: Avoid hash breakage by using the old (ignored)
dontSetConfigureCross when not cross building
 2017-06-22 17:52:28 -04:00
Thomas Tuegel
c816bbc8a8
qt5: remove makeQtWrapper 2017-06-18 08:44:42 -05:00
Thomas Tuegel
210f688802
qt5: rename qmakeHook to qmake 2017-06-18 08:41:57 -05:00
Michiel Leenaars
b4b698248f qstopmotion: init -> 2.3.2 2017-06-18 00:47:01 +02:00
Will Dietz
b2660fe3cc mplayer: Use system ffmpeg instead of vendored version. (#26572) 
Fixes use of mplayer with https:// URL's.
 2017-06-14 17:44:33 +02:00
romildo
f2e075a241 mkvtoolnix: 11.0.0 -> 12.0.0 2017-06-09 12:44:17 +02:00
Edward Tjörnhammar
677f194a10
kodiPlugins.steam-controller: init at 0.9.0 2017-06-05 17:19:12 +02:00
Edward Tjörnhammar
fe0b858113
kodiPlugins.joystick: init at 1.3.6 2017-06-05 17:17:57 +02:00
Edward Tjörnhammar
4f410bfc8d
kodiPlugins.advanced-emulator-launcher: init at 0.9.6 2017-06-05 17:17:57 +02:00
Edward Tjörnhammar
513e66e310
kodiPlugins: move build funs to common 2017-06-05 17:17:57 +02:00
Vincent Laporte
3a4d03dc7f smtube: 17.1.0 -> 17.5.0 2017-06-01 08:42:21 +02:00
Vincent Laporte
790dedfee9 smplayer: 17.4.2 -> 17.6.0 2017-06-01 08:42:07 +02:00
Volth
b7ccf27229 rename webkitgtk24x -> webkitgtk24x-gtk3; webkitgtk2 -> webkitgtk24x-gtk2 2017-05-26 13:43:25 +00:00
armijnhemel
d75c61ec8d vlc: 2.2.5.1 -> 2.2.6 (#26084) 2017-05-26 08:47:01 +08:00
Edward Tjörnhammar
5b01ba947a
kodiPlugins.svtplay: 4.0.42 -> 4.0.48 2017-05-25 15:33:08 +02:00
Edward Tjörnhammar
1f98e47ec1
kodiPlugins.exodus: 3.0.5 -> 3.1.13 2017-05-25 13:58:47 +02:00
Edward Tjörnhammar
0c6153059d
kodi: 17.2 -> 17.3 2017-05-25 13:58:46 +02:00
Peter Hoeg
8fd2f022f0 kodi: 17.1 -> 17.2 2017-05-24 16:03:25 +08:00
Peter Hoeg
4e2b190d52 vlc: 2.2.4 -> 2.2.5.1 
Fixes a nasty vulnerability caused by broken subtitle handling:

http://blog.checkpoint.com/2017/05/23/hacked-in-translation/
 2017-05-24 13:08:40 +08:00
Carles Pagès
f60767d55e Merge pull request #25366 from titanous/kodi-hdhomerun 
kodi: add pvr-hdhomerun plugin
 2017-05-22 23:32:07 +02:00
Cray Elliott
777d5ee732 obs-studio: 18.0.2 -> 19.0.2 2017-05-22 02:45:18 -07:00
Joachim Fasting
874b81b31f
treewide: s,enableParallelBuild(s),enableParallelBuilding,g 2017-05-20 17:16:17 +02:00
Cray Elliott
577327bc9f obs-studio: bump revision to fix Settings crash 2017-05-18 21:44:59 -07:00
zraexy
83edd95335 streamlink: 0.5.0 -> 0.6.0 2017-05-11 22:58:10 -08:00
Anton Schirg
7a9efec8ed lightworks: init at 14.0.0 2017-05-08 23:03:39 +02:00
Frederik Rietdijk
ef4442e827 Python: replace requests2 with requests tree-wide 
See f63eb58573

The `requests2` attribute now throws an error informing that `requests`
should be used instead.
 2017-05-07 12:56:09 +02:00
Cray Elliott
d95cd1b24e obs-studio: 18.0.1 -> 18.0.2 
add myself as a maintainer for this package, add fdk_aac, pthreadstubs,
and Xdmcp as dependencies. Also add a patch to fix a linker error
involving xcb
 2017-05-04 15:26:51 -07:00
Vincent Laporte
d75ae6dee9 smplayer: 17.3.0 -> 17.4.2 2017-05-04 23:19:17 +02:00
Jonathan Rudenberg
8a978a7be3 kodi: init pvr-hdhomerun plugin at 2.4.7 2017-05-02 13:47:02 -04:00
José Romildo Malaquias
cc5f1f54dc mkvtoolnix: 9.9.0 -> 11.0.0 (#25349) 
Add dependency on Qt’s multimedia component, required for compilation
of the GUIs since version 11.0.0.
 2017-05-02 10:09:51 +01:00
Jörg Thalheim
d58c6a4730 Merge pull request #25364 from titanous/update-makemkv 
makemkv: 1.10.4 -> 1.10.5
 2017-05-01 16:24:23 +02:00
Cray Elliott
c49a454210 mpv, xpra: depend on ffmpeg instead of ffmpeg_3_2 
effectively updates them to depend on ffmpeg_3_3
 2017-04-30 16:52:49 -07:00
Jonathan Rudenberg
df7d1fccca makemkv: 1.10.4 -> 1.10.5 2017-04-30 16:31:10 -04:00
Peter Hoeg
229e3383f4 mpv: 0.24.0 -> 0.25.0 2017-04-24 15:42:55 +08:00
Daiderd Jordan
80828429d7 Merge pull request #25066 from matthewbauer/less-darwin-eval-errors 
Add Darwin as platform to various "broken" packages that actually build
 2017-04-24 08:14:21 +02:00
Matthew Bauer
32d95b1f04
dvdauthor: supports darwin 2017-04-23 18:08:19 -05:00
aszlig
b017935103
vlc: Fix build for Qt >= 5.7.0 
This basically does something similar than the AUR build:

https://aur.archlinux.org/packages/vlc-qt5/

On our side, all there is to do is to force compiling using C++11 mode
and use a patch that the AUR package took from the following upstream
patchwork URL:

https://patches.videolan.org/patch/14061/

Instead of passing CXXFLAGS to the configure script, I'm using sed here
to make sure we don't override flags figured out by configure.

For example if ./configure is used with CXXFLAGS=-std=c++11 appended or
prepended, we have something like:

... -I../include   -std=c++11 -Wall -Wextra -Wsign-compare ...

While if we don't do that at all, we have something like:

... -I../include   -g -O2 -Wall -Wextra -Wsign-compare ...

Another way would be to use NIX_CFLAGS_COMPILE, but that would affect
even compilation of C code and thus resulting in a bunch of warnings
like this:

cc1: warning: command line option '-std=c++11' is valid for C++/ObjC++
              but not for C

So with our approach the flags during build look much better:

... -I../include   -std=c++11 -g -O2 -Wall -Wextra -Wsign-compare ...

Another thing I've changed is that the vlc_qt5 attribute in
all-packages.nix now uses the latest Qt 5 version, because the build for
Qt >= 5.7.0 is now no longer broken.

I've also ordered the preConfigure attribute before the configureFlags
attribute, because it makes more sense in terms of context (pre ->
configure -> post).

Tested by building on x86_64-linux with libsForQt56.vlc, libsForQt58.vlc
and vlc (the Qt 4 version, just to be sure I didn't accidentally break
it).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @ttuegel
 2017-04-19 05:09:47 +02:00
zraexy
51770c85e4
streamlink: 0.3.0 -> 0.5.0 2017-04-17 01:24:28 +02:00
Patrick Callahan
e760c7bd6a openshot-qt: 2.2.0 -> 2.3.1 (#24868) 
* openshot-qt: 2.2.0 -> 2.3.1

* openshot-qt: use buildPythonApplication

* openshot: get dialogs in gtk environments working
 2017-04-16 21:09:22 +02:00
Peter Hoeg
8356c6ca2f handbrake: 1.0.3 -> 1.0.7 2017-04-16 19:42:32 +08:00
Jean-Baptiste Giraudeau
40d46f9ca4 Kodi: use kodi fork of libdvdnav/libdvdread. Fix #24153 (dvd playback) 2017-04-07 07:55:07 +02:00
AndersonTorres
fdd654a7a9 openshot-qt: 2.1.0 -> 2.2.0 
Also, libopenshot and libopenshot-audio
are now directly referenced on all-packages.nix.
 2017-03-30 00:53:22 -03:00
Vladimír Čunát
96d41e393d
treewide: purge maintainers.urkud 
It's sad, but he's been inactive for the last five years.
Keeping such people in meta.maintainers is counter-productive.
 2017-03-27 19:52:29 +02:00
Thomas Tuegel
8b50f4c990 Merge pull request #24299 from ttuegel/master--drop-qt-5.7 
Drop Qt 5.5 and Qt 5.7 from master
 2017-03-26 09:18:38 -05:00
Cray Elliott
7bd73bdba3 obs-studio: use upstream crash fixes, drop patch 2017-03-25 21:08:08 -07:00
Thomas Tuegel
f77e6d03e9
openshot-qt: correct packaging errors and pin to Qt 5.6 2017-03-25 08:49:40 -05:00
Peter Hoeg
7833436098 kodi: 17.0 -> 17.1 2017-03-24 08:19:16 +08:00
Peter Hoeg
b9f56c9f49 handbrake: force link libx265 2017-03-21 18:28:50 +08:00
Peter Hoeg
f4f29bcd8b handbrake: 0.10.5 -> 1.0.3 2017-03-19 09:48:22 +08:00
Robin Gloster
4e2f802ce8
gnome_mplayer: fix src and build 2017-03-18 12:47:57 +01:00
Vincent Laporte
88d7718a64 mkvtoolnix-cli: fix build on darwin 2017-03-13 21:20:26 +00:00
José Romildo Malaquias
04290bbd14 mkvtoolnix: 9.8.0 -> 9.9.0 (#23827) 
* mkvtoolnix: 9.8.0 -> 9.9.0

Starting with version 9.9.0 the man pages and their translations are
not pre-built and bundled with the source code. The tool "xsltproc"
and the DocBook XSL stylesheets for man pages are now required
dependencies to build them.
 2017-03-13 22:16:38 +01:00
Cray Elliott
76836ee2c7 obs-studio: 18.0.0 -> 18.0.1 
also add patch to fix a segfault, submitted upstream to obs-studio
 2017-03-10 04:22:25 -08:00
Vincent Laporte
1fb6fc28cf smplayer: 17.2.0 -> 17.3.0 2017-03-08 23:02:03 +01:00
AndersonTorres
9ef30ce570
dvdstyler: init at 3.0.3 2017-03-06 17:36:28 +01:00
Jörg Thalheim
550f65a0f4 Merge pull request #23517 from michalrus/devede 
devede: 3.23.0 → 4.8.8
 2017-03-06 14:19:50 +01:00
Bart Brouns
633cd69453
simplescreenrecorder: 0.3.6 -> 0.3.8 2017-03-06 07:56:33 -05:00
Tomas Hlavaty
079c306c6e openshot-qt: remove myself from the maintainer list 2017-03-05 20:47:24 +01:00
Michal Rus
13a9059c55
devede: 3.23.0 → 4.8.8 2017-03-05 14:48:22 +01:00
Cray Elliott
0b7861dc7f obs-studio: 17.0.1 -> 18.0.0 2017-03-02 02:44:34 -08:00
Bjørn Forsman
3d104ab2b3 gst-plugins-base: align attrname with pkgname 2017-02-27 12:16:26 +01:00
Bjørn Forsman
0591cd607b gst-plugins-good: align attrname with pkgname 2017-02-27 12:16:26 +01:00
Bjørn Forsman
4b2c7fe3d1 gst-ffmpeg: align attrname with pkgname 2017-02-27 12:16:26 +01:00
Bjørn Forsman
9e21b2c5e9 gst-python: align attrname with pkgname 2017-02-27 12:16:26 +01:00
Franz Pletz
78d3a11384
mpv: 0.23.0 -> 0.24.0 2017-02-26 10:26:12 +01:00
Daiderd Jordan
bbc9b1ab2c
mpv: disable drmSupport on darwin 2017-02-25 21:34:54 +01:00
Thomas Tuegel
0ed156a216 Merge pull request #22977 from ttuegel/triage-kde4 
Remove KDE 4 desktop packages
 2017-02-25 12:21:44 -06:00
Jonathan Rudenberg
87d294fcdd kodi: Explicitly compile in libcec support 
Adding this flag prevents silent breakage of CEC support.
 2017-02-25 08:53:31 +01:00
Thomas Tuegel
f28848cb4d
kde4.kdelibs -> kdelibs4 
Our kdelibs4 package does not come from KDE 4, so per upstream's request I am
moving it out of the kde4 set.
 2017-02-24 17:16:28 -06:00
Thomas Tuegel
9af7f6b9d4
Remove kde4.kdenlive and dependencies 
- Already updated to KDE 5 in Nixpkgs
 2017-02-24 16:49:03 -06:00
Thomas Tuegel
6e1d64a3c0
Remove kde4.bangarang 
- No upstream activity
 2017-02-24 16:49:03 -06:00
Thomas Tuegel
f228ea5215 Merge pull request #22698 from FRidh/kde 
KDE: update frameworks and applications
 2017-02-14 12:54:39 -06:00
Frederik Rietdijk
d375d7b354 kmplayer: file not available via new mirror either 2017-02-13 09:55:40 +01:00
Robert Helgesson
446aa6834a
subtitle-editor: fix build 
Apply Debian patch that makes the project build with later GStreamer
versions.
 2017-02-12 21:14:09 +01:00
Vincent Laporte
4464199779 smplayer: 17.1.0 -> 17.2.0 2017-02-11 13:55:07 +01:00
Vincent Laporte
980565bca0 smtube: 16.7.2 -> 17.1.0 2017-02-11 13:46:42 +01:00
Edward Tjörnhammar
7d8a6ef1fd
kodiPlugins.exodus: 2.0.12 -> 3.0.5 2017-02-09 21:18:57 +01:00
Graham Christensen
8608f91661
gnash: remove due to removal of ming 2017-02-06 21:23:40 -05:00
Carles Pagès
c54f47b013 kodiPlugins.pvr-hts: 3.4.4 -> 3.4.16 2017-02-03 23:13:41 +01:00
Nikolay Amiantov
de9017ee68 vokoscreen: don't use qt.full 2017-02-03 18:21:16 +03:00
Edward Tjörnhammar
62dc683096
kodiPlugins: updates 
* Added exodus in favour of genesis, same developer and old plugin is dead
  * Added gamepad(controllers) inputs as enableControllers
  * Updated SVTPlay, HyperLauncher
  * Removed SALTS, doesn't work without a FHS
 2017-02-02 21:12:55 +01:00
Carles Pagès
d211d7c440
kodiPlugins.pvr-hts: update to 3.4.4 for kodi17 
Updated pvr-hts plugin to latest version to work with kodi 17. Had to
update libcec as well, to pick the name change.
 2017-02-02 21:12:54 +01:00
Edward Tjörnhammar
a70b4f7b38
kodi: 16.1 -> 17.0 2017-02-02 21:12:54 +01:00
Lluís Batlle
8389060731 Updating shotcut to 17.02. 2017-02-02 10:25:47 +01:00
goibhniu
8605cdc898 Merge pull request #22207 from league/vokoscreen 
vokoscreen: init at 2.5.0
 2017-02-02 09:51:44 +01:00
Damien Cassou
58dc8e3024
Remove myself from maintainers 2017-01-31 11:00:14 +01:00
Nikolay Amiantov
db99892817 treewide: quote homepages in my packages 2017-01-31 03:27:10 +03:00
Lluís Batlle i Rossell
8d5b2e66bd Updating shotcut to 17.01 and fixing its jobs 2017-01-28 20:12:51 +01:00
Lluís Batlle i Rossell
91686f2d37 Add fixed cinelerra 
I don't know what version to choose
 2017-01-28 20:12:51 +01:00
Lluís Batlle i Rossell
20465bedee Updating shotcut and melt. 2017-01-28 20:12:51 +01:00
Christopher League
c1c7d2894d vokoscreen: init at 2.5.0 
vokoscreen is an easy to use screencast creator to record educational
videos, live recordings of browser, installation, videoconferences, etc.

It uses Qt5 and ffmpeg.
 2017-01-27 16:08:34 -05:00
Graham Christensen
2427ba2a39 Merge pull request #22157 from MP2E/obs_studio_update 
obs-studio: 0.15.2 -> 17.0.1
 2017-01-26 21:37:01 -05:00
Cray Elliott
2598d77968 obs-studio: 0.15.2 -> 17.0.1 
upstream version scheme change, this is the equivalent of 0.17.1
 2017-01-25 18:55:59 -08:00
Franz Pletz
a8a5d3dcf8
clipgrab: 3.6.1 -> 3.6.2 2017-01-26 03:52:48 +01:00
Yorick van Pelt
2a939c4b21 streamlink: 0.0.2 -> 0.3.0 2017-01-25 19:12:49 +01:00
romildo
e98aa7832c mkvtoolnix: 9.6.0 -> 9.8.0 
- Update mkvtoolnix to v9.8.0
- Add a build dependency on drake, because it is not bundled with
  mkvtoolnix anymore since v9.8.0
 2017-01-24 18:50:56 -02:00
Vincent Laporte
1f0d5bfcf9 smplayer: 16.11.0 -> 17.1.0 2017-01-21 19:56:06 +01:00
Carles Pagès
fd400ced6b Rename page to cpages to match github 
I also updated the mail.
 2017-01-20 16:55:29 +01:00
Daiderd Jordan
2b0ca8dc5d Merge pull request #21681 from matthewbauer/anki 
Anki: Darwin support
 2017-01-18 21:41:11 +01:00
Matthew Bauer
0ede72738d
mplayer: add darwin platform 2017-01-17 19:49:05 -06:00
Clemens Lutz
fe6e4e2464 makemkv: 1.9.10 -> 1.10.4 2017-01-14 18:33:35 +01:00
Vincent Laporte
139ed790da qarte: 3.2.0+146 -> 3.2.0+158 2017-01-14 17:04:51 +01:00
Vincent Laporte
d535b2df06 smtube: 16.1.0 -> 16.7.2 2017-01-14 14:09:20 +01:00
Vincent Laporte
a04337d5c8 smplayer: 16.1.0 -> 16.11.0 2017-01-14 13:44:19 +01:00
Bjørn Forsman
05bb3fe22e avidemux: 2.6.16 -> 2.6.18 2017-01-12 20:13:12 +01:00
Stefan Götz
9280174493 mpv: 0.22.0 -> 0.23.0 2017-01-10 22:42:29 +01:00
Frederik Rietdijk
4187179f7b Merge pull request #21455 from puffnfresh/package/Natron 
natron: init at 2.1.9
 2017-01-06 08:22:08 +01:00
Brian McKenna
f133475370 natron: init at 2.1.9 2017-01-06 15:49:35 +11:00
Bjørn Forsman
26dc6dab4c avidemux: 2.6.15 -> 2.6.16 2017-01-03 20:27:25 +01:00
Joachim Fasting
52cb1df30c
kodi/wrapper: fix typo, preferLocalBuilds -> preferLocalBuild 2016-12-14 03:48:44 +01:00
romildo
ae1fa72a48 mkvtoolnix: 9.5.0 -> 9.6.0 2016-12-02 20:55:34 -02:00
Nikolay Amiantov
91fd6b04aa libquvi: specify glib dependency 2016-11-24 01:17:55 +03:00
Nikolay Amiantov
79b0a9bf39 avidemux: 2.6.12 -> 2.6.15 2016-11-24 01:17:54 +03:00
Nikolay Amiantov
be95ceaff2 treewide: quote URLs in my packages 2016-11-24 01:17:52 +03:00
Franz Pletz
1305691cec
mpv: 0.21.0 -> 0.22.0 2016-11-23 13:23:32 +01:00
Pascal Wittmann
f7e0bc2ae7
Make all meta.maintainers attributes lists 2016-11-20 18:06:03 +01:00
=
56fdd19bc8
w_scan: init at 20161022 2016-11-14 17:20:23 +01:00
Brian McKenna
c950840544 motion: init at 4.0.1 2016-11-08 10:55:13 +11:00
Franz Pletz
12088f2ba1
mpv: add support for drm, fixes vaapi 2016-11-03 12:54:26 +01:00
zraexy
e675b2c0de streamlink: 1.14.0-rc1 -> 0.0.2 
Update streamlink to 0.0.2
1.14.0-rc1 was not an official release
 2016-10-31 20:07:49 +02:00
Frederik Rietdijk
7077a270bf Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-26 13:06:43 +02:00
Stefan Goetz
9ed93637a3 mpv: 0.20.0 -> 0.21.0 (#19873) 2016-10-26 02:11:56 +02:00
Frederik Rietdijk
e56832d730 Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-22 17:23:24 +02:00
romildo
766c0c1ec9 mkvtoolnix: 9.4.2 -> 9.5.0 2016-10-21 14:57:01 -02:00
Frederik Rietdijk
8fb03df1c1 handbrake: use python2 2016-10-18 23:16:08 +02:00
Frederik Rietdijk
7af8b221fd kodi: use python2 2016-10-18 23:16:05 +02:00
Vladimír Čunát
6eeea6effd Python: more evaluation fixups. 2016-10-14 00:03:12 +02:00
Frederik Rietdijk
104c50dd1a Python: remove modules and pythonFull 2016-10-10 10:33:24 +02:00
Jörg Thalheim
bb983fbfba Merge pull request #19397 from k0ral/nixos-unstable 
handbrake: add libx265 to LD_LIBRARY_PATH
 2016-10-09 21:32:32 +02:00
koral
dd482470c4 handbrake: add libx265 to LD_LIBRARY_PATH 2016-10-09 18:20:57 +02:00
Bjørn Forsman
b48dafee8d shotcut: 16.08 -> 16.10 2016-10-08 18:25:43 +02:00
Markus Hauck
aafbd40577 Replace hard coded /bin/bash occurrences 2016-10-04 20:15:37 +02:00
Bjørn Forsman
3e6ce75b8f openshot-qt: 2.0.7 -> 2.1.0 
Also update libopenshot (0.1.1 -> 0.1.2) and libopenshot-audio (0.1.1 ->
0.1.2). Both  libraries seem to be somewhat version coupled with
openshot (all three projects had a release at the same time).

Openshot now depends on ZMQ.

Test notes: the application runs, but I managed to crash it after doing
this:

* Import pictures and video
* Add two pictures to the timeline (next to each other)
* Drag the 2nd picture partly over over the first
  (creates an effect). App dies.

The last output from the app is:

  timeline_webview:INFO addTransition...
  Unhandled Python exception
  Aborted

The same crash happens with v2.0.7 though.
 2016-10-02 22:19:16 +02:00
Graham Christensen
f5057d6ba9
mplayer: 1.1.1 -> 1.3.0 2016-09-25 21:50:08 -04:00
Frederik Rietdijk
107e8ccb6b key-mon: do not use top-level python packages 2016-09-25 23:59:21 +02:00
Arseniy Seroka
4400b60cd9 Merge pull request #18787 from romildo/upd.subtitleeditor 
subtitleeditor: 0.52.1 -> 0.53.0
 2016-09-25 01:09:24 +04:00
José Romildo Malaquias
d18a8f9cf2 mkvtoolnix: do not inline the result of optional in buildInputs because it returns a list and should be concatenated instead 2016-09-23 11:35:26 -03:00
Tuomas Tynkkynen
ca7808f696 streamlink: Fix longDescription 2016-09-21 19:34:01 +03:00
Tuomas Tynkkynen
5aee5b2100 streamlink: Init at 1.14.0-rc1 
A fork of livestreamer (which is no longer maintained) that actually
works with Twitch.
 2016-09-21 19:29:51 +03:00
José Romildo Malaquias
c212ad1630 subtitleeditor: 0.52.1 -> 0.53.0 2016-09-21 09:45:20 -03:00
José Romildo Malaquias
88e15b19ef mkvtoolnix: 9.4.0 -> 9.4.2 2016-09-18 07:09:07 -03:00
Matthew Bauer
85f2c3ebc9
mplayer: fix on darwin 2016-09-14 12:51:47 -05:00
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Vincent Laporte
637412e373 mpv: fix on darwin 2016-09-12 14:42:38 +02:00
Tuomas Tynkkynen
ffddcc8807 vlc_npapi: Fix hash 2016-09-11 00:21:16 +03:00
Kirill Boltaev
86557f9ffd mpv: 0.19.0 -> 0.20.0 (#18493) 
Enable vaapiSupport by default.
 2016-09-10 21:56:49 +02:00
Joachim F
82d6ab1ed8 Merge pull request #18029 from rnhmjoj/vapoursynth 
Vapoursynth
 2016-09-08 16:28:31 +02:00
Thomas Tuegel
e25a07e92a
qt5.vlc: mark broken with Qt 5.7 2016-09-07 20:57:55 -05:00
rnhmjoj
6fabc515d0
mpv: add vapoursynth support 2016-09-04 22:27:10 +02:00
Tuomas Tynkkynen
3364230d56 Disable bunch of non-compiling packages on Darwin 
These ones have a "Last successful build" timestamp in the 2014s or
2015s. Presumably no one will notice if we now stop building them.

softether_4_18              2015-09-20  http://hydra.nixos.org/build/39418483
lensfun                     2014-09-30  http://hydra.nixos.org/build/39394104
net_snmp                    2015-09-20  http://hydra.nixos.org/build/39410553
djview                      2015-08-11  http://hydra.nixos.org/build/39413233
libmusicbrainz2             2015-09-20  http://hydra.nixos.org/build/39410106
fox_1_6                     2014-05-07  http://hydra.nixos.org/build/39410858
libofx                      2015-09-24  http://hydra.nixos.org/build/39423507
yacas                       2014-09-30  http://hydra.nixos.org/build/39393150
iomelt                      2014-09-30  http://hydra.nixos.org/build/39408486
softether                   2015-09-20  http://hydra.nixos.org/build/39425800
mp4v2                       2014-09-30  http://hydra.nixos.org/build/39421899
virtuoso7                   2014-09-21  http://hydra.nixos.org/build/39415206
man_db                      2015-04-23  http://hydra.nixos.org/build/39404236
libdiscid                   2014-09-30  http://hydra.nixos.org/build/39412202
zabbix22.agent              2014-09-21  http://hydra.nixos.org/build/39412149
vidalia                     2015-08-06  http://hydra.nixos.org/build/39411500
libmtp                      2015-09-20  http://hydra.nixos.org/build/39419199
wxGTK29                     2015-09-20  http://hydra.nixos.org/build/39415296
ncmpcpp                     2015-11-06  http://hydra.nixos.org/build/39404455
libtorrent                  2014-09-21  http://hydra.nixos.org/build/39394646
shishi                      2014-03-21  http://hydra.nixos.org/build/39418874
ocaml_3_12_1                2014-09-30  http://hydra.nixos.org/build/39392996
djview4                     2015-08-11  http://hydra.nixos.org/build/39427799
vimNox                      2014-05-23  http://hydra.nixos.org/build/39397012
ttfautohint                 2015-08-06  http://hydra.nixos.org/build/39398330
libraw                      2015-09-24  http://hydra.nixos.org/build/39402271
wxGTK30                     2015-09-20  http://hydra.nixos.org/build/39401871
sbcl_1_2_5                  2015-09-20  http://hydra.nixos.org/build/39426091
prover9                     2014-09-30  http://hydra.nixos.org/build/39406476
rcs                         2015-08-25  http://hydra.nixos.org/build/39392037
gpac                        2015-09-24  http://hydra.nixos.org/build/39399470
virtuoso6                   2014-09-30  http://hydra.nixos.org/build/39398651
xlslib                      2015-09-24  http://hydra.nixos.org/build/39410387
ucommon                     2015-03-27  http://hydra.nixos.org/build/39414040
commoncpp2                  2014-09-30  http://hydra.nixos.org/build/39420117
virtuoso                    2014-09-21  http://hydra.nixos.org/build/39399978
miniHttpd                   2014-09-30  http://hydra.nixos.org/build/39392925
mpack                       2014-09-26  http://hydra.nixos.org/build/39399535
nbd                         2014-09-26  http://hydra.nixos.org/build/39401367
newsbeuter-dev              2014-07-29  http://hydra.nixos.org/build/39406259
gimp_2_8                    2015-09-20  http://hydra.nixos.org/build/39436271
gimp                        2015-09-20  http://hydra.nixos.org/build/39435976
zabbix20.agent              2014-09-30  http://hydra.nixos.org/build/39393242
gst_all_1.gst-plugins-good  2015-09-20  http://hydra.nixos.org/build/39408506
ocaml_4_00_1                2014-09-30  http://hydra.nixos.org/build/39399526
inadyn                      2014-09-30  http://hydra.nixos.org/build/39426389
gst_all_1.gst-plugins-bad   2015-09-20  http://hydra.nixos.org/build/39392970
zabbix.agent                2014-09-30  http://hydra.nixos.org/build/39421412
cmake-2_8                   2015-09-24  http://hydra.nixos.org/build/39399443
liblastfm                   2015-08-06  http://hydra.nixos.org/build/39421812
newsbeuter                  2014-07-29  http://hydra.nixos.org/build/39396605
sdcv                        2014-09-26  http://hydra.nixos.org/build/39412928
 2016-09-01 20:39:33 +03:00
José Romildo Malaquias
b2a68b73dc mkvtoolnix: 9.3.1 -> 9.4.0 2016-08-30 10:24:06 -03:00
Frederik Rietdijk
357fbe1ccf Merge pull request #18080 from vbgl/qarte-3 
qarte: 2.4.0 -> 3.2.0
 2016-08-29 21:47:26 +02:00
obadz
b74793bd1c Merge branch 'master' into staging 
Conflicts:
	pkgs/tools/system/facter/default.nix
 2016-08-29 12:44:17 +01:00
Frederik Rietdijk
aebabb9871 qarte: create python env 2016-08-29 13:36:50 +02:00
Vincent Laporte
58738e4bc7 qarte: 2.4.0 -> 3.2.0 2016-08-29 13:36:50 +02:00
Gabriel Ebner
6a11b11a7d handbrake: 0.9.9 -> 0.10.5 2016-08-29 08:05:26 +02:00
obadz
3de6e5be50 Merge branch 'master' into staging 
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
 2016-08-27 23:54:54 +01:00
Franz Pletz
4f91c270d2 mpv: 0.18.1 -> 0.19.0 2016-08-25 01:56:35 +02:00
obadz
0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Lluís Batlle i Rossell
9ef3a51379 Adding vlc plugin for firefox. 
I really wanted it to substitute the html5 player, or at least the direct
player for mp4/webm files in firefox, but I couldn't make it work. The
formats recognized by the firefox internal player were used in all cases. The
plugin worked for formats unknown by firefox.

https://support.mozilla.org/ca/questions/1089501

Nevertheless, as I wrote the nix recipe, I commit it. It may be of interest to
someone else.
 2016-08-23 10:16:37 +02:00
Tuomas Tynkkynen
b4749ed96d treewide: Use more makeLibraryPath 2016-08-23 02:56:12 +03:00
Tuomas Tynkkynen
74a3a2cd7e treewide: Use makeBinPath 2016-08-23 01:18:10 +03:00
obadz
24a9183f90 Merge branch 'hardened-stdenv' into staging 
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
 2016-08-22 01:19:35 +01:00
Lluís Batlle i Rossell
b8e215fb50 Making shotcut use qt5 (5.6), not qt55. 2016-08-18 10:22:19 +02:00
Lluís Batlle i Rossell
762a11a276 Updating and fixing shotcut. 2016-08-18 09:41:29 +02:00
Lluís Batlle i Rossell
e31951cb88 More dependencies to shotcut 2016-08-18 09:40:51 +02:00
Nikolay Amiantov
3e5bf44aab sip: 4.14.7 -> 4.18.1, drop unused old version 2016-08-17 20:30:51 +03:00
Lluís Batlle i Rossell
5b3c885b35 Shotcut builds, but wants jack1 libs on start. 2016-08-17 17:25:03 +02:00
Frederik Rietdijk
5a501bd828 Remove top-level dbus_python and pythonDBus. 
See #11567.

Furthermore, it renames pythonPackages.dbus to pythonPackages.dbus-
python as that's the name upstream uses.

There is a small rebuild but I couldn't figure out the actual cause.
 2016-08-16 22:52:37 +02:00
Robin Gloster
33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-16 07:54:01 +00:00
Pascal Wittmann
b22fc4c411 Merge pull request #17708 from DamienCassou/fix-byzanz 
byzanz: Let it find gstreamer plugins
 2016-08-15 10:56:57 +02:00
Damien Cassou
6d27410111 byzanz: Let it find gstreamer plugins 2016-08-14 17:23:01 +02:00
Frederik Rietdijk
7986b718f3 Remove pycairo from top-level 
See #11567.
 2016-08-14 13:52:42 +02:00
Frederik Rietdijk
6842a24b21 Remove top-level pyqt4 
See #11567.
 2016-08-14 12:38:01 +02:00
Robin Gloster
708653a634 kino: disable format hardening 2016-08-03 20:08:54 +00:00
Robin Gloster
1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms 
Build-tested on x86_64 Linux & Mac.
 2016-08-02 21:42:43 +03:00
Robin Gloster
63c7b4f9a7 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-31 20:51:34 +00:00