mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 01:20:40 +00:00
Code Issues Wiki Activity
193910 commits 265 branches 124 tags 5.2 GiB
Commit graph

1730 commits

Author SHA1 Message Date
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 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
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 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
Peter Simons a41a49aa64 shotcut: fix bogus path to ffmpeg binary 2019-09-16 20:12:12 +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
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
Jan Tojnar 0c20b6a9df
Merge pull request #67256 from jtojnar/celluloid-0.17 
celluloid: 0.16 → 0.17
 2019-08-22 20:23:12 +02:00
Jan Tojnar 991c1ebeb1
celluloid: 0.16 → 0.17 
Renamed from gnome-mpv.

https://github.com/celluloid-player/celluloid/releases/tag/v0.17
 2019-08-22 19:47:07 +02:00
Marek Mahut e17822c853
Merge pull request #67143 from r-ryantm/auto-update/shotcut 
shotcut: 19.07.15 -> 19.08.16
 2019-08-21 22:36:25 +02:00
Vladimír Čunát a887feda74
vlc: 3.0.7.1 -> 3.0.8 (security) 
https://www.videolan.org/security/sb-vlc308.html
I've been using it briefly without any issues; the NEWS seem fairly safe:
https://www.videolan.org/developers/vlc-branch/NEWS
 2019-08-21 21:43:46 +02:00
R. RyanTM 91c187fb6c shotcut: 19.07.15 -> 19.08.16 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/shotcut/versions
 2019-08-20 17:40:07 -07:00
Robin Gloster 8c0786babe
Merge pull request #67103 from mayflower/globin-maintainership 
treewide: update globin's maintained drvs
 2019-08-20 17:57:47 +00:00
Marek Mahut c834dc9b2a
Merge pull request #66991 from r-ryantm/auto-update/mkvtoolnix 
mkvtoolnix: 35.0.0 -> 36.0.0
 2019-08-20 19:38:38 +02:00
Robin Gloster 4e60b0efae
treewide: update globin's maintained drvs 2019-08-20 19:36:05 +02:00
R. RyanTM 7fae3a2460 mkvtoolnix: 35.0.0 -> 36.0.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/mkvtoolnix/versions
 2019-08-19 16:00:59 -07:00