Commit Graph

3294 Commits

Author SHA1 Message Date
Renaud
096234961d dvdstyler: unbreak and refactor
* needs wxGTK30 with GTK3 only to avoid crashing on startup
* needs GApps wrapping to avoid crashing under some menus
* libjpeg was missing in the dependencies
* move some deps to nativeBuildInputs because they are not used at runtime
2022-02-10 12:01:48 +01:00
c0bw3b
a6e9d993b9 xine-ui: fix build on aarch64 2022-02-10 12:01:48 +01:00
Jonathan Ringer
ac5b189b0c
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/top-level/aliases.nix
2022-02-07 11:15:10 -08:00
Zane van Iperen
5ab0b425f6 mplayer: 1.4 -> unstable-2022-02-03
Needed for FFmpeg 5.0 compatibility. Last release was in 2019.
2022-02-07 10:04:52 -08:00
R. Ryantm
2fb3a86e50 vdr: 2.6.0 -> 2.6.1 2022-02-07 02:58:09 +00:00
Jonathan Ringer
9ec5c4ceb5
obs-studio: pin ffmpeg to 4.x 2022-02-05 16:59:50 -08:00
github-actions[bot]
63e54d6343
Merge master into staging-next 2022-02-05 06:01:20 +00:00
R. Ryantm
4daa4bf535 ffmpeg-normalize: 1.22.4 -> 1.22.5 2022-02-04 18:04:50 -08:00
Jonathan Ringer
3662deaf29
vlc: pin ffmpeg to 4.x 2022-02-04 16:21:26 -08:00
Felix Bühler
efbc723c5e
Merge pull request #156337 from erictapen/sub-batch
sub-batch: 0.4.1 -> 1.0.0
2022-02-01 22:45:54 +01:00
Bobby Rong
1baecfcd94
Merge pull request #156512 from B4dM4n/plex-media-player-update
plex-media-player: new maintainer + minor fixes
2022-01-31 23:33:45 +08:00
Thomas Gerbet
51f76a1119 xplayer: fix the build 2022-01-28 15:55:42 +01:00
Sandro
c7655fa308
Merge pull request #155249 from aanderse/kodi.packages.controller-topology-project 2022-01-28 12:01:38 +01:00
Aaron Andersen
a18bad9ba3 kodi.packages.controller-topology-project: init at unstable-2022-01-22 2022-01-27 11:56:46 -05:00
Bobby Rong
cdc93e847d
Merge pull request #156886 from DeeUnderscore/update/streamlink-3.1.1
streamlink: 3.1.0 -> 3.1.1
2022-01-27 11:19:43 +08:00
D Anzorge
9cd3ed6e8c streamlink: 3.1.0 -> 3.1.1 2022-01-26 19:05:26 +01:00
ajs124
59539a3d3e libvlc: fix build 2022-01-26 18:12:00 +01:00
Bobby Rong
254151921e
Merge pull request #156688 from Obikawa/lbry-update
lbry: 0.50.2 -> 0.52.0
2022-01-26 22:20:40 +08:00
Anderson Torres
3a12b3a64a
Merge pull request #155725 from FliegendeWurst/live555-2022
live555: 2019.11.22 -> 2022.01.21
2022-01-26 08:07:24 -03:00
Pascal Bach
a1759abf42
Merge pull request #155974 from starcraft66/plex-mpv-shim
plex-mpv-shim: fix tray icon
2022-01-25 21:57:07 +01:00
github-actions[bot]
bf793f213d
Merge master into staging-next 2022-01-25 18:01:20 +00:00
Mark Sagi-Kazar
5b943ecb9f
ustreamer: 4.9 -> 4.11
Signed-off-by: Mark Sagi-Kazar <mark.sagikazar@gmail.com>
2022-01-25 18:52:02 +01:00
FliegendeWurst
ca07883f10 vlc: patch for recent live555 versions 2022-01-25 17:45:42 +01:00
Marek Paśnikowski
2b6305f97a
lbry: 0.50.2 -> 0.52.0
### Motivation for this change
Long time waiting for the update. Took the matter into own hands.

### Things done
Incremented the version number to the latest stable release.
Changed the sha512 value.

Opened the application and used it for a while.

