1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 06:01:15 +00:00
Commit graph

47 commits

Author SHA1 Message Date
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
Eelco Dolstra bb43b542d6 pykde4: Fix gcc 5 build failure 2016-03-11 12:53:14 +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
Tobias Geerinckx-Rice 32d40f0f98 Remove no longer (or never) referenced patches
55 files changed, 6041 deletions. Tested with `nix-build -A tarball`.
2016-01-24 02:02:21 +01:00
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Bjørn Forsman ee807863ee system-config-printer: align attrname with pkgname
s/system_config_printer/system-config-printer/
2016-01-03 15:18:04 +01:00
Tobias Geerinckx-Rice 99075fb402 saneBackends{,Git} -> sane-backends{,-git}
Fixes xsane evaluation.
2016-01-03 03:31:38 +01:00
Luca Bruno bbcf127c7c Fix evaluation after merge in multi-outputs 2015-12-14 10:29:29 +01:00
Vladimír Čunát 8c8aba5d36 kde-runtime: fix with multiple outputs after 7477a7cd 2015-12-04 12:52:36 +01:00
Vladimír Čunát 81b9cc6f54 html-tidy: unify with its drop-in replacement tidy-html5
- the original project has been unmaintained for years
- some dependants needed to be patched due to renamed headers
  https://github.com/htacg/tidy-html5/issues/326#issuecomment-160329114
- separate tidy-html5 package was removed, as since the 5.0.0 version
  it's meant as a successor to both, and library name got back
  from libtidy5.so to libtidy.so
  https://github.com/htacg/tidy-html5/issues/326#issuecomment-160314666

/cc committers to tidy-html5: @edwjto and @zimbatm.
2015-11-29 10:32:02 +01:00
Vladimír Čunát 3c397e8ec8 taglib: bring back 1.9 to fix kde4.kdemultimedia
/cc #11097.
2015-11-20 10:44:00 +01:00
Vladimír Čunát 1640e4263b kde4: use cmake-2.8 instead of default, /cc #11097
This fixes kgamma breakage after cmake-3.4 update, and prevents future rot.
2015-11-20 10:31:16 +01:00
Domen Kožar 7477a7cdda kde: add glib include paths to NIX_CFLAGS_COMPILE
(cherry picked from commit 350ffdcc84)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-10-25 20:03:09 +01:00
Domen Kožar 87b4bdfa24 kde4.kde_runtime: depend on glib due to networkmanager 2015-10-25 12:59:11 +01:00
Thomas Tuegel 2e0589b4ca kde414: build with kdelibs-4.14.12
Upstream changes to the build system required adjusting many packages'
dependencies. On the Nixpkgs side, we no longer propagate the dependency
on cmake (to reduce closure size), so downstream dependencies had to be
adjusted for most packages that depend on kdelibs.
2015-09-27 15:08:12 -05:00
Eelco Dolstra d24a5a49ea kde-workspace: Disable gpsd dependency
This dependency causes substantial system bloat: gpsd depends on
pythonFull, which in turn depends on tcl/tk, etc.
2015-07-26 22:46:24 +02:00
William A. Kennington III b07929b0a3 Use libpulseaudio instead of pulseaudio 2015-05-29 14:32:56 -07:00
Thomas Tuegel aa5791f7ad kde4.kopete: fix build 2015-05-07 21:49:54 -05:00
Domen Kožar dfd4ada456 kde4: fix cantor build 2015-05-05 13:05:54 +02:00
Joachim Fasting bf7ad2d84f meta.description fixups
Mostly scripted substitutions with a couple of subjective enhancements.
2015-04-30 18:17:42 +02:00
Thomas Tuegel c0d5cd0ff9 poppler: fix build of Qt 4 and Qt 5 wrappers
The autoconf build system for poppler does not support building the
wrappers separately, so this slightly enlarges the size of closures. To
compensate, the command-line utilities have been separated into their
own package.
2015-04-02 09:51:44 -05:00
Karn Kallio 3661c7a842 kde-4.14 smokegen: prevent cmake from removing rpath on install
Signed-off-by: Domen Kožar <domen@dev.si>
2015-03-30 13:37:16 +02:00
Karn Kallio b09a6573a0 indilib version advance; older sources no longer available 2015-03-29 15:29:01 -05:00
Karn Kallio 52a6c8496b complete removal of obsolete kdelibs derivation 2015-03-28 17:20:25 -05:00
Thomas Tuegel c918f57ebb kde4: remove obsolete kdelibs derivation 2015-03-21 18:54:29 -05:00
Thomas Tuegel 2c4c712a70 kde4: use kdelibs from kdeApps_stable
Upstream is releasing bugfixes to kdelibs only through KDE Applications
releases, so this is the correct way to get updates until we discontinue
KDE 4. This also ensures that kdeApps and kde4 are using the same
version of kdelibs; different versions appear to be causing integration issues.
2015-03-21 18:46:54 -05:00
Peter Simons ec6b82a0c2 Merge branch 'master' into staging. 2015-01-19 18:41:17 +01:00
Evgeny Egorochkin e92c942d1d KDE4: correctly propagate user env packages 2015-01-18 08:10:25 +02:00
Evgeny Egorochkin 5c496422e6 kde4: fix silent missing kde-workspace dependencies needed for kfontinst and kfontview 2015-01-18 07:13:53 +02:00
Eric Seidel 88eae46455 rename occurrences of gcc.gcc to gcc.cc 2015-01-14 20:47:49 -08:00
Evgeny Egorochkin b6e68d24ea KDE4: update 4.14.1 to 4.14.3 2014-12-24 03:40:20 +02:00
Vincent Laporte 81a2b58c39 nixpkgs: remove redundant attribute sip
Because:

 1. It is a mere alias of `pythonPackages.sip`
 2. It is usually not needed since propagated by `pyqt4`
 3. It makes it easy to have a packages depend on two different versions
 of sip
