Commit graph

11 commits

Author SHA1 Message Date
William A. Kennington III 5cfe893cc4 Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream
This is a partial commit from staging in an attempt to make merges
smaller.
2015-09-23 14:35:36 -07:00
Vladimír Čunát 76ef7a93e3 Merge: xlibs and x11 attribute cleanup
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
William A. Kennington III 1bc98b2e36 boost: Reduce the number of supported versions 2015-09-17 15:40:32 -07:00
Peter Simons 8836c58dc0 Remove all references to haskell-ng and haskellngPackages from Nixpkgs. 2015-09-15 16:11:58 +02: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
Thomas Tuegel 6c1d645bd0 kde5: propagate plugin and QML dependencies 2015-06-25 09:03:42 -05:00
Thomas Tuegel 8862d8d9c9 autonix: JSON manifest format 2015-06-25 09:03:40 -05:00
Thomas Tuegel 0aa8e64967 kde5: JSON manifest format 2015-06-25 09:03:40 -05:00
Thomas Tuegel 95b02f6459 kf510.kinit: fix library path 2015-06-13 10:12:13 -05: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
Thomas Tuegel c80638905d Upgrade to kde-frameworks-5.10 2015-05-15 05:48:20 -05:00