PS: This is my very first contribution ever. I hope this fullfills the requirements.
2022-01-25 09:31:45 +01:00
Franz Pletz
056e2fd60c
srtrelay: unstable-2021-07-28 -> 1.1.0 2022-01-25 02:25:25 +01:00
github-actions[bot]
b261cac75a
Merge master into staging-next 2022-01-24 06:01:18 +00:00
Mario Rodas
d137e81ad8
Merge pull request #156297 from DeeUnderscore/update/streamlink-3.1.0
streamlink: 3.0.3 -> 3.1.0
2022-01-23 21:31:23 -05:00
Sandro
c7df47d7e5
Merge pull request #156117 from AndersonTorres/new-vlc 2022-01-24 01:09:05 +01:00
Sandro
983a352d8f
Merge pull request #143687 from Synthetica9/handbrake-installcheck 2022-01-24 01:06:37 +01:00
Fabian Möller
d771cfe971
plex-media-player: add meta.mainProgram 2022-01-23 23:15:25 +01:00
Fabian Möller
d0fe0e93cc
plex-media-player: fix crash under wayland 2022-01-23 23:14:06 +01:00
Fabian Möller
8529057cc6
plex-media-player: add myself as maintainer 2022-01-23 23:10:26 +01:00
Kerstin Humm
aa6ed9ec7d
sub-batch: 0.4.1 -> 1.0.0 2022-01-23 16:55:10 +01:00
Patrick Hilhorst
8b86f9816d
handbrake: convert nixos test to runCommand 2022-01-23 16:42:27 +01:00
AndersonTorres
fa74c63bdc vlc: optional Wayland support 2022-01-23 11:20:24 -03:00
D Anzorge
86cc0e8fc2 streamlink: 3.0.3 -> 3.1.0 2022-01-23 12:14:07 +01:00
github-actions[bot]
6922792376
Merge master into staging-next 2022-01-22 18:01:07 +00:00
Aaron Andersen
bfda60273b
Merge pull request #155300 from dschrempf/kodi-arteplussept-fix-deps
kodi.packages.arteplussept: fix dependencies
2022-01-22 10:42:57 -05:00
github-actions[bot]
1ca0ba653f
Merge master into staging-next 2022-01-22 00:01:46 +00:00
Aaron Andersen
7f7d950309
Merge pull request #156037 from r-ryantm/auto-update/kodiPackages.dateutil
kodiPackages.dateutil: 2.8.1+matrix.1 -> 2.8.2
2022-01-21 16:14:46 -05:00
Aaron Andersen
9e252730fd
Merge pull request #155246 from aanderse/kodi.packages.iagl
kodi.packages.iagl: 1101521-2 -> 3.0.5
2022-01-21 15:46:53 -05:00
Jan Tojnar
935459835e peek: fix compat with GNOME backend 2022-01-21 13:01:59 +01:00
R. Ryantm
34bff987ae kodiPackages.dateutil: 2.8.1+matrix.1 -> 2.8.2 2022-01-21 10:03:04 +00:00
github-actions[bot]
fc3ddb8979
Merge master into staging-next 2022-01-21 00:01:42 +00:00
Sandro
63525691f2
Merge pull request #147532 from arkivm/darwin-init-iina 2022-01-21 00:56:24 +01:00
Tristan Gosselin-Hane
a1c057209b plex-mpv-shim: fix tray icon 2022-01-20 14:00:00 -05:00
Vikram Narayanan
ddbcb09c23 iina: init at 1.2.0 2022-01-19 19:39:42 -08:00
Dominik Schrempf
695e255d03
kodi.packages.arteplussept: fix dependencies
See https://github.com/NixOS/nixpkgs/pull/154523#issuecomment-1014108470
2022-01-17 07:41:37 +01:00
github-actions[bot]
d1d6f982a8
Merge master into staging-next 2022-01-16 18:00:59 +00:00
Aaron Andersen
f6971d09d4 kodi.packages.iagl: 1101521-2 -> 3.0.5 2022-01-16 12:43:54 -05:00
Massimo Redaelli
4b775ed53f kodi.packages.trakt: init at 3.5.0 2022-01-16 17:22:01 +01:00
Massimo Redaelli
e58344d08e kodi.packages.trakt-py: init at 4.4.0 2022-01-16 17:22:00 +01:00
Massimo Redaelli
a1ed2b8400 kodi.packages.arrow: init at 1.0.3.1 2022-01-16 17:22:00 +01:00
Massimo Redaelli
6a7da24a48 kodi.packages.typing_extensions: init at 3.7.4.3 2022-01-16 17:22:00 +01:00
github-actions[bot]
f8fb795136
Merge master into staging-next 2022-01-16 00:01:52 +00:00
Renaud
86bea96a3a
Merge pull request #154326 from Anton-Latukha/2022-01-10-handbrake-1.5.0
handbrake: 1.4.2 -> 1.5.1
2022-01-15 23:43:33 +01:00
Dmitry Kalinkin
a56da82f7a
Merge branch 'master' into staging-next
Conflicts:
	pkgs/development/python-modules/restfly/default.nix
