github-actions[bot]
cbcbfb4901
Merge master into staging-next
2021-11-22 06:01:10 +00:00
Thiago Kenji Okada
568014ae20
Merge pull request #146880 from samuelgrf/mpv-mainProgram
...
mpv: set meta.mainProgram
2021-11-21 21:24:23 -03:00
Jonathan Ringer
09e494f4c2
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/applications/window-managers/sway/default.nix
2021-11-21 14:40:40 -08:00
Christian Kögler
fdd35e7715
vdr-vaapidevice: Fix libva-x11
2021-11-21 21:13:49 +01:00
github-actions[bot]
18ad263272
Merge master into staging-next
2021-11-21 18:01:07 +00:00
Samuel Gräfenstein
4459b35304
mpv: set meta.mainProgram
2021-11-21 16:47:31 +01:00
Sandro
07f29d2db2
Merge pull request #146829 from r-burns/isx86
2021-11-21 14:20:12 +01:00
github-actions[bot]
c68c4b3db8
Merge master into staging-next
2021-11-21 12:01:20 +00:00
Ryan Burns
2175b157ac
treewide: refactor isi686 && isx86_64 -> isx86
2021-11-20 17:50:41 -08:00
Jonathan Rudenberg
717bac8a4d
makemkv: add libcurl to runtimeDependencies
...
This allows MakeMKV to download some files at runtime that are necessary
for reading certain discs.
2021-11-20 13:09:15 -05:00
Jonathan Ringer
fadaef5aed
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/applications/networking/browsers/chromium/common.nix
2021-11-19 14:31:57 -08:00
Sandro
e476113f29
Merge pull request #145509 from SuperSandro2000/mpv
2021-11-19 21:42:36 +01:00
github-actions[bot]
91e24d05d7
Merge master into staging-next
2021-11-18 18:01:14 +00:00
Thiago Kenji Okada
e570c93031
Merge pull request #146461 from DeeUnderscore/streamlink-3.0.1
...
streamlink: 2.4.0 -> 3.0.1
2021-11-18 11:50:37 -03:00
D Anzorge
74c99a1c82
streamlink: 2.4.0 -> 3.0.1
2021-11-18 14:45:23 +01:00
github-actions[bot]
c20c52d15c
Merge master into staging-next
2021-11-18 12:01:15 +00:00
flurie
12157af2ec
ccextractor: fix build on x86_64-darwin
2021-11-17 23:06:01 -05:00
github-actions[bot]
69a9c90876
Merge staging-next into staging
2021-11-16 00:02:03 +00:00
Kim Lindberger
855a211fd9
Merge pull request #145473 from talyz/qt512-big-sur-fix
...
qt512: Make apps work on macOS Big Sur
2021-11-15 19:46:52 +01:00
Aaron Andersen
e23a1d5f27
Merge pull request #146009 from aanderse/kodi.packages.libretro-mgba
...
kodi.packages.libretro-mgba: init at 0.9.2.31
2021-11-15 13:17:37 -05:00
github-actions[bot]
faf5da6aed
Merge staging-next into staging
2021-11-15 12:01:44 +00:00
Vladimír Čunát
64065d76f4
Merge #144730 : branch 'staging-next'
2021-11-15 11:52:15 +01:00
Aaron Andersen
962807bf9e
kodi.packages.libretro-mgba: init at 0.9.2.31
2021-11-14 14:42:16 -05:00
GRBurst
f84480678d
makemkv: 1.16.4 -> 1.16.5
...
Signed-off-by: GRBurst <GRBurst@protonmail.com>
2021-11-14 19:28:59 +01:00
Alyssa Ross
4e1852096f
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
...
Conflicts:
pkgs/development/tools/parsing/flex/2.6.1.nix
2021-11-14 14:17:46 +00:00
github-actions[bot]
bc35dc4f3b
Merge master into staging-next
2021-11-14 12:01:23 +00:00
Peter Simons
90af5cacfb
obs-studio: avoid double-wrapping the obs binary
...
Suggested in https://github.com/NixOS/nixpkgs/pull/145664#issuecomment-968107267 .
2021-11-14 10:14:39 +01:00
Peter Simons
566ef06cf5
obs-studio: use wrapGAppsHook to add required org.gtk.Settings.ColorChooser schema
...
Fixes https://github.com/NixOS/nixpkgs/issues/145661 .
2021-11-14 10:11:59 +01:00
github-actions[bot]
0ca0546665
Merge master into staging-next
2021-11-14 06:01:05 +00:00
Thiago Kenji Okada
05c229b325
Merge pull request #123489 from dotlambda/dvd-slideshow-ffmpeg
...
dvd-slideshow: use ffmpeg instead of ffmpeg_3
2021-11-13 21:44:12 -03:00
Thiago Kenji Okada
dd9763e44e
Merge pull request #142141 from wackbyte/vdr-vaapidevice-ffmpeg
...
vdrPlugins.vaapidevice: ffmpeg_3 -> ffmpeg
2021-11-13 21:42:18 -03:00
Alyssa Ross
26b89bcd16
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
2021-11-13 15:30:01 +00:00
sternenseemann
1a1e32f023
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts were caused by 2043dbb6fab2767b69dd
2021-11-13 12:35:55 +01:00
alyaeanyx
990cb2a6eb
freetube: 0.15.0 -> 0.15.1
2021-11-13 09:36:08 +01:00
Sandro Jäckel
867421210a
mpv: remove ? null from inputs, put meta last
2021-11-11 17:24:38 +01:00
talyz
39ce18a7ec
qt512: Make apps work on macOS Big Sur
...
Make Qt applications work on macOS Big Sur even if they're built with
an older version of the macOS SDK (<10.14 - we're currently using
10.12). This issue is fixed in 5.12.11, but it requires macOS SDK
10.13 to build. See https://bugreports.qt.io/browse/QTBUG-87014 for
more info.
2021-11-11 11:11:08 +01:00
Kerstin Humm
bb799694db
epoxy: rename to libepoxy
...
https://github.com/NixOS/nixpkgs/issues/145040
2021-11-11 05:55:32 +01:00
github-actions[bot]
6e4d2d1f10
Merge master into staging-next
2021-11-10 00:01:31 +00:00
Sandro
9a9ef88b8c
Merge pull request #145178 from SuperSandro2000/applications
...
Applications
2021-11-09 21:33:41 +01:00
Sandro Jäckel
692768dadb
subdl: fix attribute ordering, fix version
2021-11-09 20:10:32 +01:00
Sandro Jäckel
e814fd6786
omxplayer: switch to fetchFromGitHub, use postPatch
2021-11-09 20:10:32 +01:00
Sandro Jäckel
8eeb5acb07
cinelerra: minor formatting
2021-11-09 20:10:31 +01:00
github-actions[bot]
ce6af4cada
Merge master into staging-next
2021-11-09 12:01:19 +00:00
Aaron Andersen
cd465ef283
Merge pull request #144936 from aanderse/kodi.packages.iagl
...
kodi.packages.iagl: init at 1101521-2
2021-11-09 04:42:25 -05:00
github-actions[bot]
b92d47b0f5
Merge master into staging-next
2021-11-08 06:01:18 +00:00
Ryan Burns
772069c287
handbrake: mark broken on darwin < 10.13
2021-11-07 16:50:49 -08:00
github-actions[bot]
cb91ac99e0
Merge master into staging-next
2021-11-08 00:01:53 +00:00
Sandro
f2c9cf39e5
Merge pull request #145006 from Artturin/spdlogupd
2021-11-07 23:04:28 +01:00
John Ericson
4f81865aa1
Merge remote-tracking branch 'upstream/master' into staging-next
2021-11-07 20:51:04 +00:00
Artturin
b4fab0a98b
treewide: remove fmt from buildInputs where spdlog is used
...
spdlog_1 has fmt_8 in propagatedBuildInputs and having fmt which points
to fmt_7 in buildInputs makes the builds use wrong fmt
2021-11-07 22:05:08 +02:00
