1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 03:17:13 +00:00
Commit graph

1052 commits

Author SHA1 Message Date
Stefan Götz 9280174493 mpv: 0.22.0 -> 0.23.0 2017-01-10 22:42:29 +01:00
Frederik Rietdijk 4187179f7b Merge pull request #21455 from puffnfresh/package/Natron
natron: init at 2.1.9
2017-01-06 08:22:08 +01:00
Brian McKenna f133475370 natron: init at 2.1.9 2017-01-06 15:49:35 +11:00
Bjørn Forsman 26dc6dab4c avidemux: 2.6.15 -> 2.6.16 2017-01-03 20:27:25 +01:00
Joachim Fasting 52cb1df30c
kodi/wrapper: fix typo, preferLocalBuilds -> preferLocalBuild 2016-12-14 03:48:44 +01:00
romildo ae1fa72a48 mkvtoolnix: 9.5.0 -> 9.6.0 2016-12-02 20:55:34 -02:00
Nikolay Amiantov 91fd6b04aa libquvi: specify glib dependency 2016-11-24 01:17:55 +03:00
Nikolay Amiantov 79b0a9bf39 avidemux: 2.6.12 -> 2.6.15 2016-11-24 01:17:54 +03:00
Nikolay Amiantov be95ceaff2 treewide: quote URLs in my packages 2016-11-24 01:17:52 +03:00
Franz Pletz 1305691cec
mpv: 0.21.0 -> 0.22.0 2016-11-23 13:23:32 +01:00
Pascal Wittmann f7e0bc2ae7
Make all meta.maintainers attributes lists 2016-11-20 18:06:03 +01:00
= 56fdd19bc8
w_scan: init at 20161022 2016-11-14 17:20:23 +01:00
Brian McKenna c950840544 motion: init at 4.0.1 2016-11-08 10:55:13 +11:00
Franz Pletz 12088f2ba1
mpv: add support for drm, fixes vaapi 2016-11-03 12:54:26 +01:00
zraexy e675b2c0de streamlink: 1.14.0-rc1 -> 0.0.2
Update streamlink to 0.0.2
1.14.0-rc1 was not an official release
2016-10-31 20:07:49 +02:00
Frederik Rietdijk 7077a270bf Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-26 13:06:43 +02:00
Stefan Goetz 9ed93637a3 mpv: 0.20.0 -> 0.21.0 (#19873) 2016-10-26 02:11:56 +02:00
Frederik Rietdijk e56832d730 Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-22 17:23:24 +02:00
romildo 766c0c1ec9 mkvtoolnix: 9.4.2 -> 9.5.0 2016-10-21 14:57:01 -02:00
Frederik Rietdijk 8fb03df1c1 handbrake: use python2 2016-10-18 23:16:08 +02:00
Frederik Rietdijk 7af8b221fd kodi: use python2 2016-10-18 23:16:05 +02:00
Vladimír Čunát 6eeea6effd Python: more evaluation fixups. 2016-10-14 00:03:12 +02:00
Frederik Rietdijk 104c50dd1a Python: remove modules and pythonFull 2016-10-10 10:33:24 +02:00
Jörg Thalheim bb983fbfba Merge pull request #19397 from k0ral/nixos-unstable
handbrake: add libx265 to LD_LIBRARY_PATH
2016-10-09 21:32:32 +02:00
koral dd482470c4 handbrake: add libx265 to LD_LIBRARY_PATH 2016-10-09 18:20:57 +02:00
Bjørn Forsman b48dafee8d shotcut: 16.08 -> 16.10 2016-10-08 18:25:43 +02:00
Markus Hauck aafbd40577 Replace hard coded /bin/bash occurrences 2016-10-04 20:15:37 +02:00
Bjørn Forsman 3e6ce75b8f openshot-qt: 2.0.7 -> 2.1.0
Also update libopenshot (0.1.1 -> 0.1.2) and libopenshot-audio (0.1.1 ->
0.1.2). Both  libraries seem to be somewhat version coupled with
openshot (all three projects had a release at the same time).

Openshot now depends on ZMQ.

Test notes: the application runs, but I managed to crash it after doing
this:

* Import pictures and video
* Add two pictures to the timeline (next to each other)
* Drag the 2nd picture partly over over the first
  (creates an effect). App dies.

The last output from the app is:

  timeline_webview:INFO addTransition...
  Unhandled Python exception
  Aborted

The same crash happens with v2.0.7 though.
2016-10-02 22:19:16 +02:00
Graham Christensen f5057d6ba9
mplayer: 1.1.1 -> 1.3.0 2016-09-25 21:50:08 -04:00
Frederik Rietdijk 107e8ccb6b key-mon: do not use top-level python packages 2016-09-25 23:59:21 +02:00
Arseniy Seroka 4400b60cd9 Merge pull request #18787 from romildo/upd.subtitleeditor
subtitleeditor: 0.52.1 -> 0.53.0
2016-09-25 01:09:24 +04:00
José Romildo Malaquias d18a8f9cf2 mkvtoolnix: do not inline the result of optional in buildInputs because it returns a list and should be concatenated instead 2016-09-23 11:35:26 -03:00
Tuomas Tynkkynen ca7808f696 streamlink: Fix longDescription 2016-09-21 19:34:01 +03:00
Tuomas Tynkkynen 5aee5b2100 streamlink: Init at 1.14.0-rc1
A fork of livestreamer (which is no longer maintained) that actually
works with Twitch.
2016-09-21 19:29:51 +03:00
José Romildo Malaquias c212ad1630 subtitleeditor: 0.52.1 -> 0.53.0 2016-09-21 09:45:20 -03:00
José Romildo Malaquias 88e15b19ef mkvtoolnix: 9.4.0 -> 9.4.2 2016-09-18 07:09:07 -03:00
Matthew Bauer 85f2c3ebc9
mplayer: fix on darwin 2016-09-14 12:51:47 -05:00
Kirill Boltaev bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Vincent Laporte 637412e373 mpv: fix on darwin 2016-09-12 14:42:38 +02:00
Tuomas Tynkkynen ffddcc8807 vlc_npapi: Fix hash 2016-09-11 00:21:16 +03:00
Kirill Boltaev 86557f9ffd mpv: 0.19.0 -> 0.20.0 (#18493)
Enable vaapiSupport by default.
2016-09-10 21:56:49 +02:00
Joachim F 82d6ab1ed8 Merge pull request #18029 from rnhmjoj/vapoursynth
Vapoursynth
2016-09-08 16:28:31 +02:00
Thomas Tuegel e25a07e92a
qt5.vlc: mark broken with Qt 5.7 2016-09-07 20:57:55 -05:00
rnhmjoj 6fabc515d0
mpv: add vapoursynth support 2016-09-04 22:27:10 +02:00
Tuomas Tynkkynen 3364230d56 Disable bunch of non-compiling packages on Darwin
These ones have a "Last successful build" timestamp in the 2014s or
2015s. Presumably no one will notice if we now stop building them.

softether_4_18              2015-09-20  http://hydra.nixos.org/build/39418483
lensfun                     2014-09-30  http://hydra.nixos.org/build/39394104
net_snmp                    2015-09-20  http://hydra.nixos.org/build/39410553
djview                      2015-08-11  http://hydra.nixos.org/build/39413233
libmusicbrainz2             2015-09-20  http://hydra.nixos.org/build/39410106
fox_1_6                     2014-05-07  http://hydra.nixos.org/build/39410858
libofx                      2015-09-24  http://hydra.nixos.org/build/39423507
yacas                       2014-09-30  http://hydra.nixos.org/build/39393150
iomelt                      2014-09-30  http://hydra.nixos.org/build/39408486
softether                   2015-09-20  http://hydra.nixos.org/build/39425800
mp4v2                       2014-09-30  http://hydra.nixos.org/build/39421899
virtuoso7                   2014-09-21  http://hydra.nixos.org/build/39415206
man_db                      2015-04-23  http://hydra.nixos.org/build/39404236
libdiscid                   2014-09-30  http://hydra.nixos.org/build/39412202
zabbix22.agent              2014-09-21  http://hydra.nixos.org/build/39412149
vidalia                     2015-08-06  http://hydra.nixos.org/build/39411500
libmtp                      2015-09-20  http://hydra.nixos.org/build/39419199
wxGTK29                     2015-09-20  http://hydra.nixos.org/build/39415296
ncmpcpp                     2015-11-06  http://hydra.nixos.org/build/39404455
libtorrent                  2014-09-21  http://hydra.nixos.org/build/39394646
shishi                      2014-03-21  http://hydra.nixos.org/build/39418874
ocaml_3_12_1                2014-09-30  http://hydra.nixos.org/build/39392996
djview4                     2015-08-11  http://hydra.nixos.org/build/39427799
vimNox                      2014-05-23  http://hydra.nixos.org/build/39397012
ttfautohint                 2015-08-06  http://hydra.nixos.org/build/39398330
libraw                      2015-09-24  http://hydra.nixos.org/build/39402271
wxGTK30                     2015-09-20  http://hydra.nixos.org/build/39401871
sbcl_1_2_5                  2015-09-20  http://hydra.nixos.org/build/39426091
prover9                     2014-09-30  http://hydra.nixos.org/build/39406476
rcs                         2015-08-25  http://hydra.nixos.org/build/39392037
gpac                        2015-09-24  http://hydra.nixos.org/build/39399470
virtuoso6                   2014-09-30  http://hydra.nixos.org/build/39398651
xlslib                      2015-09-24  http://hydra.nixos.org/build/39410387
ucommon                     2015-03-27  http://hydra.nixos.org/build/39414040
commoncpp2                  2014-09-30  http://hydra.nixos.org/build/39420117
virtuoso                    2014-09-21  http://hydra.nixos.org/build/39399978
miniHttpd                   2014-09-30  http://hydra.nixos.org/build/39392925
mpack                       2014-09-26  http://hydra.nixos.org/build/39399535
nbd                         2014-09-26  http://hydra.nixos.org/build/39401367
newsbeuter-dev              2014-07-29  http://hydra.nixos.org/build/39406259
gimp_2_8                    2015-09-20  http://hydra.nixos.org/build/39436271
gimp                        2015-09-20  http://hydra.nixos.org/build/39435976
zabbix20.agent              2014-09-30  http://hydra.nixos.org/build/39393242
gst_all_1.gst-plugins-good  2015-09-20  http://hydra.nixos.org/build/39408506
ocaml_4_00_1                2014-09-30  http://hydra.nixos.org/build/39399526
inadyn                      2014-09-30  http://hydra.nixos.org/build/39426389
gst_all_1.gst-plugins-bad   2015-09-20  http://hydra.nixos.org/build/39392970
zabbix.agent                2014-09-30  http://hydra.nixos.org/build/39421412
cmake-2_8                   2015-09-24  http://hydra.nixos.org/build/39399443
liblastfm                   2015-08-06  http://hydra.nixos.org/build/39421812
newsbeuter                  2014-07-29  http://hydra.nixos.org/build/39396605
sdcv                        2014-09-26  http://hydra.nixos.org/build/39412928
2016-09-01 20:39:33 +03:00
José Romildo Malaquias b2a68b73dc mkvtoolnix: 9.3.1 -> 9.4.0 2016-08-30 10:24:06 -03:00
Frederik Rietdijk 357fbe1ccf Merge pull request #18080 from vbgl/qarte-3
qarte: 2.4.0 -> 3.2.0
2016-08-29 21:47:26 +02:00
obadz b74793bd1c Merge branch 'master' into staging
Conflicts:
	pkgs/tools/system/facter/default.nix
2016-08-29 12:44:17 +01:00
Frederik Rietdijk aebabb9871 qarte: create python env 2016-08-29 13:36:50 +02:00
Vincent Laporte 58738e4bc7 qarte: 2.4.0 -> 3.2.0 2016-08-29 13:36:50 +02:00
Gabriel Ebner 6a11b11a7d handbrake: 0.9.9 -> 0.10.5 2016-08-29 08:05:26 +02:00
obadz 3de6e5be50 Merge branch 'master' into staging
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Franz Pletz 4f91c270d2 mpv: 0.18.1 -> 0.19.0 2016-08-25 01:56:35 +02:00
obadz 0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Lluís Batlle i Rossell 9ef3a51379 Adding vlc plugin for firefox.
I really wanted it to substitute the html5 player, or at least the direct
player for mp4/webm files in firefox, but I couldn't make it work. The
formats recognized by the firefox internal player were used in all cases. The
plugin worked for formats unknown by firefox.

https://support.mozilla.org/ca/questions/1089501

Nevertheless, as I wrote the nix recipe, I commit it. It may be of interest to
someone else.
2016-08-23 10:16:37 +02:00
Tuomas Tynkkynen b4749ed96d treewide: Use more makeLibraryPath 2016-08-23 02:56:12 +03:00
Tuomas Tynkkynen 74a3a2cd7e treewide: Use makeBinPath 2016-08-23 01:18:10 +03:00
obadz 24a9183f90 Merge branch 'hardened-stdenv' into staging
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
Lluís Batlle i Rossell b8e215fb50 Making shotcut use qt5 (5.6), not qt55. 2016-08-18 10:22:19 +02:00
Lluís Batlle i Rossell 762a11a276 Updating and fixing shotcut. 2016-08-18 09:41:29 +02:00
Lluís Batlle i Rossell e31951cb88 More dependencies to shotcut 2016-08-18 09:40:51 +02:00
Nikolay Amiantov 3e5bf44aab sip: 4.14.7 -> 4.18.1, drop unused old version 2016-08-17 20:30:51 +03:00
Lluís Batlle i Rossell 5b3c885b35 Shotcut builds, but wants jack1 libs on start. 2016-08-17 17:25:03 +02:00
Frederik Rietdijk 5a501bd828 Remove top-level dbus_python and pythonDBus.
See #11567.

Furthermore, it renames pythonPackages.dbus to pythonPackages.dbus-
python as that's the name upstream uses.

There is a small rebuild but I couldn't figure out the actual cause.
2016-08-16 22:52:37 +02:00
Robin Gloster 33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-16 07:54:01 +00:00
Pascal Wittmann b22fc4c411 Merge pull request #17708 from DamienCassou/fix-byzanz
byzanz: Let it find gstreamer plugins
2016-08-15 10:56:57 +02:00
Damien Cassou 6d27410111 byzanz: Let it find gstreamer plugins 2016-08-14 17:23:01 +02:00
Frederik Rietdijk 7986b718f3 Remove pycairo from top-level
See #11567.
2016-08-14 13:52:42 +02:00
Frederik Rietdijk 6842a24b21 Remove top-level pyqt4
See #11567.
2016-08-14 12:38:01 +02:00
Robin Gloster 708653a634 kino: disable format hardening 2016-08-03 20:08:54 +00:00
Robin Gloster 1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen 21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Robin Gloster 63c7b4f9a7 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-31 20:51:34 +00:00
Michele Guerini Rocco cf8c16e3aa mkvtoolnix: 9.2.0 -> 9.3.1 (#17321) 2016-07-28 04:00:04 +02:00
Robin Gloster f222d98746 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-25 12:47:13 +00:00
Bjørn Forsman 2451680603 pitivi: 0.95 -> 0.96 (fixes startup error) (#17228)
* pitivi: 0.95 -> 0.96 (fixes startup error)

The upgrade of gtk3 to v3.20 broke pitivi, causing it to segfault after
the user closes the Welcome dialog. This release fixes that.

New dependencies: gst-transcoder and dbus.
(pitivi imports dbus if it finds the GNOME_DESKTOP_SESSION_ID
environment variable. Without dbus there will be some ugly errors for
GNOME desktop users.)

* pitivi: use wrapGAppsHook instead of makeWrapper

Allows us to remove preFixup.

* pitivi: move meta section to the end

Like most Nix package files are written.
2016-07-25 06:05:55 +02:00
Rok Garbas b8ab178e4c
obs-studio: libX11.so was missing at runtime 2016-07-25 04:20:49 +02:00
Robin Gloster 203846b9de Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-19 10:37:02 +00:00
Tomas Hlavaty 16ad19887a openshot-qt: init at 2.0.7 2016-07-17 18:58:58 +02:00
Robin Gloster 5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Louis Taylor 3e582d39ef mpv: 0.17.0 -> 0.18.1 2016-07-12 23:58:15 +01:00
Nikolay Amiantov f57fe6c2f9 simplescreenrecorder: fix paths to LD_PRELOADed part 2016-07-11 01:42:08 +03:00
Nikolay Amiantov e4aace7028 qt-recordmydesktop: init at 0.3.8-svn602 2016-07-10 22:57:00 +03:00
Nikolay Amiantov 7e0a6dd827 gtk-recordmydesktop: init at 0.3.8-svn602 2016-07-10 22:56:59 +03:00
Nikolay Amiantov 29d570ef82 recordmydesktop: use ALSA backend 2016-07-10 22:46:04 +03:00
Franz Pletz 64ab827873 vlc: 2.2.3 -> 2.2.4 (security)
Fixes CVE-2016-5108.
2016-07-10 10:48:10 +02:00
José Romildo Malaquias 726059d4e8 mkvtoolnix: 8.9.0 -> 9.2.0 2016-07-09 12:14:01 -03:00
Robert Helgesson c071831b8b handbrake: depend on hicolor_icon_theme
This avoids conflicts on `share/icons/hicolor/icon-theme.cache`.
2016-07-09 13:06:14 +02:00
Nikolay Amiantov b3e27962aa bomi: fix compilation, move to new Qt 2016-07-02 15:16:42 +03:00
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
Robin Gloster 8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00: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
Robin Gloster 8f1e9d91be subtitleeditor: disable format hardening 2016-05-31 12:57:57 +00:00
Robin Gloster 2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00: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
Franz Pletz f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +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
Robin Gloster c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00: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
Robin Gloster d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00: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
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