2022-01-13 21:39:05 -05:00
legendofmiracles
b4ac5539ea
Merge pull request #154859 from schnusch/mpv_sponsorblock 2022-01-13 14:42:41 -06:00
schnusch
03b8ba0070 mpvScripts.sponsorblock: update script: do not use shallow fetch
Shallow fetch should not be used because the script needs to look at past
commits too to pick the latest commit before today.
2022-01-13 10:11:45 +01:00
github-actions[bot]
aacf6c8fc6
Merge master into staging-next 2022-01-13 06:01:04 +00:00
legendofmiracles
38ec35cef2
Merge pull request #154563 from schnusch/mpv_sponsorblock 2022-01-12 20:54:49 -06:00
schnusch
7b5db5f50b mpvScripts.sponsorblock: unstable-2020-07-05 -> unstable-2021-12-23 2022-01-13 00:56:13 +01:00
schnusch
e8f170c469 mpvScripts.sponsorblock: add update script 2022-01-13 00:56:09 +01:00
github-actions[bot]
7def368b6f
Merge master into staging-next 2022-01-12 18:01:16 +00:00
legendofmiracles
54f8775d64 mpvScripts.sponsorblock: fix blatant ignorance of CONTRIBUTING.md 2022-01-12 15:19:54 +01:00
Aaron Andersen
eeb2b2e3a9
Merge pull request #154523 from dschrempf/kodi-arte
kodi.packages.arteplussept: init at 1.1.1
2022-01-12 08:20:47 -05:00
github-actions[bot]
e8dc263ca3
Merge staging-next into staging 2022-01-11 18:01:57 +00:00
Dominik Schrempf
4bae5a8dbf
kodi.packages.arteplussept: init at 1.1.1 2022-01-11 14:57:55 +01:00
Dominik Schrempf
be7888d726
kodi.packages.xbmcswift2: init at 19.0.7 2022-01-11 14:57:17 +01:00
Dominik Schrempf
b2fce43a61
kodi.packages.orftvthek: 0.12.3-1 -> 0.12.3+matrix.1 2022-01-11 14:01:11 +01:00
R. Ryantm
354ef7d909 go-chromecast: 0.2.10 -> 0.2.11 2022-01-11 11:16:09 +00:00
github-actions[bot]
bbe8f3965a
Merge staging-next into staging 2022-01-11 00:02:27 +00:00
Felix Bühler
e004d09841
Merge pull request #154146 from Stunkymonkey/subtitleeditor-enchant
subtitleeditor: use enchant2
2022-01-10 23:43:35 +01:00
Anton-Latukha
b6532ee3b4
handbrake: 1.4.2 -> 1.5.1 2022-01-10 23:44:23 +02:00
Jan Tojnar
f7aa55946b Merge branch 'staging-next' into staging
; Conflicts:
;	nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
;	nixos/doc/manual/release-notes/rl-2205.section.md
;	pkgs/build-support/libredirect/default.nix
2022-01-10 01:26:05 +01:00
Felix Buehler
45129c9dec subtitleeditor: use enchant2 2022-01-09 15:36:48 +01:00
Scott Worley
58fe065d8b kodi: Build with libudfread 2022-01-08 00:03:11 -08:00
github-actions[bot]
aed0ee64b8
Merge staging-next into staging 2022-01-07 06:02:04 +00:00
Ben Siraphob
9a58b51e6a
treewide: fix homepages with permanent redirect to https 2022-01-07 09:57:54 +07:00
github-actions[bot]
285dff553d
Merge staging-next into staging 2022-01-04 18:01:46 +00:00
Anderson Torres
57e660a35e
Merge pull request #153462 from SuperSamus/celluloid
celluloid: 0.21 -> 0.22
2022-01-04 12:00:19 -03:00
Sandro
0b4d5ebdad
Merge pull request #139795 from kmicklas/mpvacious-0.15 2022-01-04 13:07:04 +01:00
github-actions[bot]
37651b4915
Merge staging-next into staging 2022-01-04 12:02:08 +00:00
Sandro
761a16cb5f
Merge pull request #149039 from r-ryantm/auto-update/plex-mpv-shim 2022-01-04 13:00:36 +01:00
Martino Fontana
8bc63f2ff8 celluloid: 0.21 -> 0.22 2022-01-04 12:04:55 +01:00
github-actions[bot]
25662d01ae
Merge staging-next into staging 2022-01-04 00:02:40 +00:00
adisbladis
ddc858382c mpv: 0.34.0 -> 0.34.1 2022-01-03 22:53:56 +00:00
Aaron Andersen
b84d158866
Merge pull request #152675 from jfly/issue-145116-kodi-wrapper-web-interface
kodi: copy web assets instead of symlinking
2022-01-03 13:41:01 -05:00
Vladimír Čunát
78cd22c1b8
Merge #153325: vlc: quick fix issue with newer libcaca 2022-01-03 18:13:55 +01:00
Fabian Affolter
a9badb6715
Merge pull request #153323 from cawilliamson/update-maintainer-details
Update cawilliamson maintainer details (chrisaw -> cawilliamson)
2022-01-03 15:45:19 +01:00
Aaron Andersen
77816a8ff0
Merge pull request #153245 from aanderse/kodi.packages
kodi.packages.orftvthek: init at 0.12.3-1
2022-01-03 08:40:48 -05:00
AndersonTorres
d218e587d3 vlc: add myself as maintainer 2022-01-03 10:34:43 -03:00
AndersonTorres
2f1a2e2e57 vlc: refactor
Split long lines, one attribute per line, refactor the Aarch flag and other
minor things.

