3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1768 commits

Author SHA1 Message Date
Vladimír Čunát b5697c6954
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1548439
2019-10-13 13:31:33 +02:00
Herwig Hochleitner f452b45052 cinelerra: streamline build 2019-10-12 15:47:19 +02:00
Herwig Hochleitner e5782ca77c cinelerra: 2016-01-12 -> 2018-05-16
fixes SEGV on startup
2019-10-12 15:47:19 +02:00
Herwig Hochleitner 817d23d7e0 cinelerra: use github source
fixes build error due to discontinued repository
2019-10-12 15:47:19 +02:00
Jan Tojnar 6c8aed6391
Merge branch 'master' into staging-next 2019-10-12 00:50:21 +02:00
Graham Christensen 21597ed69e
Merge pull request #70750 from grahamc/wlrobs
obs-wlrobs: init at 20191008
2019-10-08 14:26:56 -04:00
Graham Christensen a763975ad1
obs-wlrobs: init at 20191008 2019-10-08 12:49:49 -04:00
Linus Heckemann 5aa4b19946 treewide: mark some broken packages as broken
Refs:
e675498026
1e9cc5b984
793a2fe1e8
c19cf65261
f6544d618f
2019-10-08 17:14:26 +02:00
Jan Tojnar b3fcd9375d
Merge branch 'master' into staging-next 2019-10-03 01:47:08 +02:00
Jon 5a2eaf5323
Merge pull request #69701 from r-ryantm/auto-update/obs-studio
obs-studio: 23.2.1 -> 24.0.1
2019-09-30 18:01:41 -07:00
Ryan Mulligan fafaa18796
Merge pull request #69971 from r-ryantm/auto-update/streamlink
streamlink: 1.1.1 -> 1.2.0
2019-09-29 10:22:32 -07:00
Frederik Rietdijk 503081fa5b Merge staging into staging-next 2019-09-29 11:05:22 +02:00
R. RyanTM 7c751ccba1 streamlink: 1.1.1 -> 1.2.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/streamlink/versions
2019-09-28 22:28:49 -07:00
Vladimír Čunát fda4a08d4a
Merge branch 'staging-next'
There are several security fixes - again, as it consists mainly of the
previously reverted staging-next merge.
2019-09-28 07:43:04 +02:00
Maximilian Bosch 6fd3fea4db
minitube: 2.9 -> 3.2
https://flavio.tordini.org/minitube-3-2
https://flavio.tordini.org/minitube-3-1
https://flavio.tordini.org/minitube-3-0
2019-09-28 03:25:08 +02:00
R. RyanTM 15da9ce149 obs-studio: 23.2.1 -> 24.0.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/obs-studio/versions
2019-09-27 14:23:24 -07:00
Vladimír Čunát 217cf982c7
Merge branch 'master' into staging-next 2019-09-27 22:13:02 +02:00
Aaron Andersen 1c12e864cd
Merge pull request #69394 from esclear/master
vlc: Add libssh2 as dependency to support sftp inputs
2019-09-27 05:29:30 -04:00
worldofpeace 1dc0dcf1ab
Merge pull request #69403 from worldofpeace/peek/update
peek: 1.3.1 -> 1.4.0
2019-09-26 14:53:33 -04:00
R. RyanTM 37fecd6ec4 clipgrab: 3.8.4 -> 3.8.5
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/clipgrab/versions
2019-09-26 03:46:07 -07:00
Dmitry Kalinkin b3472597b7
Merge branch 'staging-next' into staging
Fixes eval on darwin after #69072

Tested using maintainers/scripts/eval-release.sh before and after to see
that the fix works
2019-09-25 19:31:32 -04:00
Dmitry Kalinkin c455adcc42
Merge branch 'master' into staging-next
Fixes eval on darwin after #69072

Resolved conflict in pkgs/tools/security/thc-hydra/default.nix
Basically had to revert a1c0e10564 which
adapts #69210 to master that doesn't yet have
329a88efa7

Tested using maintainers/scripts/eval-release.sh before and after to see
that the fix works
2019-09-25 19:21:46 -04:00
worldofpeace c5df3a63e3 peek: add gifski support
This is an optional feature for gif post-processing.
It produces much better quality gif.

Also added which to PATH with the wrapper, as it's
needed to check for these types of programs [0].

[0]: 8b48e8847a/src/utils.vala (L57)
2019-09-25 03:07:07 -04:00
worldofpeace f5867c346f peek: 1.3.1 -> 1.4.0
* build with meson
* add gstreamer deps
  Needed for recording in GNOME shell
