Commit Graph

843 Commits

Author SHA1 Message Date
Vladimír Čunát
3afa246038 Merge branch 'staging'
This includes a security update of expat.
2016-06-29 07:47:04 +02:00
Tobias Geerinckx-Rice
01b3e54575
clipgrab: 3.6.0 -> 3.6.1 2016-06-24 12:41:07 +02:00
Vladimír Čunát
6b27ceb006 Merge 'master' into staging and re-revert merge
... from staging to master, reverted temporarily in aa9a04883e.
2016-06-23 12:09:03 +02:00
Vladimír Čunát
aa9a04883e Revert "Merge branch 'staging'" due to glibc
The main output started to retain dependency on bootstrap-tools; see
https://github.com/NixOS/nixpkgs/pull/15867#issuecomment-227949096

This reverts commit c05d829598, reversing
changes made to f073df60d6.
2016-06-23 09:25:10 +02:00
Tobias Geerinckx-Rice
0fa2f6757a
clipgrab: 3.5.6 -> 3.6.0 2016-06-22 19:49:48 +02:00
Vladimír Čunát
c05d829598 Merge branch 'staging' 2016-06-22 10:49:56 +02:00
Bjørn Forsman
bd01fad0ed Captialize meta.description of all packages
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
Vladimír Čunát
97c484a10f treewide: fix #include errors after gcc-5.4
They were mostly missing <cmath> or <math.h>.
2016-06-19 10:18:30 +02:00
Tuomas Tynkkynen
f4b360d932 kazam: Use makeLibraryPath
This affected the hash, so presumably this fixes output references.
2016-06-07 21:16:15 +03:00
Nikolay Amiantov
bd1b236f7c fix 'licenses' -> 'license' in several places 2016-06-07 04:57:21 +03:00
Tuomas Tynkkynen
bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Carles Pagès
8a304cc228 Merge pull request #15726 from simonvandel/fix-pvr-hts
kodiPlugins.pvr-hts: fix load
2016-05-30 08:49:49 +02:00
Profpatsch
c7d288fd56 mpv: add script infrastructure & convert script
mpv’s functionality can be modified with lua scripts, by specifying them
on the command line.
`scripts` is a list of lua files that are appended to the default mpv
invocation. We also provide a `mpvScripts` attrset with the available
scripts in the top namespace.

`convert` is one such script, that extends mpv with a simple but very
convenient on-the-fly cropping and converting feature.

Closes #14040.
2016-05-28 15:16:12 +02:00
Simon Vandel Sillesen
1090839df1 kodiPlugins.pvr-hts: fix load 2016-05-26 19:24:57 +02:00
Vladimír Čunát
81039713fa Merge branch 'master' into staging
... to get the systemd update (rebuilding ~7k jobs).
2016-05-26 16:50:22 +02:00
Tobias Geerinckx-Rice
709eaaf98e
vlc: 2.2.2 -> 2.2.3 2016-05-25 02:06:47 +02:00
Tobias Geerinckx-Rice
d07e9a8e21
gnome-mpv: init at 0.9 2016-05-23 20:12:37 +02:00
Vladimír Čunát
c4661e9643 Merge: make dev output references explicit
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
2016-05-22 12:09:23 +02:00
Tuomas Tynkkynen
8d473f107c treewide: Make explicit that 'dev' output of readline is used 2016-05-19 10:03:35 +02:00
Domen Kožar
b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
aszlig
75c66fb40a
obs-studio: 0.13.1 -> 0.14.2
The biggest change is that since 0.14.0 it now has support for ALSA
sound input, so this also adds the ALSA library to the dependencies.

URL for upstream changes in 0.14.2:

https://github.com/jp9000/obs-studio/releases/tag/0.14.2

URL for upstream changes in 0.14.0 and 0.14.1:

https://github.com/jp9000/obs-studio/releases/tag/0.14.1

Changes for 0.13.3 and 0.13.4 were only Windows-related hotfixes, the
URLs are:

https://github.com/jp9000/obs-studio/releases/tag/0.13.3
https://github.com/jp9000/obs-studio/releases/tag/0.13.4

Upstream changes for 0.13.2:

 * Fixed an issue where certain devices (elgato/lgp/hdpvr) could have
   stuttering audio
 * Changed lossless recording quality to use .avi with uncompressed PCM
   audio data
 * Made it so that linux window capture does not display red when it
   can't capture, instead it now becomes transparent

