Commit graph

3348 commits

Author SHA1 Message Date
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
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
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
Ulrik Strid b652b434a4 davinci-resolve: unbreak 2022-04-02 17:56:11 +02:00
github-actions[bot] fd5d77aa66
Merge master into staging-next 2022-04-02 06:01:21 +00:00
davidak 36e9995603 davinci-resolve: init at 17.4.3
Co-authored-by: Thiago Franco de Moraes <totonixsame@gmail.com>
2022-04-02 01:24:01 +02:00
github-actions[bot] 9aa014c46a
Merge staging-next into staging 2022-03-31 12:02:10 +00:00
Martin Weinelt d0bfb3ccbb Merge remote-tracking branch 'origin/master' into staging-next 2022-03-31 03:49:37 +02:00
Bobby Rong a8dfd8fdac
entangle: fix build with meson 0.61 2022-03-30 18:18:23 +08:00
R. Ryantm e5bf0233a8 f1viewer: 2.6.0 -> 2.6.2 2022-03-29 17:59:06 +00:00
Jan Tojnar c8a5db3854 Merge branch 'staging-next' into staging
; Conflicts:
;	pkgs/tools/archivers/rar/default.nix
2022-03-28 17:56:38 +02:00
Jan Tojnar 997bb5e42c Merge branch 'master' into staging-next
; Conflicts:
;	pkgs/development/python-modules/dnspython/default.nix
;	pkgs/development/python-modules/googleapis-common-protos/default.nix
2022-03-28 17:55:31 +02:00
Sandro 2f1e03cb2b
Merge pull request #165691 from lucc/github-removed-unencrypted-git 2022-03-28 12:47:42 +02:00
Sandro 97f06b5e0b
byzan: switch to working source
Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
2022-03-28 12:23:11 +02:00
Sandro ebfdd4d145 Merge pull request #163384 from skykanin/ani-cli 2022-03-27 20:13:43 +02:00
github-actions[bot] 36198fe197
Merge staging-next into staging 2022-03-27 18:01:40 +00:00
Martin Weinelt d68657af92 Merge remote-tracking branch 'origin/master' into staging-next 2022-03-27 15:54:05 +02:00
skykanin dae89279bb
ani-cli: init at 1.9 2022-03-27 15:38:49 +02:00
Sandro 5c1f8cd19f
Merge pull request #163509 from NixOS/drop/ffmpeg_3 2022-03-27 12:52:12 +02:00
github-actions[bot] b2fc63a844
Merge staging-next into staging 2022-03-26 12:02:50 +00:00
Vladimír Čunát a42ca0678b
Merge branch 'master' into staging-next 2022-03-26 09:20:38 +01:00
Vladimír Čunát b9eab51eed
Merge #160343: GNOME: 41 -> 42 2022-03-26 09:16:07 +01:00
Anderson Torres 22588ab564
Merge pull request #165136 from r-ryantm/auto-update/qmplay2
qmplay2: 21.12.24 -> 22.03.19
2022-03-25 21:36:40 -03:00
Jan Tojnar 7d2ded8c0f gnome-desktop: Move into top-level 2022-03-25 15:01:21 +01:00
github-actions[bot] 8357b101a5
Merge staging-next into staging 2022-03-25 12:02:05 +00:00
Lucas Hoffmann 47190314df treewide: replace defunct git://github.com urls with https://
Github has removed support for git://github.com and recommends
https://github.com instead.

See https://github.blog/2021-09-01-improving-git-protocol-security-github/
2022-03-25 11:21:42 +01:00
Vladimír Čunát 0a8b4eddd2
Merge branch 'master' into staging-next 2022-03-25 10:16:56 +01:00
davidak 6ea8d5ee71
Merge pull request #165297 from Stunkymonkey/treewide-pname-version-17
treewide: rename name to pname&version
2022-03-24 16:38:33 +01:00
Doron Behar 4a02c56a7d
Merge pull request #164746 from ncfavier/makeWrapper-chdir 2022-03-24 13:51:27 +02:00
ajs124 8f390037eb ffmpeg_3: drop 2022-03-24 01:07:52 +01:00
Felix Buehler 3bc5196252 treewide: rename name to pname&version 2022-03-23 22:55:50 +01:00
Sandro 14ac231936
Merge pull request #165145 from OPNA2608/update/corrscope 2022-03-23 12:20:04 +01:00
OPNA2608 0880b7eae1 corrscope: 0.7.1 -> 0.8.0 2022-03-23 08:14:17 +01:00