Commit Graph

3378 Commits

Author SHA1 Message Date
Sandro
70c293cf81
Merge pull request #169931 from ck3d/vdr-fritz-1.5.4
vdrPlugins.fritzbox: 1.5.3 -> 1.5.4
2022-05-03 09:38:04 +02:00
Vladimír Čunát
9478ec747c
Merge branch 'staging-next-2022-04-23'
Close #169965: the PR and real 'staging-next' branch contained
extra systemd rebuild that I wanted to avoid in this iteration.
(to save Hydra's work)
2022-05-02 09:12:51 +02:00
rnhmjoj
8379a22914
mkvtoolnix: 66.0.0 -> 67.0.0 2022-05-01 17:09:25 +02:00
Vladimír Čunát
c480cc2895
Merge branch 'master' into staging-next-2022-04-23 2022-04-30 23:02:28 +02:00
Vojtěch Káně
e0053a7a8a lightworks: 2021.2.1 -> 2022.1.1 2022-04-29 10:30:15 -05:00
Alias Gram
b263bfb91c hyperion-ng: init at 2.0.12 2022-04-29 09:22:21 -05:00
Vladimír Čunát
51554cbbdb
Merge branch 'master' into staging-next-2022-04-23 2022-04-27 22:50:17 +02:00
Artturi
53491f56b6
Merge pull request #170622 from Artturin/davincipyt 2022-04-27 16:36:57 +03:00
Artturin
47194d8ddb davinci-resolve: dont use a alias 2022-04-27 16:31:15 +03:00
github-actions[bot]
4490401513
Merge master into staging-next 2022-04-26 18:01:11 +00:00
José Romildo Malaquias
9b26f76dee
Merge pull request #169999 from kira-bruneau/treewide-git-updater
treewide: fix updateScripts for all packages using gitUpdater
2022-04-26 09:18:53 -03:00
github-actions[bot]
1fe6b64349
Merge master into staging-next 2022-04-25 18:01:12 +00:00
Ivv
0e68459cfe
Merge pull request #169882 from AtilaSaraiva/obsvkcapture
obs-vkcapture: init at 1.1.3
2022-04-25 17:40:21 +02:00
github-actions[bot]
073cad8fd6
Merge master into staging-next 2022-04-25 12:04:02 +00:00
Louis Tim Larsen
8540876319 hdhomerun-config-gui: fix install bin path
Also make sure to run pre and post install hooks.
2022-04-25 09:56:40 +02:00
github-actions[bot]
93ca6b8345
Merge master into staging-next 2022-04-24 06:01:05 +00:00
Aaron Andersen
0f1f92d85b
Merge pull request #163966 from jfly/more-robust-kodi-webserver-symlink-fix
kodi: More robust handling of kodi webserver assets
2022-04-23 20:41:38 -04:00
Kira Bruneau
122b290dbe epgstation: use gitUpdater 2022-04-23 15:30:56 -04:00
Kira Bruneau
be590c34c6 mirakurun: use gitUpdater 2022-04-23 15:30:56 -04:00
Vladimír Čunát
82ec893b68
Merge branch 'staging' into staging-next 2022-04-23 18:10:57 +02:00
Christian Kögler
49140c798b vdrPlugins.fritzbox: 1.5.3 -> 1.5.4 2022-04-23 13:25:21 +02:00
Michael Raskin
2c6765c613 webcamoid: 8.8.0 -> 9.0.0 2022-04-23 11:47:11 +02:00
Artturi
62866bc352
Merge pull request #169449 from Artturin/movetesting1
testers.testVersion: move from trivial-builders.nix
2022-04-23 06:06:16 +03:00
Átila Saraiva
aa534e3869 obs-vkcapture: init at 1.1.3 2022-04-22 21:55:01 -03:00
github-actions[bot]
90d2d8da85
Merge staging-next into staging 2022-04-23 00:02:52 +00:00
Artturi
785373a76f
Merge pull request #166605 from siraben/remove-redundant-stdenv 2022-04-22 20:25:38 +03:00
Artturin
f1c7f19e49 treewide: testVersion -> testers.testVersion 2022-04-22 16:24:27 +03:00
R. Ryantm
b124b40ce7 ani-cli: 2.0 -> 2.1 2022-04-22 05:06:45 +00:00
Lassulus
8ef828fc72
Merge pull request #161599 from rileyinman/mpv-scripts
mpv-scripts: init autocrop, autodeint
2022-04-19 12:36:37 +01:00
Maximilian Bosch
a51983e805
Merge pull request #167824 from ymatsiuk/ymatsiuk/obs
obs-studio: 27.2.2 -> 27.2.4
2022-04-18 17:54:37 +02:00
R. Ryantm
355b60dd6c ffmpeg-normalize: 1.22.8 -> 1.22.9 2022-04-18 02:39:28 +00:00
Ben Siraphob
259fa13d53 treewide: remove nativeBuildInputs that are in stdenv 2022-04-16 21:46:46 +03:00
Vladimír Čunát
d5d94127fd
Merge branch 'staging-next' into staging
Minor conflicts; I hope I didn't mess up:
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/games/openjk/default.nix
2022-04-14 09:53:21 +02:00
Yannis Koutras
db6fa81457
Merge pull request #163241 from r-ryantm/auto-update/celluloid
celluloid: 0.22 -> 0.23
2022-04-13 22:28:37 +02:00
R. Ryantm
c5b017c5d4 f1viewer: 2.6.2 -> 2.7.0 2022-04-10 19:54:19 +00:00
github-actions[bot]
e15ff925b0
Merge staging-next into staging 2022-04-09 00:02:40 +00:00
Lassulus
59ea4bffb5
Merge pull request #162616 from r-ryantm/auto-update/obs-studio
obs-studio: 27.2.1 -> 27.2.2
2022-04-08 19:51:04 +01:00
Yurii Matsiuk
26caa23ad3
obs-studio: 27.2.1 -> 27.2.4 2022-04-08 07:46:04 +02:00
Jeremy Fleischman
cb720edb7d
kodi: More robust handling of kodi webserver assets
This adds a backport of
a6dedce7ba
to Kodi 19.4 Matrix. This can be removed once a new release of Kodi comes
out and we upgrade to it.

What's nice about this approach is that it doesn't special case
webinterface.default. I've never actually tried using a non-default web
interface with Kodi, but I bet it wouldn't have worked before this
change, and I think it would work after this change =)

