1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 21:50:55 +00:00
Commit graph

1007 commits

Author SHA1 Message Date
Vladimír Čunát 39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
joachifm 53ff168dbd Merge pull request #14615 from layus/vlc-fix
vlc: fix the two windows issue with qt5
2016-04-13 01:59:44 +02:00
Guillaume Maudoux 43cf5d3369 vlc: fixes the two windows issue with qt5
Fixes #14610.
2016-04-12 15:55:44 +02:00
Franz Pletz 2af7b09e06 mpv: 0.16.0 -> 0.17.0 2016-04-12 15:51:32 +02:00
Vladimír Čunát 30f14243c3 Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Robin Gloster 3e68106afd Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-07 21:52:26 +00:00
Eelco Dolstra 9c2a49e76a mpv: 0.15.0 -> 0.16.0 2016-04-05 23:27:27 +02:00
Robin Gloster 696d85a62d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-03 11:01:57 +00:00
Edward Tjörnhammar b8755a4cdf
kodiPlugins.svtplay: 4.0.23 -> 4.0.24 2016-04-03 12:08:53 +02:00
Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Andrew Kelley 09fe0e3c81 qgifer: init at 0.2.1 2016-03-30 04:54:13 -07:00
Robin Gloster a4e65c3639 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-30 09:01:20 +00:00
Nikolay Amiantov 54eb061a12 avidemux: don't depend on unfree FAAC by default 2016-03-29 16:16:36 +03:00
Nikolay Amiantov a6e0046b75 Merge pull request #14218 from abbradar/avidemux
avidemux: 2.5.6 -> 2.6.12
2016-03-29 04:48:51 +04:00
Robin Gloster f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
Vladimír Čunát ed47bb1ca8 qt55.vlc: fix build
I tested it on a video to make sure the bug doesn't appear.
2016-03-28 14:37:25 +02:00
Eike Kettner a366aab377 makemkv 1.9.7 -> 1.9.9 2016-03-26 16:57:34 +01:00
Nikolay Amiantov 8b0076b887 avidemux: 2.5.6 -> 2.6.12 2016-03-26 17:36:41 +03:00
Brad Ediger cdca9d64b4 dvdbackup: init at 0.4.2 2016-03-24 23:16:14 -05:00
Simon Vandel Sillesen 76ce988c50 kodiPlusings.pvr-hts: fix loading of plugin
The plugin was looking for pvr.hts.so.2.2.13, so as only pvr.hts.so was copied, the plugin would not load. This symlinks all variants of the name to the addons folder.
2016-03-20 17:03:12 +01:00
Edward Tjörnhammar dcf8c1573b
kodiPlugins.svtplay: 4.0.21 -> 4.0.23 2016-03-19 22:55:41 +01:00
Edward Tjörnhammar cf40f1f8c6
kodiPlugins.steam-launcher: 3.1.1 -> 3.1.4 2016-03-19 22:55:20 +01:00
Edward Tjörnhammar 4422731542
kodiPlugins.salts: 2.0.6 -> 2.0.19 2016-03-19 22:55:07 +01:00
Edward Tjörnhammar c871c625c0
kodiPlugins.hyper-launcher.{plugin,service}: init at 1.2.0 2016-03-19 22:54:52 +01:00
Edward Tjörnhammar 7d0b492731
kodiPlugins.pdfreader: init at 1.0.2 2016-03-19 22:54:37 +01:00
Edward Tjörnhammar 0f3618da1e
kodiPlugins: sort collection alphabetically 2016-03-19 22:54:18 +01:00
joachifm 8f0cd81708 Merge pull request #14014 from romildo/update.subtitleeditor
subtitleeditor: 0.41.0 -> 0.52.1
2016-03-18 15:00:14 +00:00
José Romildo Malaquias 9929ddd1a9 subtitleeditor: 0.41.0 -> 0.52.1 2016-03-18 09:29:10 -03:00
rnhmjoj fa683ab455 popcorntime: 0.3.8-3 -> 0.3.9 2016-03-16 21:54:00 +01:00
Robin Gloster 3f45f0948d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-15 01:44:24 +00:00
Nikolay Amiantov 363f024864 Merge pull request #13861 from abbradar/mjpg-streamer
mjpg-streamer: update and add NixOS service
2016-03-14 15:19:03 +03:00
宋文武 93feb5d115 drop my maintainership (close #13881) 2016-03-13 18:39:01 +01:00
rnhmjoj 615ea1e90c mkvtoolnix: fix failing build 2016-03-13 01:10:03 +01:00
Nikolay Amiantov 84e8fece41 mjpg-streamer: 182 -> 2016-03-08 2016-03-12 18:52:58 +03:00
Vladimír Čunát 09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Franz Pletz e9fc4e7db6 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-03-07 22:08:27 +01:00
rnhmjoj aaa443516f mkvtoolnix: 8.4.0 -> 8.9.0 2016-03-07 19:41:28 +01:00
Franz Pletz aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
Robin Gloster fed49425c5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-03 16:11:55 +00:00
Théophane Hufschmitt 0bcf42aed3 mpv: added optional wayland support 2016-03-03 11:38:52 +01:00
Robin Gloster d47857c3d9 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-01 21:09:17 +00:00
Carles Pagès 7eb15265d3 kodiPlugins.pvr-hts: 2.1.18 -> 2.2.13 2016-03-01 13:56:27 +01:00
Edward Tjörnhammar 9af50a2e7d kodi: add optional joystick support 2016-02-29 19:00:46 +01:00
Robin Gloster 3b4765c9e5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-28 16:32:57 +00:00
zimbatm 69ce5cb656 use the sourceforge mirrors everywhere
find pkgs -name "*.nix" -exec sed -r \
    "s|https?://downloads.sourceforge.net/|mirror://sourceforge/|g" -i {} \;
2016-02-28 12:07:42 +00:00
Robin Gloster 3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
Frederik Rietdijk 40ca841c5c Merge pull request #13124 from FRidh/buildPythonApplication
buildPythonApplication: use new function for Python applications
2016-02-23 16:02:10 +01:00
Robin Gloster bb2639aafc Merge branch 'curl-7.15-fixup' of https://github.com/zimbatm/nixpkgs into hardened-stdenv 2016-02-22 01:14:22 +00:00
Edward Tjörnhammar bc1e1c5698 kodiPlugins.salts: 1.0.98 -> 2.0.6 2016-02-21 16:15:54 +01:00
Edward Tjörnhammar 4575d58b3d kodiPlugins.genesis: 5.1.3 -> 5.1.4 2016-02-21 16:15:13 +01:00
Edward Tjörnhammar ad4bfe4dda kodi: 15.2 -> 16.0 2016-02-21 15:32:12 +01:00
Pascal Wittmann ab742b42ab vlc: 2.2.1 -> 2.2.2 and take maintainership 2016-02-21 08:03:16 +01:00
Robin Gloster 4036e9ba8c Merge branch 'up' into hardened-stdenv 2016-02-20 22:27:33 +00:00
Cole Mickens e1a3b4128f mpv: 0.14.0 -> 0.15.0 2016-02-20 03:46:37 -08:00
Frederik Rietdijk 4d06bf70f4 buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
Vladimír Čunát d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Robin Gloster a462683d10 aegisub: turn off bindnow/relro hardening 2016-02-09 14:32:47 +00:00
Vladimír Čunát 1e04d875db videolan.org sources: prefer http://get.videolan.org
Some of the original URLs were broken now.
It seems that set of mirrors is preferred and faster than the others.
In the x264 case the source isn't there so http://download.videolan.org
is used instead.
2016-02-07 13:21:18 +01:00
William Casarin c77f1f6cc9 obs-studio: 0.12.1 -> 0.13.1 2016-02-05 20:29:33 -08:00
Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Vincent Laporte 4f8f5732fc smtube: 15.11.0 -> 16.1.0 2016-01-29 10:08:29 +01:00
Vincent Laporte ef8f074604 smplayer: 15.11.0 -> 16.1.0 2016-01-29 10:08:29 +01:00
Peter Simons ed8b81e0df simplescreenrecorder: update to version 0.3.6 2016-01-27 00:23:27 +01:00
Tobias Geerinckx-Rice 0c25292648 vorbis-tools: rename from old-style vorbisTools 2016-01-26 01:35:55 +01:00
Tobias Geerinckx-Rice 9fb8020e4e Add version attribute where maintainers |= nckx
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
2016-01-25 17:35:21 +01:00
Tuomas Tynkkynen 493349f82a treewide: Mass replace 'libjpeg}/lib' to refer the 'out' output 2016-01-24 10:03:35 +02:00
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Vincent Laporte 38226ea4c3 smtube: add missing build dependency 2016-01-15 10:04:06 +01:00
Edward Tjörnhammar cee61fd115 kodiPlugins.t0mm0-common: init at 0.0.1 2016-01-13 14:29:06 +01:00
Edward Tjörnhammar 32cd7228f6 kodiPlugins.urlresolver: init at 2.10.0 2016-01-13 14:29:06 +01:00
Edward Tjörnhammar 15821e1b69 kodiPlugins.salts: init at 1.0.98 2016-01-13 14:29:06 +01:00
Edward Tjörnhammar 376e842c22 kodiPlugins.svtplay: 4.0.18 -> 4.0.21 2016-01-12 22:09:31 +01:00
Arseniy Seroka e8a66aa4f3 Merge pull request #12327 from kragniz/mpv-0.14.0
mpv: 0.12.0 -> 0.14.0
2016-01-12 20:07:57 +03:00
Louis Taylor 010724bc6f mpv: 0.12.0 -> 0.14.0 2016-01-12 07:02:11 +00:00
Tobias Geerinckx-Rice 432c0bd003 cc1394: remove dead package
Not updated since 2012. Broken since 2013. Sources long gone.

cc @viric
2016-01-06 01:46:16 +01:00
Tobias Geerinckx-Rice 5989c97665 tvtime: remove dead package
Upstream dried up in 2005. Not updated since 2012, broken since 2013.

cc @qknight
2016-01-06 01:46:16 +01:00
Mateusz Kowalczyk 1c837144f7 mkvtoolnix-cli: update from 8.3.0 to 8.4.0 2016-01-03 20:51:14 +00:00
Arseniy Seroka a40b413b04 Revert "avidemux: 2.5.6 -> 2.6.9"
This reverts commit 170c8e08d3.
2016-01-03 18:49:39 +03:00
Reno Reckling a60418a770 bomi: fix missing build dependency
The build fails without specifying qtquickcontrols as a build input
2016-01-01 14:57:28 +01:00
Vladimír Čunát f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Tobias Geerinckx-Rice f5b52aa382 clipgrab: 3.5.5 -> 3.5.6 2015-12-24 04:05:57 +01:00
Thomas Tuegel 5ff1c58606 Merge pull request #11839 from ttuegel/qt-5.4
Qt infrastructure update
2015-12-20 08:11:52 -06:00
Thomas Tuegel 85c19f8fb4 smtube: Qt 5 infrastructure update 2015-12-20 07:56:55 -06:00
Thomas Tuegel d534d5f097 smplayer: Qt 5 infrastructure upgrade 2015-12-20 07:56:55 -06:00
Thomas Tuegel a0bae9b571 obs-studio: Qt 5 infrastructure update 2015-12-20 07:56:44 -06:00
Thomas Tuegel ccdbc22836 shotcut: Qt 5 infrastructure update 2015-12-20 07:56:43 -06:00
Thomas Tuegel d405316398 bomi: Qt 5 infrastructure update 2015-12-20 07:56:43 -06:00
Tobias Geerinckx-Rice 1b6128cdc9 clipgrab: 3.5.4 -> 3.5.5 2015-12-20 03:34:43 +01:00
Domen Kožar 59455da528 Merge pull request #11799 from flosse/zdfmediathk
pkgs.zdfmediathk: 9 -> 10
2015-12-18 01:44:09 +01:00
Markus Kohlhase 61420e7ea9 pkgs.zdfmediathk: 9 -> 10 2015-12-18 00:43:07 +01:00
Pascal Wittmann 7dfe60b509 Merge pull request #11763 from DamienCassou/new-recordmydesktop
recordmydesktop: init at 0.3.8-svn602
2015-12-17 16:19:24 +01:00
Damien Cassou 1bb68f0a5b recordmydesktop: init at 0.3.8-svn602 2015-12-17 06:47:02 +01:00
Luca Bruno 5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Sou Bunnbu c03b26ee08 Merge pull request #11491 from bjornfor/pitivi-0.95
gstreamer 1.4 -> 1.6 and pitivi 0.94 -> 0.95
2015-12-11 21:00:31 +08:00
Ricardo M. Correia c3be340ae0 handbrake: fix compilation due to missing dep 2015-12-08 17:30:25 +01:00
Bjørn Forsman 1eaf571d42 pitivi: 0.94 -> 0.95
Notable (hard) dependency changes:
  - gstreamer >= 1.6.0
  - gst-plugins-bad with GTK support (need "gstgtk" plugin)
  - pygobject >= 3.14
  - gst-validate
  - matplotlib (used for drawing the "timeline")

Changes v1 -> v2:
pitivi no longer requires clutter, so I switched clutter-gtk => gtk3.
2015-12-06 10:24:59 +01:00
Carles Pagès 5d9148c9ad kodiPlugins.pvr-hts: init at 2.1.18
Add Tvheadend HTSP PVR client addon for Kodi.
2015-12-05 08:42:45 +01:00
Vincent Laporte a4a334bbe0 smtube: 15.9.0 -> 15.11.0 2015-12-02 19:46:23 +01:00
Vincent Laporte da4706f72a smplayer: 15.9.0 -> 15.11.0 2015-12-02 19:46:23 +01:00
Nikolay Amiantov d573b1e7a9 vlc: add midi support via fluidsynth 2015-12-01 20:46:31 +03:00
Edward Tjörnhammar 9787d22142 kodiPlugins.advanced-launcher: switch repo 2015-12-01 10:02:11 +01:00
Luca Bruno 920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Domen Kožar 67e03d0c50 Merge branch 'buildPythonPackage+wheels' 2015-11-26 17:38:35 +01:00
Luca Bruno a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Nikolay Amiantov e774cd6fc2 obs-studio: 0.12.0 -> 0.12.1 2015-11-24 17:01:18 +03:00
Edward Tjörnhammar e33b26ce2f kodiPlugins.steam-launcher: init plugin at 3.1.1 2015-11-22 10:32:57 +01:00
Edward Tjörnhammar 3ffae479d1 kodiPlugins.svtplay: 4.0.15 -> 4.0.18 2015-11-22 10:32:57 +01:00
Domen Kožar 704c8bab41 buildPythonPackage: fix standalone applications using it 2015-11-21 21:44:12 +01:00
Cillian de Róiste 13b339fe88 key-mon #11183: use $GDK_PIXBUF_MODULE_FILE with makeWrapperArgs
This is more robust, since it won't be affected when the path to
gdk-pixbuf loaders.cache changes. Thanks @domenkozar.
2015-11-21 16:31:38 +01:00
Cillian de Róiste d373b9d9f3 key-mon #11183: replace makeWrapper with makeWrapperArgs 2015-11-21 16:02:57 +01:00
Cillian de Róiste faff9ddad5 key-mon: fixes #11183 2015-11-21 15:39:52 +01:00
Vladimír Čunát 333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Pascal Wittmann 7fd2796e99 Replace 'with plaforms; platform' with 'platforms.platform' 2015-11-17 21:30:43 +01:00
William A. Kennington III 6602f49495 Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
This reverts commit 741bf840da.

This reverts the fallout from reverting the major changes.
2015-11-14 12:32:51 -08:00
William A. Kennington III 9579c9ec7f Merge commit 'cb21b77' into master.upstream
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
Tobias Geerinckx-Rice a2f98ef4ac clipgrab 3.5.2 -> 3.5.4 2015-11-13 22:06:10 +01:00
Pascal Wittmann bc9ec42958 mkcast: init at 2015-03-13
newcast does not work due to
https://github.com/KeyboardFire/mkcast/issues/30

closes #6333
2015-11-11 20:05:03 +01:00
Domen Kožar 0d19f68d2b popcorntime: mark as broken 2015-11-09 19:44:17 +01:00
William A. Kennington III a26c8e9b83 Merge branch 'master.upstream' into staging.upstream 2015-11-07 15:51:51 -08:00
Tobias Geerinckx-Rice 5a162cd068 clipgrab 3.5.1 -> 3.5.2 2015-11-06 04:02:01 +01:00
William A. Kennington III 2837a5e091 Merge branch 'master.upstream' into staging.upstream 2015-11-05 10:07:28 -08:00
Ilya Novoselov 398611fb6c vlc: added live555 dependency 2015-11-05 15:47:04 +01:00
William A. Kennington III 4251612faa Merge branch 'master.upstream' into staging.upstream 2015-11-04 01:00:48 -08:00
AndersonTorres 5aad97b90b mpv: 0.9.2 -> 0.12.0 2015-11-02 16:35:00 -02:00
Stéphane Jourdois 4532d88447 mkvtoolnix: darwin fixes 2015-10-31 22:01:05 +01:00
William A. Kennington III dd2de66d61 Merge branch 'master.upstream' into staging.upstream 2015-10-30 17:16:07 -07:00
Vincent Laporte 32267c25ce qarte: 2.3.0 -> 2.4.0 2015-10-28 08:22:51 +01:00
Arseniy Seroka 170c8e08d3 avidemux: 2.5.6 -> 2.6.9 2015-10-28 02:49:48 +03:00
Spencer Janssen a3343c3ec3 kodiPlugins.genesis: 4.0.1 -> 5.1.3 2015-10-26 10:59:23 -05:00
Spencer Janssen 0e59efc7d9 kodiPlugins.svtplay: 4.0.14 -> 4.0.15 2015-10-26 10:57:24 -05:00
Spencer Janssen 9d288f0b80 kodi: 15.1 -> 15.2 2015-10-25 22:16:29 -05:00
Vladimír Čunát 4917a4f8b3 Merge master into staging 2015-10-23 01:57:14 +02:00
Andrew Kelley fdc3f13f2e obs-studio: 0.11.1 -> 0.12.0
Also enable PulseAudio support if unspecified.
2015-10-19 15:18:55 -07:00
William A. Kennington III 8a44a36ca4 Merge branch 'master.upstream' into staging.upstream 2015-10-15 10:22:28 -07:00
Alexei Robyn 8162085634 kodi: Fix SSA/ASS subtitle support. 2015-10-14 20:24:53 +11:00
Vladimír Čunát 4a571ba0dd ffmpeg: split into multiple outputs
Also fix some referrers.
2015-10-13 20:18:57 +02:00
Vladimír Čunát 9da12a6713 SDL: split the dev output and fix referrers 2015-10-13 20:18:56 +02:00
Vladimír Čunát 8e381b89a1 glib-networking: split the dev output
That's done to get rid of propagatedBuildInputs from regular closure.
Also references were fixed, mainly to its gio modules.
2015-10-13 20:18:56 +02:00
Vladimír Čunát 99e4371526 curl: split into multiple outputs
Also use pkgconfig to be safer and fix (some) referrers.
2015-10-13 20:18:48 +02:00
Vladimír Čunát a6e4c87391 gtk3: split into multiple outputs
All references OK, hopefully. Seems surprisingly smooth.
2015-10-13 20:18:45 +02:00
Eelco Dolstra 741bf840da Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
This reverts commit f61176c539, reversing
changes made to a27ca029ee.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix
2015-10-06 15:24:20 +02:00
Edward Tjörnhammar d02869496b makemkv: 1.9.5 -> 1.9.7 2015-10-04 17:02:51 +02:00
Vladimír Čunát f361938b21 Merge staging into closure-size
This makes gcc5 the default builder, etc.
2015-10-03 15:23:13 +02:00
Vladimír Čunát 5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Vincent Laporte a4db37c4e9 smplayer: 14.9.0.6690 -> 15.9.0 2015-10-02 19:31:05 +02:00
Vincent Laporte dad6e8d5d7 smtube: 15.8.0 -> 15.9.0 2015-10-01 08:54:00 +02:00
Thomas Tuegel 2e0589b4ca kde414: build with kdelibs-4.14.12
Upstream changes to the build system required adjusting many packages'
dependencies. On the Nixpkgs side, we no longer propagate the dependency
on cmake (to reduce closure size), so downstream dependencies had to be
adjusted for most packages that depend on kdelibs.
2015-09-27 15:08:12 -05:00
Thomas Tuegel c9a6d288b5 vlc_qt5: build with Qt 5.5 2015-09-27 15:08:10 -05:00
Vladimír Čunát 76ef7a93e3 Merge: xlibs and x11 attribute cleanup
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
宋文武 d79463365a pitivi: 0.93 -> 0.94 (close #9894) 2015-09-18 20:38:19 +08:00
Martin Sturm 9e0519e554 vlc: use libsamplerate
Change the sample rate converter used from default "ugly_resampler" to
libsamplerate (aka secret rabbit code).
2015-09-18 10:17:21 +02:00
William A. Kennington III 773b4deb7c Merge commit 'a6f6c0e' into master.upstream
This is a partial merge of staging where we have up to date binaries for
all packages.
2015-09-15 12:16:49 -07:00
Vladimír Čunát 88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Vladimír Čunát 21e3ff658a x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
Vladimír Čunát 0c74f18e4c xlibs.xlibs: remove
It was really ugly that `xlibs.xlibs` meant something else than `xlibs`,
especially when using `with xlibs`, such as in wine.
Also, now `xlibs` is the same as `xorg`.
2015-09-15 11:59:33 +02:00
Bob van der Linden e6e338401f popcorntime: 0.3.7.2 -> 0.3.8-3 2015-09-05 16:01:37 +02:00
William A. Kennington III 86ebd3ee25 Merge branch 'master.upstream' into staging.upstream 2015-09-03 11:15:58 -07:00
William A. Kennington III ffd9e6a6ae gnash: Mark as broken
We should weed out any last users of this dying project and hopefully
remove it at some juncture in the future if no one steps up to maintain
it.
2015-09-02 14:35:33 -07:00
koral fdfd9d294e mkvtoolnix: 7.9.0 -> 8.3.0 2015-09-02 21:24:35 +00:00
Vincent Laporte cf660d03bd smtube: 15.5.17 -> 15.8.0 2015-08-26 17:38:14 +02:00
Spencer Janssen f2ce639000 kodi: 15.0 -> 15.1 2015-08-18 17:41:48 -05:00
Jonathan Rudenberg 387517da84 kodi: Fix libcec build 2015-08-03 19:51:59 -04:00
Tobias Geerinckx-Rice 87853e7753 clipgrab: add 1080p (ffmpeg) support
Support is optional (pass ffmpeg = null), but enabled by default.
2015-08-03 01:41:56 +02:00
Tobias Geerinckx-Rice dad99aae8e clipgrab: 3.4.11 -> 3.5.1 2015-08-03 01:41:56 +02:00
Jonathan Rudenberg abaedd5de5 makemkv: 1.9.4 -> 1.9.5 2015-08-01 13:33:28 -04:00
Vincent Laporte edd76966cb qarte: 2.2.0-147 -> 2.3.0 2015-07-30 20:34:02 +02:00
Nikolay Amiantov a5ef14bb74 bomi: update package 2015-07-28 12:33:30 +03:00
Eelco Dolstra 43f331a874 mpv: Don't enable JACK support by default
Packages should not depend on JACK by default to reduce dependency
bloat.

Issue #8990.
2015-07-26 22:45:39 +02:00
Edward Tjörnhammar 323fed4284 kodi: 14.2 -> 15.0 2015-07-22 15:54:58 +02:00
Austin Seipp 6475be23bc Merge pull request #8866 from spencerjanssen/obs-version-bump
obs-studio: 0.10.0 -> 0.11.1
2015-07-19 16:56:55 -05:00
Spencer Janssen 664af7b909 obs-studio: 0.10.0 -> 0.11.1
This version also adds a curl dependency.
2015-07-16 16:43:09 -05:00
William A. Kennington III 7cda24c01e Merge branch 'master.upstream' into staging.upstream 2015-07-08 14:11:16 -07:00
Guillaume Massé 7bab5ee5d0 Following name convention for popcorntime
http://nixos.org/nixpkgs/manual/#sec-package-naming
2015-07-07 10:23:40 -04:00
Guillaume Massé 5562750cd0 Build popcorntime from ci until yts movie outage is fixed
Currently the movie tab is broken. It's fixed in the experimental branch (master)

http://status.popcorntime.io/
> * Update - Issue with the subtitles API affects Release 0.3.7-2, Experimental builds are fine
>   May 13, 22:54 EDT
> [...]
> * Identified - The issue with the YTS API (Movies) seems to be related to a bad response for one of the movies. The movies page will continue to be intermittent until the issue is resolved.
>   May 10, 21:29 EDT
> * Investigating - YTS (Movies) is currently unavailable for Popcorn Time release 0.3.7-2, but is still working for the experimental builds. We're looking into what the issue could be and why it's only affecting release 0.3.7-2
>   May 10, 18:34 EDT
2015-07-07 00:00:55 -04:00
William A. Kennington III d605663ae2 Merge branch 'master.upstream' into staging.upstream 2015-07-05 13:06:02 -07:00
Bjørn Forsman 8f9534ccc3 popcorntime: unbreak tarball job
Fix evaluation error when srcs."${stdenv.system}" does not exist (e.g.
on darwin).
2015-07-04 20:32:45 +02:00
William A. Kennington III 612f0bdd67 Merge branch 'master.upstream' into staging.upstream 2015-06-30 23:58:07 -07:00
Domen Kožar 3ff2dfb7fa Merge pull request #8423 from bobvanderlinden/popcorntime-bin
added popcorntime package
2015-06-28 10:01:45 +02:00
William A. Kennington III 12102562f7 Merge branch 'master.upstream' into staging.upstream 2015-06-27 00:18:18 -07:00
William A. Kennington III 7297255019 Convert all jack references to libjack2 2015-06-27 00:17:52 -07:00
William A. Kennington III ef253212f4 Merge branch 'master.upstream' into staging.upstream 2015-06-26 17:25:49 -07:00
Markus Kohlhase 86dbc9b5e2 k9copy: fixed attributes to evaluate with current master 2015-06-26 10:11:49 +02:00
Bob van der Linden bb10e48573 popcorntime: don't use pkgs in argument 2015-06-25 19:05:52 +02:00
Thomas Tuegel a8c52d0958 Merge branch 'master' into staging 2015-06-25 09:15:05 -05:00
William Casarin 1281f51b69 obs-studio: audio support 2015-06-25 00:32:16 -07:00
Eelco Dolstra ab8a2b0c78 vlc: Don't depend on JACK by default
To reduce dependency bloat, packages should not depend on non-standard
audio systems by default.
2015-06-24 12:20:38 +02:00
William A. Kennington III 282d03befa Merge branch 'master.upstream' into staging.upstream 2015-06-22 10:57:36 -07:00
Markus Kohlhase f50b2e5892 k9copy: init at 3.0.3 2015-06-22 12:34:00 +02:00
William Casarin bd399f2647 add qt5.x11extras to obs-studio
fixes build
2015-06-21 21:20:01 -07:00
Bob van der Linden e315d0599d popcorntime: allow different versions of node_webkit 2015-06-19 23:22:18 +02:00
Bob van der Linden f2f0d98e53 popcorntime: added support for i686-linux 2015-06-19 23:22:18 +02:00
Bob van der Linden 236f8c720d added popcorntime package 2015-06-19 23:22:18 +02:00
Vladimír Čunát 61596bf405 Merge #8363: pure-darwin stdenv 2015-06-18 22:38:08 +02:00
lethalman da28405ba2 Merge pull request #8263 from robbinch/pkg-dvd-slideshow
dvd-slideshow: Add package.
2015-06-18 14:46:48 +02:00
Luca Bruno aa800fa0fe Merge branch 'master' into staging 2015-06-15 09:56:29 +02:00
Jonathan Rudenberg 853e87909f makemkv: 1.9.3 -> 1.9.4 2015-06-14 16:31:29 -04:00
Jonathan Rudenberg 52a1ae743b makemkv: 1.9.2 -> 1.9.3 2015-06-12 17:58:27 -04:00
Eelco Dolstra 4a57b07653 Merge remote-tracking branch 'origin/master' into staging 2015-06-11 00:18:24 +02:00
Robbin C 9d749881d6 dvd-slideshow: Removed dot at the end. 2015-06-10 19:02:09 +08:00
Robbin C 085a0e8d24 dvd-slideshow: Add package.
This adds dvd-slideshow, a suite of command line programs that creates a
slideshow-style video from groups of pictures.
2015-06-10 17:34:51 +08:00
Pascal Wittmann e1af50c4c4 byzanz: add -Wno-error for deprecated declarations to fix the build 2015-06-09 20:38:05 +02:00
Tobias Geerinckx-Rice cae833255f add minitube: stand-alone Youtube video player
Close #8118.
2015-06-09 20:05:23 +02:00
Richard Larocque 78f2410865 kodi: Enable RTMP support
Ports over similar XBMC changes from
d221fd91a3.
2015-06-03 23:27:39 -07:00
Vincent Laporte 2af5c8d75f qarte: minor update to rev. 147 2015-05-31 19:03:43 +02:00
Vincent Laporte 9e68371f51 smtube: update from 15.5.10 to 15.5.17 2015-05-31 19:03:43 +02:00
William A. Kennington III b07929b0a3 Use libpulseaudio instead of pulseaudio 2015-05-29 14:32:56 -07:00
Peter Simons 99273a6716 Merge pull request #8047 from nckx/master
Don't use "with licenses;" for single licences
2015-05-28 22:14:53 +02:00
Tobias Geerinckx-Rice 158e1cfdd0 Don't use "with licenses;" for single licences
And don't use square brackets on such lines.
2015-05-28 19:20:29 +02:00
codyopel ba9867fb5b mpv: refactor & fix youtube-dl support 2015-05-28 09:30:36 -04:00
Tobias Geerinckx-Rice b2d7f4b1ba Use common licence attributes from lib/licenses.nix
Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.
2015-05-27 22:00:06 +02:00
Florian Friesdorf 6ad9f8e1dd mediathekview-9 2015-05-23 12:41:14 +02:00
Mateusz Kowalczyk 4d867b0b08 mpv: update to 0.9.2 2015-05-23 01:56:39 +01:00
Luca Bruno 9adde87fea More usage of gnome3.defaultIconTheme 2015-05-19 14:44:27 +02:00
Arseniy Seroka 82d46c2c2a Merge pull request #7900 from C0DEHERO/fix/obs-studio-update
obs-studio: update 0.9.1 -> 0.10.0
2015-05-19 03:35:53 +03:00
C0DEHERO 3c94a9da90 obs-studio: update 0.9.1 -> 0.10.0 2015-05-18 19:10:03 -04:00
Nikolay Amiantov 19b4eb8208 bomi: update, add youtube-dl support 2015-05-18 17:21:08 +03:00
Luca Bruno 25f9555599 Drop GNOME 3.12 2015-05-18 12:24:08 +02:00
Spencer Whitt 01d7d24dbb libdvdnav: 4.2.1 -> 5.0.3
Keeping the old version around for now in order to support mplayer.
2015-05-14 23:26:16 -04:00
Mateusz Kowalczyk dc1107af57 Merge pull request #7801 from codyopel/mkvtoolnix
mkvtoolnix: 7.8.0 -> 7.9.0
2015-05-12 17:17:09 +01:00
Tobias Geerinckx-Rice 1b6fcfa24e clipgrab 3.4.9 -> 3.4.11 2015-05-12 07:52:59 +02:00
codyopel 46d30ae22f mkvtoolnix: 7.8.0 -> 7.9.0 2015-05-11 06:20:12 -04:00
Domen Kožar bb4d658f64 Merge branch 'master' into staging
Conflicts:
	nixos/doc/manual/release-notes/rl-unstable.xml
	nixos/modules/services/printing/cupsd.nix
	pkgs/applications/misc/calibre/default.nix
	pkgs/development/haskell-modules/hackage-packages.nix
	pkgs/development/libraries/libsodium/default.nix
	pkgs/misc/emulators/wine/unstable.nix
	pkgs/top-level/all-packages.nix
2015-05-11 10:05:23 +02:00
Pascal Wittmann cf87977268 Merge pull request #7802 from codyopel/smtube
smtube: 15.1.0 -> 15.5.10
2015-05-11 08:58:28 +02:00
William A. Kennington III f8caa8f940 vlc: 2.2.0 -> 2.2.1 2015-05-10 22:34:53 -07:00
codyopel 54de18c4aa smtube: 15.1.0 -> 15.5.10 2015-05-11 01:19:24 -04:00
Domen Kožar b7f15c43da fix evals /cc @ttuegel 2015-05-10 13:46:32 +02:00
codyopel 6c0b0a0248 avxsynth: refactor & 2013-05-10 -> 2015-04-07 2015-05-10 13:46:02 +02:00
koral 192cc69176 mpv: 0.8.3 -> 0.9.1 2015-05-10 13:46:00 +02:00
William A. Kennington III 1ef5a4990e Merge pull request #7770 from codyopel/avxsynth
avxsynth: refactor & 2013-5-10 -> 2015-4-7
2015-05-09 15:25:05 -07:00
codyopel b807d8daeb avxsynth: refactor & 2013-05-10 -> 2015-04-07 2015-05-09 18:13:52 -04:00
koral 387eaf74ef mpv: 0.8.3 -> 0.9.1 2015-05-09 09:37:34 +00:00
Vladimír Čunát d6dd3b8bd1 a few packages: work-arounds with split outputs
There's something wrong with imake-based packages,
but I couldn't find out what, so disabling transfig in libgcrypt for now.
2015-05-05 11:56:32 +02:00
Vladimír Čunát 3b9ef2c71b fix "libc}/lib" and similar references
Done mostly without any verification.
I didn't bother with libc}/include, as the path is still correct.
2015-05-05 11:52:08 +02:00
Vladimír Čunát 30f31c9afc Merge 'master' into staging
(relatively simple conflicts)
2015-04-26 22:52:08 +02:00
Eelco Dolstra 61cca2cadf meta.homePage -> homepage 2015-04-20 14:20:03 +02:00
Pascal Wittmann 74235b70f1 Merge pull request #7224 from AndersonTorres/aegisub
Aegisub: 3.2.1 -> 3.2.2
2015-04-15 19:39:12 +02:00
Thomas Tuegel 88918e10e9 Merge branch 'master' into staging 2015-04-10 07:45:38 -05:00
Jonathan Rudenberg e994df1b2d makemkv: 1.9.1 -> 1.9.2 2015-04-09 20:49:31 -07:00
Aristid Breitkreuz 7056264257 Merge pull request #7270 from nckx/remove-dead-mplayer2
Remove dead mplayer2
2015-04-08 21:56:02 +02:00
Tobias Geerinckx-Rice 672111dc35 clipgrab: use makeDesktopItem 2015-04-08 18:18:03 +02:00
Tobias Geerinckx-Rice 00caa18b2f Remove dead mplayer2
mplayer2.org is no longer owned by the project, and even when
using a mirror this two-year-old (!) version fails to build.

Use mpv instead.
2015-04-08 17:07:23 +02:00
AndersonTorres 6276a4ace7 Aegisub: 3.2.1 -> 3.2.2
Adding config.aegisub.* options
2015-04-08 00:51:01 -03:00
Tobias Geerinckx-Rice bee0ccd1f5 Add clipgrab 3.4.9: web video downloader and converter 2015-04-08 05:09:16 +02:00
Eric Seidel 6ec373d776 Merge branch master into staging 2015-04-06 18:58:08 -07:00
Markus Kohlhase cee3297352 nixpkgs: zdfmediathk: include the version within the name 2015-04-05 11:57:16 +00:00
Arseniy Seroka bdc1ab3db6 Merge pull request #7143 from k0ral/mkvtoolnix
mkvtoolnix: 7.7.0 -> 7.8.0
2015-04-03 16:02:04 +03:00
koral fe5c3eaf81 mkvtoolnix: 7.7.0 -> 7.8.0 2015-04-03 09:38:54 +00:00
William A. Kennington III a604b42480 mysql: Use libs in place of the binary mysql 2015-04-01 16:46:53 -07:00
Edward Tjörnhammar 1092b9da48 Merge pull request #7066 from edwtjo/xbmc-pruning
Remove XBMC expressions in favor of the Kodi ones
2015-03-30 21:46:29 +02:00
Edward Tjörnhammar 1345a65765 Remove XBMC expressions in favor of the Kodi ones 2015-03-30 21:43:32 +02:00