URL: https://github.com/jp9000/obs-studio/releases/tag/0.13.2

Built and tested successfully on my machine.

Cc: @jb55
Reported-by: @rikai
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-05-17 06:44:13 +02:00
Vladimír Čunát
6c2fbfbd77 Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
Arseniy Seroka
88b684101f Merge pull request #15255 from jerith666/tivodecode
tivodecode: init at 0.2pre4
2016-05-09 10:28:08 +03:00
Matt McHenry
9b53d546e2 tivodecode: init at 0.2pre4 2016-05-08 20:35:44 -04:00
Vladimír Čunát
65a9fa8cdc Merge branch 'master' into staging 2016-05-08 21:24:48 +02:00
Bob van der Linden
1b2fb84d75 popcorntime: removed package as discussed in #15120 2016-05-05 21:02:31 +02:00
Tuomas Tynkkynen
aadaa91379 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
Joachim Fasting
b9fc31a415
popcorntime: mark as broken
A temporary measure, short of removal, until
https://github.com/NixOS/nixpkgs/issues/15120 has been resolved.
2016-05-03 16:09:36 +02:00
Bob van der Linden
69d5f27a13 popcorntime: 0.3.8 -> 0.4.0-2 (#15154) 2016-05-02 10:46:37 +02:00
Vincent Laporte
ce7181f9a8 smtube: fix build after qmakeHook 2016-04-29 07:21:31 +00:00
Vincent Laporte
5de3cfe210 smplayer: fix build after qmakeHook 2016-04-29 07:21:31 +00:00
Tuomas Tynkkynen
b465dc202f boost: Kill unnecessary 'lib' output
This was split in somewhere pre-2014 without the current infra which
automates parts of this, in particular the output propagation.
2016-04-28 00:41:28 +03:00
Tuomas Tynkkynen
4ff8f377af Merge remote-tracking branch 'upstream/master' into staging 2016-04-28 00:13:53 +03:00
Nikolay Amiantov
7b4fc0f5a9 avidemux: use symlinkJoin 2016-04-26 15:37:43 +03:00
Nikolay Amiantov
09f02b918e Merge branch 'master' of git://github.com/NixOS/nixpkgs into staging 2016-04-25 18:02:10 +03:00
Edward Tjörnhammar
40ea584903
kodi: 16.0 -> 16.1 2016-04-24 22:34:31 +02:00
Vladimír Čunát
e9379f7416 Merge branch 'staging'
This includes a fix to closure-size regression that moved
share/doc/*/ to share/doc/
2016-04-22 16:49:09 +02:00
Thomas Tuegel
b4ff81ffd6 phonon-backend-vlc: init at 0.9.0 2016-04-22 08:11:10 -05:00
Nikolay Amiantov
46ae49fbff dvd-slideshow: use PATH 2016-04-21 17:23:56 +03:00
Nikolay Amiantov
577ea10f68 shotcut: move to qmakeHook
This reverts commit dbc1605dea.
2016-04-20 18:55:50 +03:00
Nikolay Amiantov
7e4e4799f4 qgifer: move to qmake4Hook 2016-04-20 18:55:49 +03:00
Nikolay Amiantov
35ab3d5522 minitube: move to qmake4Hook 2016-04-20 18:55:49 +03:00
Nikolay Amiantov
09394ae019 linuxstopmotion: move to qmake4Hook 2016-04-20 18:55:49 +03:00
Nikolay Amiantov
3656842478 clipgrab: move to qmake4Hook 2016-04-20 18:55:49 +03:00
Nikolay Amiantov
2816ad29e5 bomi: move to qmakeHook 2016-04-20 18:55:49 +03:00
Brad Ediger
d8d00ae043 makemkv: 1.9.9 -> 1.9.10 2016-04-18 10:45:52 -05:00
Spencer Janssen
a3d6602c39 kodi: fix build after pcre split (#14714) 2016-04-15 08:57:13 +01:00
aszlig
dbc1605dea
shotcut: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of shotcut
override the whole configurePhase, so this hook isn't run at all.

However, this still doesn't fix the package and its already marked as
broken.

The build fails with the following error:

Project ERROR: Unknown module(s) in QT: qml quick webkitwidgets x11extras

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
Nikolay Amiantov
76281d5dec avidemux: refactor again to fix build failures 2016-04-14 00:31:16 +03:00
Nikolay Amiantov
e88a986ca4 bomi: use wrapQtProgram 2016-04-13 16:09:40 +03:00