Commit Graph

41 Commits

Author SHA1 Message Date
Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
R. RyanTM
91c187fb6c shotcut: 19.07.15 -> 19.08.16
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/shotcut/versions
2019-08-20 17:40:07 -07:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
David McKay
cc1f808891 shotcut: use qt5's mkDerivation 2019-08-09 10:27:39 -04:00
Bart Brouns
ca90de12ef shotcut: 19.02.28 -> 19.07.15 2019-07-20 12:54:53 +02:00
Frank Doepper
ed76b08906 shotcut: 18.12.23 -> 19.02.28 (#56875)
fixes build with qt 5.12, apparently
2019-03-08 23:13:33 +01:00
R. RyanTM
2745ab0dcf shotcut: 18.11.18 -> 18.12.23
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/shotcut/versions
2019-01-02 00:27:03 -08:00
R. RyanTM
f751f85b63 shotcut: 18.10.08 -> 18.11.18
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/shotcut/versions
2018-12-18 14:50:22 -05:00
R. RyanTM
820e2fd72f shotcut: 18.09.16 -> 18.10.08
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/shotcut/versions
2018-10-14 09:00:05 +02:00
R. RyanTM
2ed26f5838 shotcut: 18.08.14 -> 18.09.16 (#46963)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/shotcut/versions
2018-09-21 17:56:47 +02:00
Frank Doepper
c49baf9da4 shotcut: 18.08 -> 18.08.14 (#45862) 2018-08-31 20:00:07 +02:00
Frank Doepper
4082e94b5c shotcut: 18.06.02 -> 18.08 (#44463)
and fix SHOTCUT_VERSION
2018-08-05 18:19:42 +02:00
Frank Doepper
0127c4295f shotcut: nicer patch url 2018-06-20 16:15:51 +02:00
Frank Doepper
e0d0460d07 shotcut: 18.06.02 -> 18.05.08
also patched to build with qt511, see
https://github.com/mltframework/shotcut/issues/590
2018-06-20 14:00:31 +02:00
Frank Doepper
07723f14bb shotcut: 18.03.06 -> 18.05.08 (#40887) 2018-05-22 00:10:32 +02:00
Frank Doepper
c12caf34d2 shotcut: add myself as maintainer 2018-04-26 21:42:22 +02:00
Frank Doepper
489b0a5f47 shotcut: 17.11 -> 18.03.06 2018-04-26 21:41:30 +02:00
Frank Doepper
440ce4cfa1 shotcut: 17.09 -> 17.11 2017-11-11 17:59:13 +01:00
Robin Gloster
40ed226507 treewide: mark a bunch of failing builds as broken
(cherry picked from commit 23fdbaa37599f490435056b9865023870656571b)
[dezgeg: Un-mark shotcut, tokei & uchiwa that do build on master]
2017-10-01 00:26:52 +03:00
Robin Gloster
1a681a6ecb
shotcut: 17.02 -> 17.09
fixes the previously broken build
2017-09-27 00:51:20 +02:00
Cillian de Róiste
2244b1815d shotcut: fix homepage 2017-08-03 23:03:04 +02:00
Thomas Tuegel
c816bbc8a8
qt5: remove makeQtWrapper 2017-06-18 08:44:42 -05:00
Thomas Tuegel
210f688802
qt5: rename qmakeHook to qmake 2017-06-18 08:41:57 -05:00
Lluís Batlle
8389060731 Updating shotcut to 17.02. 2017-02-02 10:25:47 +01:00
Lluís Batlle i Rossell
8d5b2e66bd Updating shotcut to 17.01 and fixing its jobs 2017-01-28 20:12:51 +01:00
Lluís Batlle i Rossell
20465bedee Updating shotcut and melt. 2017-01-28 20:12:51 +01:00
Bjørn Forsman
b48dafee8d shotcut: 16.08 -> 16.10 2016-10-08 18:25:43 +02:00
Tuomas Tynkkynen
b4749ed96d treewide: Use more makeLibraryPath 2016-08-23 02:56:12 +03: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
e31951cb88 More dependencies to shotcut 2016-08-18 09:40:51 +02:00
Lluís Batlle i Rossell
5b3c885b35 Shotcut builds, but wants jack1 libs on start. 2016-08-17 17:25:03 +02:00
Nikolay Amiantov
577ea10f68 shotcut: move to qmakeHook
This reverts commit dbc1605dea.
2016-04-20 18:55:50 +03: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
Thomas Tuegel
ccdbc22836 shotcut: Qt 5 infrastructure update 2015-12-20 07:56:43 -06:00
Domen Kožar
b7f15c43da fix evals /cc @ttuegel 2015-05-10 13:46:32 +02:00
Tobias Geerinckx-Rice
c64257b8e5 Fix user-facing typos (mainly in descriptions) 2014-12-30 03:31:03 +01:00
Vladimír Čunát
b65c8ffc37 shotcut: mark as broken for now 2014-12-10 15:36:07 +01:00
Cillian de Róiste
5349ff32a8 shotcut: update from 14.08 to 14.09 2014-09-13 14:02:41 +02:00
Cillian de Róiste
4143d9dfef shotcut: remove obsolete patch 2014-08-03 11:46:08 +02:00
Cillian de Róiste
cc3b5291d9 shotcut: update from 14.07 to 14.08 2014-08-03 11:44:41 +02:00
Cillian de Róiste
ab7349711b Add Shotcut: A free, open source, cross-platform video editor
Includes a patch which has already been applied upstream:
mltframework/shotcut#31
2014-07-27 12:53:57 +02:00