alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
291955 commits 217 branches 121 tags 4.5 GiB
Commit graph

2634 commits

Author SHA1 Message Date
github-actions[bot] 563389a7fd
Merge master into staging-next 2021-05-22 12:27:09 +00:00
Robert Schütz 89a3768f04
qstopmotion: use ffmpeg instead of ffmpeg_3 (#123477) 
FFmpeg isn't linked against, but the executable is used for rendering.
 2021-05-22 10:49:38 +02:00
Jonathan Ringer 6b15fdce86
Merge remote-tracking branch 'origin/master' into staging-next 
Conflicts:
 pkgs/shells/ion/default.nix
 pkgs/tools/misc/cicero-tui/default.nix
 2021-05-20 22:11:42 -07:00
Robert Schütz 0cd34b70ea manim: use ffmpeg instead of ffmpeg_3 2021-05-20 12:18:13 -07:00
github-actions[bot] 34a05e29f1
Merge master into staging-next 2021-05-20 18:36:00 +00:00
Maximilian Bosch 7b361f1525
Merge pull request #123475 from dotlambda/xscast-ffmpeg 
xscast: use ffmpeg instead of ffmpeg_3
 2021-05-20 19:03:35 +02:00
Jonathan Ringer 14f3686af1
Merge remote-tracking branch 'origin/master' into staging-next 
Conflicts:
  pkgs/applications/terminal-emulators/alacritty/default.nix
  pkgs/servers/clickhouse/default.nix
 2021-05-20 09:12:42 -07:00
Maximilian Bosch 633a60c281
Merge pull request #123465 from FliegendeWurst/devede-ffmpeg4 
devede: ffmpeg_3 -> ffmpeg
 2021-05-20 11:23:58 +02:00
github-actions[bot] 7000ae2b9a
Merge master into staging-next 2021-05-19 00:55:36 +00:00
R. RyanTM 48eba07cdd kodiPackages.pvr-iptvsimple: 7.6.4 -> 7.6.5 2021-05-18 21:29:49 +00:00
Jonathan Ringer ca46ad3762
Merge remote-tracking branch 'origin/master' into staging-next 
Conflicts:
  pkgs/tools/package-management/cargo-release/default.nix
 2021-05-18 11:03:38 -07:00
Jonathan Ringer f7a112f6c4
Merge remote-tracking branch 'origin/master' into staging-next 
Conflicts:
  pkgs/applications/graphics/emulsion/default.nix
  pkgs/development/tools/misc/texlab/default.nix
  pkgs/development/tools/rust/bindgen/default.nix
  pkgs/development/tools/rust/cargo-udeps/default.nix
  pkgs/misc/emulators/ruffle/default.nix
  pkgs/tools/misc/code-minimap/default.nix
 2021-05-18 08:57:16 -07:00
Anderson Torres de83b9baff
Merge pull request #122712 from AndersonTorres/adoption 
Adoption of some packages from worldofpeace
 2021-05-18 12:52:13 -03:00
AndersonTorres 9cb3114a54 celluloid: 0.20 -> 0.21 
Also, adopts from worldofpeace (in memoriam?).
 2021-05-18 11:12:32 -03:00
Sandro 5cec01f440
Merge pull request #123478 from dotlambda/avxsynth-drop 
avxsynth: drop
 2021-05-18 12:55:24 +02:00
Robert Schütz 92d58ebc31 avxsynth: drop 
It was marked as broken in April 2018
 2021-05-18 11:38:29 +02:00
Robert Schütz 2cb6c2156d xscast: use ffmpeg instead of ffmpeg_3 2021-05-18 11:16:41 +02:00
FliegendeWurst 9e4e445da6 devede: ffmpeg_3 -> ffmpeg 2021-05-18 09:47:42 +02:00
Sandro eb3fbc8163
Merge pull request #122751 from LeSuisse/clipgrab-use-ffmpeg4 
clipgrab: use ffmpeg4
 2021-05-18 02:32:57 +02:00
R. RyanTM 0f8ae03814 jftui: 0.5.0 -> 0.5.1 2021-05-17 13:34:50 -07:00
github-actions[bot] 3ff6965554
Merge master into staging-next 2021-05-17 06:22:23 +00:00
Martin Weinelt fd899bd080 kodi: update git tag 
Kodi dropped and renamed the tag for their latest release from v19.1 to
19.1-Matrix.

https://github.com/xbmc/xbmc/issues/19710
 2021-05-17 09:14:38 +08:00
github-actions[bot] 6cdac75d25
Merge staging-next into staging 2021-05-16 18:32:44 +00:00
github-actions[bot] 8c6d819143
Merge master into staging-next 2021-05-16 18:32:41 +00:00
markuskowa 0e5545a108
Merge pull request #123168 from ck3d/vdr-2.4.7 
vdr: 2.4.6 -> 2.4.7
 2021-05-16 20:01:19 +02:00
Anderson Torres cf45c45605
Merge pull request #121588 from eduardosm/sip-rename 
pythonPackages.sip: rename to sip_4, pythonPackages.sip_5: rename to sip
 2021-05-16 13:31:55 -03:00
Jan Tojnar 684991c696
Merge branch 'master' into staging-next 
- Thunderbird 68 has been dropped on master.
- gccCrossLibcStdenv has been factored out on staging-next in all-packages.nix, while the file has been re-formatted on master.
 2021-05-16 15:34:51 +02:00
Louis Tim Larsen 7a1fbc38a4 hdhomerun-config-gui: 20200907 -> 20210224 2021-05-16 12:16:31 +02:00
Christian Kögler 201e1a4fb8 vdr: Update license 2021-05-16 08:17:25 +02:00
Christian Kögler d5d750fa54 vdr: 2.4.6 -> 2.4.7 2021-05-16 00:07:50 +02:00
github-actions[bot] 49ec716c04
Merge staging-next into staging 2021-05-15 12:25:36 +00:00
Vladimír Čunát 13295e7f55
Merge #123068: mplayer: fix build failure with ffmpeg 4.4 2021-05-15 11:13:12 +02:00
Zane van Iperen 960cd68773
mplayer: fix build failure with ffmpeg 4.4 
Backport SVN revision 38199.
 2021-05-15 17:28:37 +10:00
github-actions[bot] 78ae7ac75e
Merge staging-next into staging 2021-05-15 06:22:25 +00:00
Aaron Andersen d9868214a3
Merge pull request #122672 from r-ryantm/auto-update/kodi-inputstream-ffmpegdirect 
kodiPackages.inputstream-ffmpegdirect: 1.21.2 -> 1.21.3
 2021-05-14 23:24:52 -04:00
Aaron Andersen 695e45f1df
Merge pull request #122673 from r-ryantm/auto-update/kodi-pvr-iptvsimple 
kodiPackages.pvr-iptvsimple: 7.6.2 -> 7.6.4
 2021-05-14 23:24:32 -04:00
Aaron Andersen 460f8def67
Merge pull request #122255 from aanderse/kodi 
kodi: 19.0 -> 19.1
 2021-05-14 23:21:08 -04:00
Thomas Gerbet 7e943b6a46 clipgrab: use ffmpeg4 
See migrate away from ffmpeg_3 #120705.
 2021-05-13 09:30:21 +02:00
Jan Tojnar 71fa678899
Merge branch 'staging-next' into staging 2021-05-12 14:31:36 +02:00
Alyssa Ross 427097c8c4 handbrake: don't manually enableParallelBuilding 
This is automatic for Meson builds.
 2021-05-12 11:57:35 +00:00
R. RyanTM 4f8e95ac59 kodiPackages.pvr-iptvsimple: 7.6.2 -> 7.6.4 2021-05-12 04:31:01 +00:00
R. RyanTM 425618115d kodiPackages.inputstream-ffmpegdirect: 1.21.2 -> 1.21.3 2021-05-12 04:18:12 +00:00
John Ericson cf02b24813 Merge remote-tracking branch 'upstream/staging-next' into staging 2021-05-11 22:30:46 +00:00
Maxine Aubrey 538c614396
gnomecast: switch from ffmpeg_3 to ffmpeg 2021-05-11 21:58:23 +02:00
Anderson Torres 5dad4f5f74
Merge pull request #122414 from fuzzypixelz/master 
aegisub: fix x86_64-linux build
 2021-05-11 10:30:25 -03:00
Jan Tojnar 7982550ac4
Merge branch 'staging-next' into staging 2021-05-11 09:09:10 +02:00
Eduardo Sánchez Muñoz 08a26e4579 pythonPackages.sip: rename to sip_4 
sip 4 is the old and unmaintained version
 2021-05-10 20:41:38 +02:00
fuzzypixelz 5f30bb2484 aegisub: fix x86_64-linux build 2021-05-10 13:56:42 +02:00
Jan Tojnar 594a885912
Merge branch 'staging-next' into staging 2021-05-10 09:45:47 +02:00
Thomas Gerbet 2fcba3a999 peek: use ffmpeg 4 
See migrate away from ffmpeg_3 #120705.
 2021-05-09 22:54:34 +02:00