1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 07:31:20 +00:00
Commit graph

662 commits

Author SHA1 Message Date
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 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
Luca Bruno dee2a5dda3 obs-studio: fix derivation name 2015-03-30 17:37:24 +02:00
William Casarin 497eba7bcb add obs-studio
Open Broadcaster Software is free and open source software for video recording
and live streaming

https://obsproject.com/
2015-03-30 00:56:21 -07:00
William A. Kennington III fa2e5b25ba Merge branch 'master' into staging 2015-03-29 14:25:48 -07:00
Nikolay Amiantov c2a99c0e8c Merge pull request #7062 from abbradar/package-updates
Package updates
2015-03-29 13:20:21 +03:00
Edward Tjörnhammar d98e037774 kodi: 14.1 -> 14.2 2015-03-29 12:05:53 +02:00
Nikolay Amiantov 5d7847f233 bomi: update 2015-03-29 13:01:47 +03:00
Thomas Tuegel 8fd5dd89ac Merge branch 'master' into staging 2015-03-24 17:49:30 -05:00
Thomas Tuegel 5d1f6ad57c qt5: make qt-5.4.1 default 2015-03-24 17:14:56 -05:00
Luca Bruno 4a1c3760e0 pitivi: cleanup and fix icons on non-nixos 2015-03-23 11:24:34 +01:00
lethalman fc7511f9a0 Merge pull request #6863 from bencef/jack2mplayer
mplayer: add (optionally) jack to NIX_LDFLAGS
2015-03-23 10:55:14 +01:00
Bence Fabian 2aa9da5a06 mplayer: Remove --enable-jack
If provided then configure won't use the pkgconfig of jack.
2015-03-23 10:42:37 +01:00
Peter Simons f30743b86b Revert "VLC wants a newer version of libdvdnav" 2015-03-19 13:19:17 +01:00
Mateusz Kowalczyk 2b8fd8d4e9 Merge pull request #6857 from k0ral/mpv
mpv: 0.8.2 -> 0.8.3
2015-03-19 00:16:03 +00:00
Peter Jones 05d6d77c8e VLC wants a newer version of libdvdnav
* Updated libdvdnav/libdvdread to latest versions

  * Removed libdvdnav patches since they have been incorporated into the
    latest release

  * Added `--enable-dvdnav` configure flag to VLC to ensure that if this
    happens again VLC will fail to build
2015-03-18 14:37:12 -06:00
Luca Bruno ff0ca7fced p2pvc: remove dot at the end of description 2015-03-18 10:11:41 +01:00
hmuehlhans ec9f528961 p2pvc: new package
Added myself to maintainers
2015-03-17 21:04:05 +01:00
koral ebba9e6681 mpv: 0.8.2 -> 0.8.3 2015-03-17 17:31:35 +00:00
Pascal Wittmann 30ec369a99 xine-ui: update from 0.99.7 to 0.99.9 2015-03-16 18:38:47 +01:00
Vincent Laporte d38c414d94 Adds Qarte
Qarte allows you to browse into the archives of arte+7 & arteLiveWeb sites
and to record your preferred videos.

Homepage: https://launchpad.net/qarte
2015-03-13 22:17:32 +01:00
Mateusz Kowalczyk af3caf8cb1 Merge pull request #6761 from k0ral/mkvtoolnix
mkvtoolnix: 7.6.0 -> 7.7.0
2015-03-12 01:36:38 +00:00
Edward Tjörnhammar afeed64bbe kodiPlugins.{genesis,svtplay}: version bumps 2015-03-11 19:52:35 +01:00
koral ab1f4ac92e mkvtoolnix: 7.6.0 -> 7.7.0 2015-03-11 16:46:30 +00:00
James Cook 7b67e3fe35 Enable aalib support in mplayer. 2015-03-08 23:58:48 -07:00
Arseniy Seroka ff58ecdce2 Merge pull request #6660 from flosse/zdfmediathk
pkgs: zdfmediathk 8 -> 9
2015-03-05 23:59:18 +03:00
koral e8dd8ac456 mpv: 0.8.0 -> 0.8.2 2015-03-05 07:36:29 +00:00
Markus Kohlhase c9afdef66d pkgs: zdfmediathk 8 -> 9 2015-03-04 19:18:13 +00:00
Domen Kožar 362ba73ac6 vlc: 2.1.5 -> 2.2.0 2015-02-28 23:24:10 +01:00
Jaka Hudoklin c4ae25e827 Merge pull request #6587 from offlinehacker/pkgs/kdenlive/icons
kdenlive: Add icons to propagatedUserEnvPkgs.
2015-02-28 03:55:04 +01:00
Jaka Hudoklin bf02236701 kdenlive: Add icons to propagatedUserEnvPkgs. 2015-02-27 14:12:03 +01:00
AndersonTorres 5347a1c8a1 MPV: upgrade to 0.8.0 2015-02-23 23:43:59 -03:00
Thomas Tuegel 8cf78bf5f4 update various packages to use Qt 5.4 2015-02-21 11:39:20 -06:00
Arseniy Seroka 18ec13d9d2 Merge pull request #6483 from qknight/kino-1.3.4-build-fix
kino-1.3.4 fixes
2015-02-21 13:32:40 +03:00
Joachim Schiele 1a35a0ad34 kino-1.3.4 fixes; thanks to gentoo 2015-02-20 22:44:10 +01:00
Shea Levy 2f061ff16b Merge remote-tracking branch 'origin/staging'
Darwin and haskell fixes.
2015-02-17 13:52:37 -05:00
Vincent Laporte c3380ce3b0 smplayer: update from 14.9.0 to 14.9.0.6690 2015-02-16 13:31:13 +01:00
Shea Levy 127efcd6f6 Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging
Took "ours" for the conflict and changed libiconvOrEmpty to libiconv

Conflicts:
	pkgs/applications/audio/ncmpcpp/default.nix
2015-02-11 19:37:22 -05:00
Mateusz Kowalczyk 6e479db730 mkvtoolnix: update to 7.6.0 2015-02-09 12:43:09 +00:00
Edward Tjörnhammar e546997042 makemkv: 1.9.0 -> 1.9.1 2015-02-08 22:40:25 +01:00
Eric Seidel e08b9ab8d3 kill libiconvOr*
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
2015-02-07 20:29:28 -08:00
Domen Kožar f8dacd8528 Merge pull request #6090 from richardlarocque/xbmc_rtmp
xbmc: Add rtmp support
2015-02-03 23:22:52 +01:00
Nikolay Amiantov 9b631cd0f8 bomi: rename from cmplayer and update 2015-02-03 14:27:43 +03:00
Shea Levy c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
Edward Tjörnhammar f8038b0c6c kodi: 14.0 -> 14.1, added myself as maintainer 2015-02-02 20:15:52 +01:00
Richard Larocque d221fd91a3 xbmc: Add rtmp support 2015-02-01 13:56:26 -08:00
devhell 5c0be2f8c9 mpv: 0.7.2 -> 0.7.3; waf: 1.8.1 -> 1.8.5 2015-01-30 20:42:11 +00:00