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

1939 Commits

Author SHA1 Message Date
Robin Gloster
f9f46dc327
treewide: NIX_*_FLAGS -> string 2019-12-31 00:15:46 +01:00
Robin Gloster
ab0cfd9e03
treewide: NIX_*_COMPILE -> string 2019-12-31 00:10:18 +01:00
Frederik Rietdijk
6d059becd3 Merge gcc-9 into staging (#68029) 2019-12-30 16:38:38 +01:00
Jan Tojnar
9a338f230e
xawtv: clean up 
* Remove unnecessary linker and compiler flags
* Listify makeFlags
* Do not use DESTDIR (nasty)
* Let generic builder set --prefix configureFlag
* Install X11 app-defaults to more modern directory
* Format with nixpkgs-fmt
 2019-12-29 22:19:18 +01:00
Tadeo Kondrak
85783b9eac
mpv: 0.30.0 -> 0.31.0 2019-12-28 09:10:30 -07:00
Maximilian Bosch
9842c4b107
treewide: update which packages I'm currently maintaining 
Idea shamelessly stolen from 4e60b0efae.

I realized that I don't really know anymore where I'm listed as maintainer and what
I'm actually (co)-maintaining which means that I can't proactively take
care of packages I officially maintain.

As I don't have the time, energy and motivation to take care of stuff I
was interested in 1 or 2 years ago (or packaged for someone else in the
past), I decided that I make this explicit by removing myself from several
packages and adding myself in some other stuff I'm now interested in.

I've seen it several times now that people remove themselves from a
package without removing the package if it's unmaintained after that
which is why I figured that it's fine in my case as the affected pkgs
are rather low-prio and were pretty easy to maintain.
 2019-12-26 15:27:47 +01:00
Franz Pletz
77b6c3cd06
Merge remote-tracking branch 'origin/master' into gcc-9 2019-12-26 14:17:36 +01:00
markuskowa
ee8910cb7d
Merge pull request #76475 from r-ryantm/auto-update/xine-ui 
xineUI: 0.99.10 -> 0.99.12
 2019-12-25 16:04:43 +01:00
R. RyanTM
f4f0f93e0e xineUI: 0.99.10 -> 0.99.12 2019-12-24 16:11:56 -08:00
R. RyanTM
af1aa5ec2c obs-studio: 24.0.4 -> 24.0.6 2019-12-23 18:08:20 -08:00
R. RyanTM
d437db77ca mkvtoolnix: 40.0.0 -> 41.0.0 2019-12-23 17:09:11 -08:00
Anthony Cowley
7978601e8d handbrake: remove nasm and cmake dependencies 
These were included by the handbrake build because they are used by external dependencies. In nixpkgs, we build those dependencies (e.g. codecs) separately, and so excise the check for these tools from the handbrake build.
 2019-12-20 22:08:29 -05:00
Anthony Cowley
b4dea13eb4 handbrake: 1.2.2 -> 1.3.0 
This update is important as handbrake 1.2.2 no longer builds with
nixpkgs due to an unrelated update to pango-1.44.x as described
[here](https://github.com/HandBrake/HandBrake/issues/2226).

Fixes #73399
 2019-12-20 22:00:58 -05:00
georgewhewell
55fb0c955b kodi: add option for GBM backend 2019-12-15 15:05:57 +00:00
Jan Tojnar
6842813bb1
aegisub: slight clean up 2019-12-15 05:44:17 +01:00
Jan Tojnar
955be27f58
aegisub: fix build 2019-12-15 05:36:24 +01:00
worldofpeace
c00538ae3a recordmydesktop: remove 
The qt version is using qt4 pyqt and the gtk version gtk2 pygtk.
Not seeing any activity at all at https://sourceforge.net/p/recordmydesktop/bugs/
 2019-12-10 22:39:37 -05:00
worldofpeace
d7159adcba keymon: remove 2019-12-10 22:37:14 -05:00
dasj19
6e52e28ae9 kodi: 18.4 -> 18.5 (#75291) 
Bump.
 2019-12-09 10:25:27 +08:00
Ryan Mulligan
c709a435e7
Merge pull request #75286 from r-ryantm/auto-update/obs-studio 
obs-studio: 24.0.3 -> 24.0.4
 2019-12-08 14:49:38 -08:00
R. RyanTM
983e831d01 obs-studio: 24.0.3 -> 24.0.4 2019-12-08 11:37:11 -08:00
Sheng Wang
62fe4b9fa6 makemkv: 1.14.6 -> 1.14.7 
Changelog:
Bug fixes:
- Better compatibility for decrypted AACS 2.1 FMTS files
- Fixed variable expansion bug for default file name template
 2019-12-06 21:41:54 +09:00
Sheng Wang
16d0ad9422 makemkv: 1.14.5 -> 1.14.6 
Changelog:
- Added support for AACS 2.1
- Many small bugfixes and improvements
 2019-12-06 21:39:30 +09:00
Frederik Rietdijk
51ef7c3e49 Merge master into staging-next 2019-12-05 09:14:08 +01:00
Mateusz Kowalczyk
1451a52a38 Remove myself (fuuzetsu) from maintainer lists 
I haven't been doing any maintenance for a long time now and not only
do I get notified, it also creates a fake impression that all these
packages had at least one maintainer when in practice they had none.
 2019-12-05 16:29:48 +09:00
Jan Tojnar
55a72926e1
Merge branch 'staging-next' into staging 2019-11-30 19:45:46 +01:00
Jan Tojnar
a69ad18da9
Merge branch 'master' into staging-next 2019-11-30 19:44:51 +01:00
Ryan Mulligan
9704460056
Merge pull request #74463 from r-ryantm/auto-update/mkvtoolnix 
mkvtoolnix: 38.0.0 -> 40.0.0
 2019-11-30 08:58:34 -08:00
R. RyanTM
f24ef9491a streamlink: 1.2.0 -> 1.3.0 (#74660) 2019-11-30 15:03:43 +01:00
Frederik Rietdijk
9f84415541 Merge staging-next into staging 2019-11-30 08:58:01 +01:00
Frederik Rietdijk
d14baf7747 Merge master into staging-next 2019-11-30 08:57:28 +01:00
R. RyanTM
8e44f6dbf0 smplayer: 19.10.0 -> 19.10.2 2019-11-29 07:40:56 -08:00
R. RyanTM
c1735c4cfb mkvtoolnix: 38.0.0 -> 40.0.0 2019-11-28 03:10:03 -08:00
John Ericson
f191360ad0 Merge remote-tracking branch 'upstream/staging-next' into staging 2019-11-25 15:59:05 -05:00
Frederik Rietdijk
06a054e6eb Merge master into staging-next 2019-11-25 21:51:57 +01:00
R. RyanTM
c2d6de2935 clipgrab: 3.8.5 -> 3.8.6 2019-11-25 08:51:38 -08:00
John Ericson
4f1261134e Merge remote-tracking branch 'upstream/master' into staging 2019-11-24 18:33:54 +00:00
John Ericson
d0d5136cce Merge remote-tracking branch 'upstream/master' into wrapper-pname-support 2019-11-24 17:25:07 +00:00
John Ericson
9b090ccbca treewide: Get rid of most parseDrvName without breaking compat 
That is because this commit should be merged to both master and
release-19.09.
 2019-11-24 17:22:28 +00:00
Christian Kauhaus
f02d65c980
Merge pull request #73586 from c0bw3b/sec/jasper 
jasper: mark as vulnerable, replace with openjpeg where possible, disable JPEG2000 support.
 2019-11-24 13:15:02 +01:00
Frederik Rietdijk
10d0c68a9b Merge staging-next into staging 2019-11-20 10:02:21 +01:00
Frederik Rietdijk
65edeb8633 Merge master into staging-next 2019-11-20 10:01:49 +01:00
André-Patrick Bubel
3945c1d873 mediathekview: 13.2.1 -> 13.5.0 2019-11-20 08:14:10 +01:00
Frederik Rietdijk
5f8b0d7d99 Merge staging-next into staging 2019-11-19 14:53:29 +01:00
Frederik Rietdijk
f6b39f852e Merge master into staging-next 2019-11-19 10:53:44 +01:00
adisbladis
c9d8624ccd
treewide: Get rid of libGLU_combined 2019-11-18 20:10:43 +00:00
Peter Simons
c95664665d obs-studio: package the missing ndi library to make the obs-ndi plug-in actually work 2019-11-18 10:18:04 +01:00
c0bw3b
0a443f4c72 kodi: drop jasper dependency 
Unused since:
424c5138b6
 2019-11-17 19:36:29 +01:00
Daniel Schaefer
c6960f41c9 manim: init at 0.1.10 2019-11-16 13:35:23 +01:00
Jan Tojnar
da76deffd1
Merge branch 'master' into staging-next 2019-11-14 23:25:36 +01:00
worldofpeace
682930b790 celluloid: add worldofpeace to maintainers 2019-11-14 09:18:35 -08:00
worldofpeace
911bc93fe1 celluloid: 0.17 -> 0.18 
Also don't sed out gtk-update-icon-cache, we have
setup to remove these caches.
 2019-11-14 09:18:35 -08:00
Frederik Rietdijk
c6e31d0767 Merge master into staging-next 2019-11-14 13:31:39 +01:00
Mario Rodas
3510e233dc
mpv: disable samba support on darwin 2019-11-13 22:57:29 -05:00
Peter Simons
11e98079ba obs-studio: add build for obs-ndi plugin 
Note that the plugin won't do anything without the NDI library packaged, too.
I'll add that one ASAP.
 2019-11-13 14:19:17 +01:00
adisbladis
f6eb4b065b
kodi: Don't use libGLU_combined 2019-11-09 10:34:48 +00:00
Frederik Rietdijk
03a9822405 Merge master into staging-next 2019-11-05 14:17:37 +01:00
Franz Pletz
8dca8b9ccb
Merge remote-tracking branch 'origin/master' into gcc-9 2019-11-05 01:07:22 +01:00
Franz Pletz
3f7a17dee1
czmqpp, czmq3: remove, outdated 2019-11-04 19:17:55 +01:00
R. RyanTM
7153c484cd smplayer: 19.5.0 -> 19.10.0 
* smplayer: 19.5.0 -> 19.10.0 (#72660)
 2019-11-03 16:33:19 +01:00
Jan Malakhovski
4d680f3f3d mpv: enable openal support by default 
See the previous commit.
 2019-10-29 17:38:07 +01:00
Peter Simons
fadb0090e0 obs-linuxbrowser: update to latest 'master' version from Github 
The version number corresponds to "git describe --tags".
 2019-10-28 21:21:12 +01:00
Louis Tim Larsen
2896f00181
mythtv: 29.1 -> 30.0 (#71002) 2019-10-27 09:37:44 +01:00
Renaud
83da13bd25
Merge pull request #71895 from dtzWill/feature/catt 
catt: init at 0.10.2
 2019-10-25 21:15:15 +02:00
Tadeo Kondrak
b2256035a5
mpv: 0.29.1 -> 0.30.0 2019-10-25 09:54:46 -06:00
Wout Mertens
c98a006c7e
Merge pull request #71851 from acowley/handbrake-samplerate 
handbrake: fix missing audio
 2019-10-24 16:21:48 +02:00
R. RyanTM
a5c6103523 mkvtoolnix: 37.0.0 -> 38.0.0 (#71696) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mkvtoolnix/versions
 2019-10-24 15:00:34 +02:00
Will Dietz
2bfd58a9cd
catt: init at 0.10.2 2019-10-24 03:25:56 -05:00
Anthony Cowley
d51e366ffe handbrake: fix missing audio 
We build HandBrake with a newer ffmpeg than upstream expects,
triggering a problem where the audio samplerate defaults to zero
because HandBrake was not explicitly setting it.

This has been fixed in HandBrake upstream, but we must cherry pick
this change in order to produce videos with audio until HandBrake
1.3.0 is released.
 2019-10-23 15:33:08 -04:00
R. RyanTM
95126d7352 obs-studio: 24.0.1 -> 24.0.3 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/obs-studio/versions
 2019-10-23 15:55:06 +02:00
Thorsten Weber
15953b7728 kazam: fix 
- work around strictDeps issue wit python packages
- use pr 21 commit instead of debian patch to fix configparser issue
 2019-10-19 01:02:49 +02:00
Vladimír Čunát
b5697c6954
Merge branch 'master' into staging-next 
Hydra nixpkgs: ?compare=1548439
 2019-10-13 13:31:33 +02:00
Herwig Hochleitner
f452b45052 cinelerra: streamline build 2019-10-12 15:47:19 +02:00
Herwig Hochleitner
e5782ca77c cinelerra: 2016-01-12 -> 2018-05-16 
fixes SEGV on startup
 2019-10-12 15:47:19 +02:00
Herwig Hochleitner
817d23d7e0 cinelerra: use github source 
fixes build error due to discontinued repository
 2019-10-12 15:47:19 +02:00
Jan Tojnar
6c8aed6391
Merge branch 'master' into staging-next 2019-10-12 00:50:21 +02:00
Graham Christensen
21597ed69e
Merge pull request #70750 from grahamc/wlrobs 
obs-wlrobs: init at 20191008
 2019-10-08 14:26:56 -04:00
Graham Christensen
a763975ad1
obs-wlrobs: init at 20191008 2019-10-08 12:49:49 -04:00
Linus Heckemann
5aa4b19946 treewide: mark some broken packages as broken 
Refs:
e6754980264fe927320d5ff2dbd24ca4fac9a160
1e9cc5b9844ef603fe160e9f671178f96200774f
793a2fe1e8bb886ca2096c5904e1193dc3268b6d
c19cf65261639f749012454932a532aa7c681e4b
f6544d618f30fae0bc4798c4387a8c7c9c047a7c
 2019-10-08 17:14:26 +02:00
Jan Tojnar
b3fcd9375d
Merge branch 'master' into staging-next 2019-10-03 01:47:08 +02:00
Jon
5a2eaf5323
Merge pull request #69701 from r-ryantm/auto-update/obs-studio 
obs-studio: 23.2.1 -> 24.0.1
 2019-09-30 18:01:41 -07:00
Ryan Mulligan
fafaa18796
Merge pull request #69971 from r-ryantm/auto-update/streamlink 
streamlink: 1.1.1 -> 1.2.0
 2019-09-29 10:22:32 -07:00
Frederik Rietdijk
503081fa5b Merge staging into staging-next 2019-09-29 11:05:22 +02:00
R. RyanTM
7c751ccba1 streamlink: 1.1.1 -> 1.2.0 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/streamlink/versions
 2019-09-28 22:28:49 -07:00
Vladimír Čunát
fda4a08d4a
Merge branch 'staging-next' 
There are several security fixes - again, as it consists mainly of the
previously reverted staging-next merge.
 2019-09-28 07:43:04 +02:00
Maximilian Bosch
6fd3fea4db
minitube: 2.9 -> 3.2 
https://flavio.tordini.org/minitube-3-2
https://flavio.tordini.org/minitube-3-1
https://flavio.tordini.org/minitube-3-0
 2019-09-28 03:25:08 +02:00
R. RyanTM
15da9ce149 obs-studio: 23.2.1 -> 24.0.1 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/obs-studio/versions
 2019-09-27 14:23:24 -07:00
Vladimír Čunát
217cf982c7
Merge branch 'master' into staging-next 2019-09-27 22:13:02 +02:00
Aaron Andersen
1c12e864cd
Merge pull request #69394 from esclear/master 
vlc: Add libssh2 as dependency to support sftp inputs
 2019-09-27 05:29:30 -04:00
worldofpeace
1dc0dcf1ab
Merge pull request #69403 from worldofpeace/peek/update 
peek: 1.3.1 -> 1.4.0
 2019-09-26 14:53:33 -04:00
R. RyanTM
37fecd6ec4 clipgrab: 3.8.4 -> 3.8.5 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/clipgrab/versions
 2019-09-26 03:46:07 -07: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
Dmitry Kalinkin
c455adcc42
Merge branch 'master' into staging-next 
Fixes eval on darwin after #69072

Resolved conflict in pkgs/tools/security/thc-hydra/default.nix
Basically had to revert a1c0e10564 which
adapts #69210 to master that doesn't yet have
329a88efa7

Tested using maintainers/scripts/eval-release.sh before and after to see
that the fix works
 2019-09-25 19:21:46 -04:00
worldofpeace
c5df3a63e3 peek: add gifski support 
This is an optional feature for gif post-processing.
It produces much better quality gif.

Also added which to PATH with the wrapper, as it's
needed to check for these types of programs [0].

[0]: 8b48e8847a/src/utils.vala (L57)
 2019-09-25 03:07:07 -04:00
worldofpeace
f5867c346f peek: 1.3.1 -> 1.4.0 
* build with meson
* add gstreamer deps
  Needed for recording in GNOME shell
 2019-09-25 02:59:09 -04:00
Daniel Albert
1e26027802 vlc: Add libssh2 as dependency to support sftp inputs 2019-09-25 00:51:26 +02:00
Peter Simons
6e8db5d67f shotcut: improve VAAPI rendering auto-detection some more 
https://github.com/mltframework/shotcut/issues/771#issuecomment-533842055
 2019-09-24 11:29:04 +02:00
Vladimír Čunát
192fb9d11b
Merge branch 'staging-next' into staging 2019-09-24 08:15:01 +02:00
Vladimír Čunát
eab41878ac
Merge branch 'master' into staging-next 2019-09-24 08:14:34 +02:00
Jörg Thalheim
bfed455de3
Merge pull request #68946 from volth/escape 
treewide: fix string escapes
 2019-09-24 04:19:12 +01: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
Vladimír Čunát
22a216849b
Re-Revert "Merge branch 'staging-next'" 
This reverts commit f8a8fc6c7c.
 2019-09-22 09:38:09 +02:00
Vladimír Čunát
f8a8fc6c7c
Revert "Merge branch 'staging-next'" 
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
 2019-09-21 20:05:09 +02:00
Frederik Rietdijk
f81d43b94c Merge staging-next into staging 2019-09-19 17:00:07 +02:00
Frederik Rietdijk
0b12d44c06 Merge master into staging-next 2019-09-19 16:59:42 +02:00
Mario Rodas
6890d08b13
Merge pull request #69006 from marsam/fix-mkvtoolnix 
mkvtoolnix: fix build with clang
 2019-09-18 18:13:36 -05: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
Jan Tojnar
0902f08e0d
Merge branch 'staging-next' into staging 2019-09-18 22:40:42 +02:00
Jan Tojnar
105abdd52c
Merge branch 'master' into staging-next 2019-09-18 22:40:03 +02:00
Peter Simons
cde50a4fab shotcut: use vaapi_device /dev/dri/renderD128 instead of ":0" 
This fixes the auto-detection of VAAPI hardware encoders
provided by Intel chipsets. Be sure to define

  hardware.opengl.extraPackages = [pkgs.vaapiIntel];

in configuration.nix to make the necessary OpenGL drivers
available.
 2019-09-18 21:58:12 +02:00
Jan Tojnar
f5ef80b46d
Merge branch 'staging-next' into staging 2019-09-18 21:16:01 +02:00
Jan Tojnar
62791c3743
Merge branch 'master' into staging-next 2019-09-18 21:15:35 +02:00
Mario Rodas
fa64037b99
mkvtoolnix: fix build with clang 2019-09-17 22:41:28 -05:00
volth
8276314608 treewide: fix string escapes 2019-09-16 22:15:38 +00:00
Peter Simons
a41a49aa64 shotcut: fix bogus path to ffmpeg binary 2019-09-16 20:12:12 +02:00
Peter Simons
409ff06407
Merge pull request #67790 from ivan/mpv-ffmpeg-runpath 
mpv, ffmpeg: use addOpenGLRunpath to fix CUDA-accelerated playback
 2019-09-16 20:10:18 +02:00
Vladimír Čunát
fa4a3af5a7
Merge branch 'master' into staging-next 2019-09-16 19:24:52 +02:00
Peter Simons
b558ca80e4 shotcut: update version 19.08.16 to 19.09.14 
Changelog is at https://shotcut.org/blog/new-release-190914/.
 2019-09-16 17:05:22 +02:00
Vladimír Čunát
48af02a402
Merge #63643: handbrake: fix build on Darwin 2019-09-16 08:28:04 +02:00
Vladimír Čunát
aaf3881a80
handbrake: enableParallelBuilding = false 
It doesn't build too long anyway, so let's prefer reliability.
 2019-09-16 08:26:51 +02:00
Jan Tojnar
a441eaa7b1
Merge branch 'staging-next' into staging 2019-09-12 22:49:43 +02:00
Vincent Laporte
bf759337fa
Merge pull request #67544 from vbgl/qarte+fix-qt-platform 
qarte: use qt5’s mkDerivation and an other fix
 2019-09-12 15:31:17 +00:00
Izorkin
329a88efa7 treewide: replace mysql.connector-c to libmysqlclient 2019-09-09 15:55:34 +03:00
volth
7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Ivan Kozik
46cbb8453a mpv, ffmpeg: use addOpenGLRunpath to fix CUDA-accelerated playback 
This fixes #67780.

Currently, using `mpv --hwdec=nvdec --msg-level=vd=debug` on NVIDIA results in:

```
[vd] Opening decoder hevc
[vd] Looking at hwdec hevc-nvdec...
Cannot load libcuda.so.1
[vd] Could not create device.
[vd] No hardware decoding available for this codec.
```

With just mpv patched, ffmpeg cannot load libnvcuvid.so.1:

```
[vd] Opening decoder hevc
[vd] Looking at hwdec hevc-nvdec...
[vd] Trying hardware decoding via hevc-nvdec.
[vd] Selected codec: hevc (HEVC (High Efficiency Video Coding))
[vd] Pixel formats supported by decoder: vaapi_vld cuda yuv420p10le
[vd] Codec profile: Main 10 (0x2)
[vd] Requesting pixfmt 'cuda' from decoder.
[ffmpeg/video] hevc: Cannot load libnvcuvid.so.1
[ffmpeg/video] hevc: Failed loading nvcuvid.
[ffmpeg/video] hevc: Failed setup for format cuda: hwaccel initialisation returned error.
```

With both mpv and ffmpeg patched, it works:

```
[vd] Opening decoder hevc
[vd] Looking at hwdec hevc-nvdec...
[vd] Trying hardware decoding via hevc-nvdec.
[vd] Selected codec: hevc (HEVC (High Efficiency Video Coding))
[vd] Pixel formats supported by decoder: vaapi_vld cuda yuv420p10le
[vd] Codec profile: Main 10 (0x2)
[vd] Requesting pixfmt 'cuda' from decoder.
Using hardware decoding (nvdec).
[vd] Decoder format: 3840x2160 cuda[p010] bt.2020-ncl/bt.2020/pq/limited/auto SP=10.000000 CL=unknown (auto 0.000000/0.000000/0.000000)
```
 2019-09-06 23:18:26 +00:00
Frederik Rietdijk
66bc7fc1b3 Merge master into staging-next 2019-09-06 22:46:05 +02:00
Daniël de Kok
0910b661eb makemkv: 1.14.4 -> 1.14.5 
Changelog:

- Some small miscellaneous improvements
 2019-09-06 19:12:38 +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
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
Vladimír Čunát
7eb2a3b1cd
evtest, mplayer: fixup missing rec after the merge 2019-09-04 11:02:42 +02:00
Vladimír Čunát
4aad2947f8
Merge branch 'master' into staging-next 2019-09-04 11:00:56 +02:00
Will Dietz
6d1b2761d0
mkvtoolnix: 36.0.0 -> 37.0.0 
https://www.bunkus.org/blog/2019/08/mkvtoolnix-v37-0-0-released/
 2019-09-03 19:27:54 -05:00
Carles Pagès
7547a7a1d4 kodi: 19.3 -> 19.4 2019-09-04 00:40:07 +02:00
averelld
ec57a12e66 mplayer: 1.3.0 -> 1.4 (#67733) 2019-09-03 22:51:04 +02:00
Peter Simons
d7bbcdf274 openshot-qt: fix title generator 
@ferdnyc has kindly provided a patch for our Nix-specific permission
issue https://github.com/OpenShot/openshot-qt/issues/2972.

Fixes https://github.com/NixOS/nixpkgs/issues/32898.
Fixes https://github.com/NixOS/nixpkgs/issues/48591.
Related to https://github.com/NixOS/nixpkgs/issues/55683.
 2019-09-03 17:49:49 +02: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
luz.paz
aaad52ba7a olive-editor: 0.1.0 -> 0.1.1 
Commit updated according to #65399
 2019-08-30 21:18:37 -04:00
Vladyslav M
73bc17f04a
Merge pull request #67721 from averelld/pmp-upgrade 
plex-media-player: 2.36.0.988 -> 2.40.0.1007
 2019-08-30 09:44:41 +03:00
Averell Dalton
3162cc1320 plex-media-player: 2.36.0.988 -> 2.40.0.1007 2019-08-29 21:23:12 +02:00
Peter Simons
40cb97d944 simplescreenrecorder: fix Qt runtime error 
| qt.qpa.plugin: Could not find the Qt platform plugin "xcb" in ""
 |
 | This application failed to start because no Qt platform plugin could be
 | initialized. Reinstalling the application may fix this problem.
 2019-08-29 20:38:27 +02: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
Frederik Rietdijk
98640fd482 Merge master into staging-next 2019-08-27 16:36:47 +02:00
Vincent Laporte
ef15478313
qarte: use pyqt5_with_qtmultimedia 
Otherwise, qarte fails at run-time with:

>     from PyQt5.QtMultimedia import QMediaPlayer
> ModuleNotFoundError: No module named 'PyQt5.QtMultimedia'
 2019-08-27 06:00:08 +00:00
Vincent Laporte
e063d084de
qarte: use qt5’s mkDerivation 
See #65399
 2019-08-27 05:57:23 +00:00
volth
35d68ef143 treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00
Peter Hoeg
83fe813941
Merge pull request #64383 from peterhoeg/u/kodi 
kodi: 18.1 -> 18.3
 2019-08-26 14:41:12 +08: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