2019-09-25 02:59:09 -04:00
Daniel Albert 1e26027802 vlc: Add libssh2 as dependency to support sftp inputs 2019-09-25 00:51:26 +02:00
Peter Simons 6e8db5d67f shotcut: improve VAAPI rendering auto-detection some more
https://github.com/mltframework/shotcut/issues/771#issuecomment-533842055
2019-09-24 11:29:04 +02:00
Vladimír Čunát 192fb9d11b
Merge branch 'staging-next' into staging 2019-09-24 08:15:01 +02:00
Vladimír Čunát eab41878ac
Merge branch 'master' into staging-next 2019-09-24 08:14:34 +02:00
Jörg Thalheim bfed455de3
Merge pull request #68946 from volth/escape
treewide: fix string escapes
2019-09-24 04:19:12 +01:00
Jan Tojnar f80e55fc2e
gtk3.setupHook: clear icon-theme.cache in preFixup (#68552)
gtk3.setupHook: clear icon-theme.cache in preFixup
2019-09-22 16:30:42 +02:00
Vladimír Čunát 22a216849b
Re-Revert "Merge branch 'staging-next'"
This reverts commit f8a8fc6c7c.
2019-09-22 09:38:09 +02:00
Vladimír Čunát f8a8fc6c7c
Revert "Merge branch 'staging-next'"
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
2019-09-21 20:05:09 +02:00
Frederik Rietdijk f81d43b94c Merge staging-next into staging 2019-09-19 17:00:07 +02:00
Frederik Rietdijk 0b12d44c06 Merge master into staging-next 2019-09-19 16:59:42 +02:00
Mario Rodas 6890d08b13
Merge pull request #69006 from marsam/fix-mkvtoolnix
mkvtoolnix: fix build with clang
2019-09-18 18:13:36 -05:00
worldofpeace b0c2aea20b
treewide: drop adding hicolor-icon-theme where possible
This was either for the setup-hook to remove caches or added
even though the respective icon theme propagated it.
2019-09-18 22:47:26 +02:00
Jan Tojnar 0902f08e0d
Merge branch 'staging-next' into staging 2019-09-18 22:40:42 +02:00
Jan Tojnar 105abdd52c
Merge branch 'master' into staging-next 2019-09-18 22:40:03 +02:00
Peter Simons cde50a4fab shotcut: use vaapi_device /dev/dri/renderD128 instead of ":0"
This fixes the auto-detection of VAAPI hardware encoders
provided by Intel chipsets. Be sure to define

  hardware.opengl.extraPackages = [pkgs.vaapiIntel];

in configuration.nix to make the necessary OpenGL drivers
available.
2019-09-18 21:58:12 +02:00
Jan Tojnar f5ef80b46d
Merge branch 'staging-next' into staging 2019-09-18 21:16:01 +02:00
Jan Tojnar 62791c3743
Merge branch 'master' into staging-next 2019-09-18 21:15:35 +02:00
Mario Rodas fa64037b99
mkvtoolnix: fix build with clang 2019-09-17 22:41:28 -05:00
volth 8276314608 treewide: fix string escapes 2019-09-16 22:15:38 +00:00
Peter Simons a41a49aa64 shotcut: fix bogus path to ffmpeg binary 2019-09-16 20:12:12 +02:00
Peter Simons 409ff06407
Merge pull request #67790 from ivan/mpv-ffmpeg-runpath
mpv, ffmpeg: use addOpenGLRunpath to fix CUDA-accelerated playback
2019-09-16 20:10:18 +02:00
Vladimír Čunát fa4a3af5a7
Merge branch 'master' into staging-next 2019-09-16 19:24:52 +02:00
Peter Simons b558ca80e4 shotcut: update version 19.08.16 to 19.09.14
Changelog is at https://shotcut.org/blog/new-release-190914/.
2019-09-16 17:05:22 +02:00
Vladimír Čunát 48af02a402
Merge #63643: handbrake: fix build on Darwin 2019-09-16 08:28:04 +02:00
Vladimír Čunát aaf3881a80
handbrake: enableParallelBuilding = false
It doesn't build too long anyway, so let's prefer reliability.
2019-09-16 08:26:51 +02:00
Jan Tojnar a441eaa7b1
Merge branch 'staging-next' into staging 2019-09-12 22:49:43 +02:00