See and
https://github.com/NixOS/nixpkgs/pull/152675#issuecomment-1003442175 and
https://forum.kodi.tv/showthread.php?tid=366338&pid=3079493 for some
discussion about this approach.
2022-04-07 21:52:16 -07:00
Martin Weinelt
cc774b5792 Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-07 12:12:57 +02:00
Herwig Hochleitner
0cfc54bb46 webtorrent_desktop: run in fhsenv
this fixes current breakage, and should be a more durable solution for
running the binary distribution
2022-04-06 22:21:22 +02:00
github-actions[bot]
a5b67b42a4
Merge staging-next into staging 2022-04-06 06:01:49 +00:00
Bobby Rong
c506247c32
Merge pull request #167276 from bobby285271/pitivi
pitivi: fix build with meson 0.61
2022-04-06 10:23:53 +08:00
github-actions[bot]
3dc8bd98b9
Merge staging-next into staging 2022-04-06 00:02:41 +00:00
Vladimír Čunát
b4729bad3d
Merge #165406: staging-next 2022-03-23 2022-04-05 20:34:08 +02:00
Bobby Rong
7f00e7a8f1
pitivi: fix build with meson 0.61 2022-04-05 12:51:04 +08:00
R. Ryantm
0ea92676fd ani-cli: 1.9 -> 2.0 2022-04-04 05:06:29 +00:00
github-actions[bot]
ffa96ab0c0
Merge staging-next into staging 2022-04-02 18:01:37 +00:00
github-actions[bot]
fc17fe6417
Merge master into staging-next 2022-04-02 18:01:07 +00:00
Alyssa Ross
8ba23e138d
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/libraries/zlib/default.nix
	pkgs/development/lua-modules/overrides.nix
2022-04-02 16:45:48 +00:00