Also, remove the indiscriminated use of `with lib;`.
2022-01-03 10:34:43 -03:00
AndersonTorres
a08f1060e3 vlc: document patch 2022-01-03 10:26:51 -03:00
Christopher A. Williamson
9167342f79 Update cawilliamson maintainer details (chrisaw -> cawilliamson) 2022-01-03 13:03:10 +00:00
Bobby Rong
3a4575e081
Merge pull request #153177 from r-ryantm/auto-update/obs-nvfbc
obs-studio-plugins.obs-nvfbc: 0.0.4 -> 0.0.5
2022-01-03 18:00:02 +08:00
Aaron Andersen
393640ad66
Merge pull request #153250 from r-ryantm/auto-update/kodi-pvr-iptvsimple
kodiPackages.pvr-iptvsimple: 19.0.2 -> 19.0.3
2022-01-02 16:07:40 -05:00
R. Ryantm
9595114e39 kodiPackages.pvr-iptvsimple: 19.0.2 -> 19.0.3 2022-01-02 19:54:29 +00:00
Aaron Andersen
6bc440d834
Merge pull request #153243 from r-ryantm/auto-update/kodi-pvr-hts
kodiPackages.pvr-hts: 19.0.3 -> 19.0.4
2022-01-02 14:30:50 -05:00
Aaron Andersen
da82d35dcb kodi.packages.orftvthek : init at 0.12.3-1 2022-01-02 14:23:53 -05:00
Aaron Andersen
bca10d1f5a kodi.packages.simplejson: init at 3.17.0+matrix.2 2022-01-02 14:14:12 -05:00
Aaron Andersen
685dacce1d kodi.packages.future: init at 0.18.2+matrix.1 2022-01-02 14:10:59 -05:00
Aaron Andersen
76ecba0adb
Merge pull request #153185 from jfly/easier-kodi-addon-patching-plus-fix-bug-in-youtube-kodi-addon
Easier kodi addon patching + fix bug in youtube kodi addon
2022-01-02 12:07:54 -05:00
Aaron Andersen
06db90b74a
Merge pull request #153226 from r-ryantm/auto-update/kodi-pvr-hdhomerun
kodiPackages.pvr-hdhomerun: 19.0.1 -> 19.0.2
2022-01-02 11:50:39 -05:00
R. Ryantm
7e2ca934b2 kodiPackages.pvr-hts: 19.0.3 -> 19.0.4 2022-01-02 16:48:19 +00:00
R. Ryantm
0bff8db6bc kodiPackages.pvr-hdhomerun: 19.0.1 -> 19.0.2 2022-01-02 16:25:35 +00:00
R. RyanTM
5b2285802d
smtube: 21.7.0 -> 21.10.0
(#143430)
2022-01-02 16:40:22 +01:00
Michele Guerini Rocco
02182f2985
Merge pull request #153200 from r-ryantm/auto-update/mkvtoolnix
mkvtoolnix: 63.0.0 -> 64.0.0
2022-01-02 14:00:23 +01:00
Maximilian Bosch
c74db87a1a
Merge pull request #152979 from r-ryantm/auto-update/avidemux
avidemux: 2.7.8 -> 2.8.0
2022-01-02 13:51:43 +01:00
R. Ryantm
824edbe8ad mkvtoolnix: 63.0.0 -> 64.0.0 2022-01-02 11:56:08 +00:00
Jeremy Fleischman
58058239d4
kodi: workaround for addon path bug in youtube addon
I've submitted a PR upstream to address this:
https://github.com/anxdpanic/plugin.video.youtube/pull/260, this just
pulls the patch in sooner to get things unbroken for Nix users.
2022-01-02 02:16:42 -08:00
Jeremy Fleischman
a88c3bbfe1
kodi: allow using patch with kodi addons
I see no reason why we shouldn't just copy from `.` rather than `$src`.
One benefit of this is that the various patch phases update the context
of `.` rather than the immutable `$src`, which means they actually have
an effect on the build derivation now.
2022-01-02 02:16:31 -08:00
R. Ryantm
3e2c4ccff1 obs-studio-plugins.obs-nvfbc: 0.0.4 -> 0.0.5 2022-01-02 08:39:32 +00:00
Jan Tojnar
b39268ac53 kooha: fix pkg-config finding libadwaita
meson.build:17:0: ERROR: Invalid version of dependency, need 'libadwaita-1' ['>= 1.0.0-alpha.1'] found '1.0.0'.
2022-01-02 00:22:02 +01:00
R. Ryantm
abdb5580f7 vdr: 2.5.6 -> 2.6.0 2021-12-31 20:55:08 +00:00
R. Ryantm
d7f769392f avidemux: 2.7.8 -> 2.8.0 2021-12-31 17:29:51 +00:00
R. Ryantm
03f32c346f qmplay2: 21.12.07 -> 21.12.24 2021-12-30 22:22:55 -08:00
Aaron Andersen
b826950a06
Merge pull request #152827 from r-ryantm/auto-update/kodi-inputstream-rtmp
kodiPackages.inputstream-rtmp: 19.0.0 -> 19.0.1
2021-12-30 19:52:04 -05:00
R. Ryantm
54f2511eb5 kodiPackages.inputstream-rtmp: 19.0.0 -> 19.0.1 2021-12-30 23:23:06 +00:00
markuskowa
2325be2ee8
Merge pull request #151935 from r-ryantm/auto-update/xine-ui
xine-ui: 0.99.12 -> 0.99.13
2021-12-30 16:45:22 +01:00
Jeremy Fleischman
f99cd3fd08
kodi: copy web assets instead of symlinking
Kodi refuses to follow symlinks that lead outside of a small whitelist
of allowed directories. See
[`CFileUtils::CheckFileAccessAllowed`](4ac445c4a9/xbmc/utils/FileUtils.cpp (L252))
for the relevant code.

This feels like a pretty brittle workaround, but I can't think of a
better solution, so I'm going to say that this fixes
https://github.com/NixOS/nixpkgs/issues/145116.
2021-12-30 03:09:48 -08:00
Jörg Thalheim
829d6970a3
Merge pull request #152261 from Moredread/mediathekview-log4j-master
mediathekview: CVE-2021-45105 (log4j) mitigation
2021-12-28 07:16:13 +00:00
Aaron Andersen
3960078a20
Merge pull request #152175 from r-ryantm/auto-update/kodi-pvr-hdhomerun
kodiPackages.pvr-hdhomerun: 19.0.0 -> 19.0.1
2021-12-26 20:25:42 -05:00
Aaron Andersen
bd7587ea93
Merge pull request #152181 from r-ryantm/auto-update/kodi-inputstream-adaptive
kodiPackages.inputstream-adaptive: 19.0.0 -> 19.0.1
2021-12-26 20:25:14 -05:00
André-Patrick Bubel
2a360652e2
mediathekview: CVE-2021-45105 (log4j) mitigation
Remove the affected JndiLookup.class until we can update to the lastest
Mediathekview version.
2021-12-26 19:03:34 +01:00
Bobby Rong
bcb5b72442
Merge pull request #151962 from r-ryantm/auto-update/clapper
clapper: 0.4.0 -> 0.4.1
2021-12-26 13:21:35 +08:00
R. Ryantm
c86ac43842 kodiPackages.inputstream-adaptive: 19.0.0 -> 19.0.1 2021-12-26 04:19:13 +00:00
R. Ryantm
e2aa58ccec kodiPackages.pvr-hdhomerun: 19.0.0 -> 19.0.1 2021-12-26 02:45:58 +00:00
github-actions[bot]
af639a3c3c
Merge master into staging-next 2021-12-25 06:01:04 +00:00
Bobby Rong
e15eadcfd6
Merge pull request #150250 from r-ryantm/auto-update/clipgrab
clipgrab: 3.9.6 -> 3.9.7
2021-12-25 10:35:55 +08:00
R. Ryantm
9f177e19c4 clapper: 0.4.0 -> 0.4.1 2021-12-24 03:44:55 +00:00
R. Ryantm
ac01212050 xine-ui: 0.99.12 -> 0.99.13 2021-12-24 01:05:15 +00:00
Jonathan Ringer
5ed396a912
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
2021-12-23 10:14:19 -08:00
Johannes Schleifenbaum
8e6dd1424c jellyfin-mpv-shim: 2.0.1 -> 2.0.2 2021-12-23 09:05:34 -08:00
github-actions[bot]
0c6795fa5b
Merge master into staging-next 2021-12-23 00:01:33 +00:00
Vincent Laporte
e71626c849 qarte: 4.12.0 → 4.15.1 2021-12-22 21:29:46 +01:00
github-actions[bot]
03b5b0daac
Merge master into staging-next 2021-12-22 12:01:18 +00:00
Nikolay Amiantov
4379a88287 stremio: init at 4.4.142 2021-12-22 14:08:48 +03:00
Guillaume Girol
fad107ba43
bombono: fix build after boost upgrade (#151574)
context: https://github.com/NixOS/nixpkgs/issues/151469
2021-12-21 11:41:26 -05:00
Dmitry Kalinkin
ac40a963c9
Merge branch 'master' into staging-next
Conflicts:
	pkgs/applications/editors/vim/common.nix
	pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
	pkgs/development/python-modules/pymavlink/default.nix
2021-12-20 12:09:28 -05:00
Thiago Kenji Okada
beef0af495
Merge pull request #150864 from krav/krav/vlc-headphones
vlc: fix headphones mode; libspatialaudio: init at 0.3.0
2021-12-20 10:51:18 -03:00
Aaron Andersen
3063366c4d kodi.packages.netflix: 1.16.2 -> 1.18.2 2021-12-19 19:50:55 -05:00
Anderson Torres
87a43a4b22
Merge pull request #151277 from r-ryantm/auto-update/qmplay2
qmplay2: 21.06.07 -> 21.12.07
2021-12-19 12:26:17 -03:00
R. Ryantm
bcf0c28257 qmplay2: 21.06.07 -> 21.12.07 2021-12-19 07:03:20 +00:00
AndersonTorres
4ec32d1ba3 kodi: move kodi-packages/ to kodi/addons/ 2021-12-18 22:34:47 -03:00
Kris La
23c0ff1384 libspatialaudio: init at 0.3.0;vlc: fix headphones mode 2021-12-15 22:50:28 +07:00
Dmitry Kalinkin
c71b1bb92c
Merge branch 'master' into staging-next
Conflicts:
	pkgs/development/python-modules/jenkins-job-builder/default.nix
	pkgs/development/python-modules/snowflake-connector-python/default.nix
2021-12-11 13:59:09 -05:00
Ryan Mulligan
8448ea4010
Merge pull request #149754 from r-ryantm/auto-update/obs-websocket
obs-studio-plugins.obs-websocket: 4.9.0 -> 4.9.1
2021-12-11 10:41:47 -08:00
Dmitry Kalinkin
b6b59334bb
Merge branch 'master' into staging-next
Conflicts:
	pkgs/development/python-modules/celery/default.nix
	pkgs/development/python-modules/kombu/default.nix
2021-12-11 13:15:49 -05:00
Jörg Thalheim
8634334a15
Merge pull request #150247 from r-ryantm/auto-update/bino
bino3d: 1.6.7 -> 1.6.8
2021-12-11 15:32:56 +00:00