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

84 commits

Author SHA1 Message Date
Nikolay Amiantov 6554997eaa zeal: move to qmakeHook
This reverts commit 9cfc8d94bb.
2016-04-20 18:55:50 +03:00
aszlig 9cfc8d94bb
zeal: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of zeal override
the whole configurePhase, so this hook isn't run at all.

This fixes the build of zeal and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Tobias Geerinckx-Rice 7a1f76bc5f man-pages: 4.04 -> 4.05 2016-03-16 21:10:20 +01:00
Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Vladimír Čunát c979012631 man-only packages: fixup after stdenv changes
Thanks to @avnik for notification.
The stdenv now auto-removes developer-only documentation
unless explicitly indicated, which wasn't a good fit for these packages.
2016-01-28 13:55:37 +01:00
Tobias Geerinckx-Rice 9fb8020e4e Add version attribute where maintainers |= nckx
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
2016-01-25 17:35:21 +01:00
Brian McKenna 3b62c8cdc8 zeal: 0.1.1 -> 0.2.1 2016-01-13 15:06:42 +11:00
Tobias Geerinckx-Rice ddb6e8e69c man-pages: 4.03 -> 4.04 2016-01-01 21:43:20 +01:00
Thomas Tuegel 700546fd12 zeal: Qt 5 infrastructure update 2015-12-20 07:56:42 -06:00
Tobias Geerinckx-Rice ef8dde9eef man-pages-posix: correct meta.homepage 2015-12-06 23:44:13 +01:00
Tobias Geerinckx-Rice 968986547b man-pages 4.02 -> 4.03 2015-12-06 23:44:13 +01:00
Eelco Dolstra 9aa1cb6c59 pthread-man-pages: Remove
As far as I can tell, the man-pages package provides documentation for
every function provided by pthread-man-pages except
pthread_mutexattr_setkind_np, which no longer appears in the Glibc
headers. So let's ditch it.
2015-12-04 12:19:44 +01:00
Tobias Geerinckx-Rice 2798b02ad0 Convert some *Flags from strings to lists 2015-11-26 23:45:31 +01:00
Vladimír Čunát 88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Tobias Geerinckx-Rice a9fc51968f man-pages: 4.01 -> 4.02 2015-08-11 21:08:43 +02:00
Tobias Geerinckx-Rice 9bedb70520 man-pages: 4.00 -> 4.01 2015-07-25 21:54:18 +02:00
lethalman 53f5f6906d Merge pull request #8009 from dnhgff/zeal-doc-xlibs
zeal: add xcb-util-keysyms to buildInputs
2015-06-01 16:00:43 +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
dnhgff da516bacea zeal: add xcb-util-keysyms to buildInputs 2015-05-26 09:19:30 -07:00
Sven Keidel 22c8244605 zeal: update to 0.1.1 (close #7858) 2015-05-18 13:46:09 +02:00
Tobias Geerinckx-Rice 5dae1f659e man-pages 3.83 -> 4.00 2015-05-10 13:46:02 +02:00
William A. Kennington III 00df204c82 Merge remote-tracking branch 'upstream/master' into staging 2015-05-01 15:57:09 -07:00
Joachim Fasting bf7ad2d84f meta.description fixups
Mostly scripted substitutions with a couple of subjective enhancements.
2015-04-30 18:17:42 +02:00
Vladimír Čunát 30f31c9afc Merge 'master' into staging
(relatively simple conflicts)
2015-04-26 22:52:08 +02:00
Joachim Fasting 8488d133f3 meta.licenses -> license 2015-04-21 23:10:07 +02:00
Tobias Geerinckx-Rice 2ae207718c man-pages 3.82 -> 3.83 2015-04-20 15:00:39 +02:00
Tobias Geerinckx-Rice ccee24ebf7 man-pages 3.78 -> 3.82 2015-04-17 00:46:21 +02:00
Thomas Tuegel 5d1f6ad57c qt5: make qt-5.4.1 default 2015-03-24 17:14:56 -05:00
Sven Keidel 92d4ec2ce8 zeal: new package 2015-01-28 00:02:50 +01:00
Tobias Geerinckx-Rice b7b6c93efd Update (kernel) manpages 3.75 -> 3.78 2015-01-26 19:57:22 +01:00
Aristid Breitkreuz d157865b65 stdman: improvements to package description 2014-11-17 22:13:44 +01:00
James ‘Twey’ Kay bb999776f3 New package: stdman 2014-11-17 22:13:44 +01:00
Nixpkgs Monitor 46f498bf91 manpages: update from 3.74 to 3.75 2014-10-27 07:16:33 +02:00
Aristid Breitkreuz fcad7e7053 manpages: update from 3.73 to 3.74 2014-10-07 21:50:40 +02:00
aszlig 4d92a0675b
linux-man-pages: Update to version 3.73.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-02 10:25:12 +02:00
Mateusz Kowalczyk 5d264cc00d manpages: update from 3.71 to 3.72 2014-09-22 01:32:48 +01:00
Pascal Wittmann 8d67b9a240 transformed meta.maintainers of some packages into lists 2014-09-13 13:52:02 +02:00
Rüdiger Sonderfeld f61fb466eb man-pages: Update to 3.71. 2014-08-24 10:15:08 +02:00
Eelco Dolstra c37057240f man-pages: Update to 3.70 2014-08-19 11:46:08 +02:00
Eelco Dolstra cce948e165 man-pages: Update to 3.64 2014-04-16 18:43:38 +02:00
Evgeny Egorochkin 901a2fc581 manpages: update from 3.62 to 3.63 2014-04-03 07:59:39 +03:00
Vladimír Čunát d4da7e5e4f man-pages-posix: update 2003a -> 2013-a 2014-03-16 17:39:50 +01:00
Evgeny Egorochkin 1b2902f8eb manpages: update from 3.61 to 3.62 2014-03-13 08:53:09 +02:00
Evgeny Egorochkin e38341fee2 manpages: update from 3.60 to 3.61 2014-03-01 05:13:49 +02:00
Ricardo M. Correia 2539acf351 manpages: Update from 3.54 -> 3.60. 2014-02-18 20:23:59 +00:00
Petr Rockai 4124bb9ff5 Adopt more packages. 2014-01-28 18:11:00 +01:00
Eelco Dolstra f007850b6e man-pages: Update to 3.54 2013-10-23 10:36:21 +02:00
Eelco Dolstra 774634a248 man-pages: Update to 3.53 2013-08-07 17:12:32 +02:00
Eelco Dolstra 419413ac52 man-pages: Update to 3.50 2013-03-27 23:00:02 +01:00