Commit graph

22 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
Robin Gloster bbf133d07e
Merge remote-tracking branch 'upstream/master' into openssl-1.1 2019-08-21 14:52:21 +02:00
Robin Gloster f4fc845e5b
Merge remote-tracking branch 'upstream/master' into openssl-1.1 2019-08-21 14:25:13 +02:00
Robin Gloster 9135412b63
golden-cheetah: build with newer qt5 2019-08-21 01:40:25 +02: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
Chris Rendle-Short 9081eefb9a golden-cheetah: use qt5's mkDerivation
See #65399
2019-08-08 22:34:05 +10:00
Andreas Rammhold 6ed53a73be
golden-cheetah: 3.4 -> 3.5-DEV1903
This version bumps allows us to use a current QT5 version.
2019-07-29 21:25:15 +02:00
Piotr Bogdan 12ac71caca golden-cheetah: link with libz explicitly 2019-01-04 21:44:19 +00:00
Florian Klink bb51ba9bb8 golden-cheetah: add desktop item and icon 2018-09-26 22:21:01 +02:00
Markus Kowalewski e350e31691
golden-cheetah: add license 2018-09-01 16:11:19 +02:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Orivej Desh c12fe7416e golden-cheetah: disable parallel building
qmake does not support translations in resources.
2017-12-07 08:52:42 +00: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
Thomas Tuegel c7dd8a707b
golden-cheetah: fix build
- Use Qt 5.6 to fix compile error.
- Run preInstall and postInstall hooks to fix linking error.
2017-04-10 13:51:45 -05:00
Ollie Charles 72a002f9d6 golden-cheetah: Switch to 3.4 stable 2017-01-21 12:26:30 +00:00
Tuomas Tynkkynen b691bc22ef golden-cheetah: Use 'dev' output of qttools 2016-08-31 19:37:05 +03:00
Tobias Geerinckx-Rice e252e59a1a
golden-cheetah: fix version format and tarball name 2016-04-24 22:03:55 +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
Ollie Charles a74aa5bce7 golden-cheetah: Fix evaluation
For now, disable the Dropbox configuration.
2016-04-21 12:14:12 +01:00
Nikolay Amiantov b845596f66 golden-cheetah: use qmakeHook 2016-04-21 03:13:04 +03:00
Oliver Charles 904204ffda golden-cheetah: init at V4.0-DEV1603 2016-04-17 11:26:44 +01:00