2014-12-23 19:37:21 +01:00
Eelco Dolstra 0e8373143e kdepimlibs: Get rid of a dependency on boost.dev 2014-12-15 17:54:06 +01:00
Vladimír Čunát 15b9626a3d kde: fix CVE-2014-8600 by upstream patches
https://www.kde.org/info/security/advisory-20141113-1.txt
I couldn't find kio-extras, so I hope we don't have it disguised somewhere.
2014-12-10 19:38:50 +01:00
Domen Kožar 4aa3eec330 Merge branch 'master' into staging
Conflicts:
	pkgs/development/libraries/fontconfig/default.nix
2014-12-07 14:02:48 +01:00
Bjørn Forsman 289ec3b5aa html-tidy: align attrname with pkgname
htmlTidy => html-tidy. Keep copy of old attribute for backward
compatibility.
2014-12-06 17:01:05 +01:00
Evgeny Egorochkin 4672aadce2 KDE4: fix kdepim build 2014-12-04 10:22:27 +02:00
William A. Kennington III 5825d82e5f boost: Pin packages to 1.56 2014-11-30 05:31:02 -08:00
Thomas Tuegel dfaa39db41 polkit-qt-1: Qt 5 support
polkit-qt-1 is upgraded to the latest version, which supports Qt 5. The
attributes are also renamed to differentiate the Qt 4 and Qt 5
branches. The prior naming scheme differentiated between polkit-qt-1 and
polkit-qt, but we no longer package the latter.
2014-11-20 11:10:39 -06:00
wmertens 6320c4a980 kde-workspace: Use automatic version (close #4383)
See https://github.com/NixOS/nixpkgs/pull/4265#discussion_r18430068

This should work but I didn't test it 😁
2014-10-05 17:05:40 +02:00
Vladimír Čunát 85fba5fdbd kde-4.14: fix kactivities download
It was not released with 4.14.
http://osdir.com/ml/kde-commits/2014-07/msg02039.html
2014-09-27 18:16:26 +02:00
ambrop7@gmail.com 0e8e45f3ab kde-4.14: Make it all build. 2014-09-24 23:48:39 +02:00
ambrop7@gmail.com 446a3d7806 kde-4.14: Adjust fixed output hashes. 2014-09-24 23:48:39 +02:00
ambrop7@gmail.com 91a41170e4 kde-4.14: Initial porting.
Nix evaulation succeeds (but probably not building everything).
2014-09-24 23:48:39 +02:00
ambrop7@gmail.com 35d5888ca6 kde-4.14: Fix source for module subdirectory packages. 2014-09-24 23:48:39 +02:00
ambrop7@gmail.com 1d8a197cba kde: Some tweaks to kde-manifest.sh
- Allow packages with different versions than $release (kde-workspace)
- Extra checks

This is a copy of 41faadbcce
but for 4.14.
2014-09-24 23:48:38 +02:00
ambrop7@gmail.com 8fef5ed675 kde: Copy 4.12 to 4.14 as a base" 2014-09-24 23:48:38 +02:00