3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

59 commits

Author SHA1 Message Date
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 cd72ee1a19
kde5.plasma-workspace: remove unused startkde.patch 2016-06-22 19:49:48 +02:00
Vladimír Čunát e757404555 Merge branch 'master' into staging
Hydra nixpkgs: ?compare=1279790
2016-06-19 12:33:04 +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
Thomas Tuegel ed46b468b0 Fix Travis build failure caused by Qt/KDE documentation
The comments in the Qt/KDE packages caused a spurious Travis build
failure because they appeared to refer to `<nixpkgs>`.
2016-06-17 12:21:19 -05:00
Thomas Tuegel 592dcbc4bf Fix evaluation error in Qt/KDE packages
For now, the source hashes will continue to be stored in the Nixpkgs
tree. The package update instructions are updated.
2016-06-17 09:47:16 -05:00
Thomas Tuegel cc5adac6f6 kde5.plasma: 5.6.4 -> 5.6.5
The generated source hashes are now stored outside the Nixpkgs tree.
2016-06-16 15:16:49 -05:00
Thomas Tuegel d975d5da8b kde5.khelpcenter: moved from Plasma 5.6.4 to Applications 16.04.2 2016-06-16 15:16:49 -05:00
Thomas Tuegel 8dae2eddcf kde5.kdeplasma-addons: add missing ksysguard dependency 2016-06-08 14:58:35 -05:00
Thomas Tuegel b214c6b64f kde5.plasma-desktop: add missing ksysguard dependency 2016-06-08 13:51:25 -05:00
Thomas Tuegel bcd6e295d7 kde5.plasma-workspace: add iso-codes dependency
Fixes #16040. CMake finds the iso-codes dependency through pkgconfig.
2016-06-08 10:26:24 -05:00
Thomas Tuegel 80b1cf6633 kde5.plasma-integration: init at 5.6.4 2016-06-06 16:08:33 -05:00
Vladimír Čunát a03ff26080 Merge #15639: xorg-server 1.17.4 -> 1.18.3
... and fglrxCompat to maintain compatibility.
2016-06-05 00:52:06 +02:00
Vladimír Čunát 69cc0a7bc5 xf86-input-evdev: split dev output 2016-05-23 13:02:55 +02:00
Tuomas Tynkkynen 1819181726 treewide: Make explicit that 'dev' output of xorgserver is used 2016-05-19 10:04:41 +02:00
Frederik Rietdijk 9bb021898e KDE5 Plasma 5.6.3 -> 5.6.4 2016-05-14 14:26:23 +02:00
Thomas Tuegel cc6a7d5567 plasma-workspace: remove qtquick1 and qtwebkit inputs 2016-05-10 20:09:26 -05:00
Thomas Tuegel 6011898cb5 plasma-desktop: remove qtquick1 input 2016-05-10 20:09:02 -05:00
Thomas Tuegel 094b945b0c libksysguard: remove qtwebkit input 2016-05-10 20:08:51 -05:00
Thomas Tuegel bad36556fe kde5.plasma-workspace: update import path patch 2016-04-30 12:20:50 -05:00
Thomas Tuegel ccd46cc4b5 Revert "kde5_latest.plasma-workspace: remove patches"
This reverts commit ffc217883c.
2016-04-30 12:20:50 -05:00
Thomas Tuegel fd272ea970 kde5.systemsettings: propagate all buildInputs 2016-04-30 12:20:43 -05:00
Thomas Tuegel a196901566 pkgs/desktops/kde-5/plasma-5.6: remove obsolete setup-hook.sh 2016-04-30 12:20:43 -05:00
Thomas Tuegel d4842648ce kde5.powerdevil: propagate buildInputs 2016-04-30 12:20:43 -05:00
Thomas Tuegel 758e28728e kde5.polkit-kde-agent: propagate all buildInputs 2016-04-30 12:20:42 -05:00
Thomas Tuegel ee5cc8f5ce kde5.plasma-pa: propagate all buildInputs 2016-04-30 12:20:42 -05:00
Thomas Tuegel a022895db1 kde5.plasma-nm: propagate all buildInputs 2016-04-30 12:20:42 -05:00
Thomas Tuegel 9f0feebeeb kde5.plasma-mediacenter: propagate all buildInputs 2016-04-30 12:20:42 -05:00
Thomas Tuegel 747daca407 kde5.plasma-desktop: propagate all buildInputs 2016-04-30 12:20:41 -05:00
Thomas Tuegel cfc28505b5 kde5.oxygen: propagate all buildInputs 2016-04-30 12:20:41 -05:00
Thomas Tuegel 8fb25cb4c2 kde5.milou: propagate all buildInputs 2016-04-30 12:20:41 -05:00
Thomas Tuegel 5addd165de kde5.libksysguard: propagate all buildInputs 2016-04-30 12:20:40 -05:00
Thomas Tuegel 56dd0c2541 kde5.libkscreen: propagate all buildInputs 2016-04-30 12:20:40 -05:00
Thomas Tuegel 0dc8b5f32c kde5.kwrited: propagate all buildInputs 2016-04-30 12:20:40 -05:00
Thomas Tuegel e4d3699976 kde5.kwin: propagate all buildInputs 2016-04-30 12:20:39 -05:00
Thomas Tuegel 27aca6670c kde5.kwayland: propagate all buildInputs 2016-04-30 12:20:39 -05:00
Thomas Tuegel bb74e9afa5 kde5.ksysguard: propagate all buildInputs 2016-04-30 12:20:39 -05:00
Thomas Tuegel b63b3485a0 kde5.ksshaskpass: propagate all buildInputs 2016-04-30 12:20:38 -05:00
Thomas Tuegel 483ed9427f kde5.kscreen: propagate all buildInputs 2016-04-30 12:20:38 -05:00
Thomas Tuegel 21710ee012 kde5.kscreenlocker: propagate all buildInputs 2016-04-30 12:20:38 -05:00
Thomas Tuegel 289e0bab8e kde5.kmenuedit: propagate all buildInputs 2016-04-30 12:20:38 -05:00
Thomas Tuegel a9c93158f2 kde5.kinfocenter: propagate all buildInputs 2016-04-30 12:20:37 -05:00
Thomas Tuegel e3e387f5bd kde5.khotkeys: propagate buildInputs 2016-04-30 12:20:37 -05:00
Thomas Tuegel 188ad5dbb6 kde5.khelpcenter: propagate all buildInputs 2016-04-30 12:20:37 -05:00
Thomas Tuegel b6aeb8e011 kde5.kdeplasma-addons: propagate all buildInputs 2016-04-30 12:20:36 -05:00
Thomas Tuegel a43ef07c72 kde5.kde-gtk-config: propagate all buildInputs 2016-04-30 12:20:36 -05:00
Thomas Tuegel 9b5161e3aa kde5.kde-cli-tools: propagate all buildInputs 2016-04-30 12:20:36 -05:00
Thomas Tuegel 3f4e8ab467 kde5.breeze-qt5: propagate all buildInputs 2016-04-30 12:20:35 -05:00
Thomas Tuegel ff7c15b41d kde5.bluedevil: propagate all buildInputs 2016-04-30 12:20:35 -05:00