philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

1025 commits

Author SHA1 Message Date
Vladimír Čunát 52461be8c5 port gvfs from gnome2 2013-02-21 20:18:12 +01:00
Vladimír Čunát 99bc034a04 gnome3.gconf: migrate 2013-02-21 20:09:10 +01:00
Vladimír Čunát 4b3e2531c9 update at-spi 2013-02-21 19:54:55 +01:00
Vladimír Čunát 713b420be8 removed some libraries that are up-to-date on the top level 2013-02-21 18:15:37 +01:00
Vladimír Čunát 90fcea2a25 Merge branch 'x-updates' into vlada/gnome3-notg 2013-02-21 18:12:15 +01:00
Vladimír Čunát 0d72174dbd Merge branch stdenv-updates into x-updates 
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
 2013-02-21 12:43:00 +01:00
Vladimír Čunát e979d7ad2f vlada/xfce 
Major Xfce refactoring, also adding versions 4.10.*

Signed-off-by: Vladimír Čunát <vcunat@gmail.com>
 2013-02-21 12:16:51 +01:00
Lluís Batlle i Rossell bcbf9472ea Merge remote-tracking branch 'central/master' into x-updates 2013-02-18 13:49:11 +01:00
Shea Levy c42d77aa35 Merge remote-tracking branch 'upstream/master' into stdenv-updates 2013-02-17 08:19:40 -05:00
Shea Levy 8d35dabd65 e17.embryo: Fix meta. 
Meta attributes, if they are lists, must be lists of strings.
 2013-02-16 16:38:46 -05:00
Eelco Dolstra 2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Vladimír Čunát f536aa7e7a Merge pull request #293 from vcunat/vlada/intltool 
unify intltool
 2013-02-14 12:29:29 -08:00
Александр Цамутали 1c515819ef e17: Update libs to 1.7.5, enlightenment to 0.17.1. 2013-02-10 21:23:45 +04:00
Vladimír Čunát 9abff7a85e Major Xfce refactoring, also adding versions 4.10.* 
Please, comment on #296.
 2013-02-09 18:38:26 +01:00
Vladimír Čunát 35a927149f Merge branch 'master' into x-updates 
Conflicts (both messed with mesa):
	pkgs/top-level/all-packages.nix
 2013-02-02 21:11:00 +01:00
Vladimír Čunát 94cc7c5c83 gtkglext: fix by using pangox_compat 2013-02-02 14:39:21 +01:00
Vladimír Čunát 38ee738b8a unify intltool 
IMHO:
	- It's no longer GNOME package.
	- It seems best for everyone to use the newest version.
 2013-01-31 16:43:52 +01:00
Eelco Dolstra 8317cd1f14 kde-3: Remove 
KDE 3 hasn't built in a long time.  Also remove six, the only package
with a dependency on KDE 3.
 2013-01-29 12:43:53 +01:00
Eelco Dolstra 0a47a28f1d Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-22 23:23:53 +01:00
Eelco Dolstra 5bb548d2e4 Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00
Eelco Dolstra eeda226b02 Merge branch 'master' into systemd 2013-01-15 12:11:07 +01:00
Mathijs Kwik 1610c526f9 xfce4 terminal: fix url 2013-01-13 14:30:55 +01:00
Peter Simons b33ad366a1 Merge branch 'master' into stdenv-updates. 2013-01-11 15:46:10 +01:00
Matej Cotman 260cdd582e xfce4-notifyd: add new package 2013-01-09 18:11:20 +01:00
Eelco Dolstra ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs 
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
 2012-12-28 19:20:09 +01:00
Eelco Dolstra 179df95090 Merge remote-tracking branch 'origin/master' into systemd 2012-12-10 12:39:14 +01:00
Eelco Dolstra 5553546c21 Remove a bunch of unreferenced files 
Plus a small number of obsolete packages (like old versions of qemu).
 2012-11-29 13:43:37 +01:00
Eelco Dolstra 7194db80e9 Merge branch 'master' into systemd 2012-11-23 18:06:49 +01:00
Cillian de Róiste d900c86302 Add python-rsvg 
this is required by solfrege, key-mon, and probably many more gtk applications
 2012-11-11 18:11:37 +01:00
Cillian de Róiste 60898eb064 Copy bonobo defs 
python-rsvg will fail to build if if can't find the bonobo defs files
 2012-11-11 18:03:35 +01:00
Eelco Dolstra 9322bee988 Use systemd instead of udev, and don't use consolekit 2012-11-06 13:02:11 +01:00
Eduard Carreras 4be6b18fdf Fix waf env python to ${python}/bin/python 2012-10-23 19:40:46 +02:00
Vladimír Čunát dd1867ce73 Merge pull request #150 from ecarreras/fix-xfce4-panel-plugins 
Fix xfce4 panel plugins
 2012-10-22 11:06:58 -07:00
Eelco Dolstra 1d8e80f1b9 Fix gvfs build 
http://hydra.nixos.org/build/3156351
 2012-10-15 12:13:39 -04:00
Eduard Carreras c322dc6844 Remove themes, not working for now 2012-10-12 09:52:16 +02:00
Eduard Carreras 170b01ba77 Adding libdir into the patch 2012-10-12 09:11:05 +02:00
Eduard Carreras aa4dc42459 Using a patch to load plugins to xfce4-panel 2012-10-12 01:20:47 +02:00
Eelco Dolstra 44da496dcf Forgot to add some files 2012-10-09 17:07:59 -04:00
Eelco Dolstra 58082f0acb libgnomecups: Fix build 
http://hydra.nixos.org/build/3149255
 2012-10-09 11:23:56 -04:00
Eduard Carreras 759f17d7d0 Drop eelco as a maintaner due copy&paste 2012-10-09 14:46:16 +02:00
Eduard Carreras d73a3f618a Adding xfce4 task manager 2012-10-05 20:52:40 +02:00
Eduard Carreras 4261b8a8ea Adding gigolo app 2012-10-05 17:02:38 +00:00
Eduard Carreras 494fe12a30 Trying to improve xfce4 desktop 2012-10-05 16:52:58 +00:00
Petr Rockai e9315d4a1c Enable the aspell plugin for KDE 4.7 (the default kde4). 2012-09-24 16:26:46 +02:00
Eelco Dolstra a18bf8bc7b Remove obsolete Xfce 4.6 2012-09-21 10:58:06 -04:00
Antono Vasiljev 4a1a626d05 Merge branch 'master' into gnome-3 2012-08-28 02:24:15 +03:00
Yury G. Kudryashov 77da73a72b akonadi-1.7.2 2012-08-26 22:38:50 +04:00
Antono Vasiljev dcbc0f5bd7 Merge branch 'master' into gnome-3 2012-08-16 15:58:57 +03:00
Antono Vasiljev 049c38a9a2 GNOME3: bump atk version 2012-08-16 15:56:51 +03:00
Antono Vasiljev 9df88a0472 GNOME3: Low prio for atk 2012-08-16 15:56:23 +03:00
Sergey Mironov 7ef3f9dd2a xfce-gvfs: add fuse to buildInputs 
Passing fuse to gvfs results in building gvfs-fuse-daemon, which makes
it possible to access gvfs mounts via ~/.gvfs folder.
 2012-08-15 01:10:40 +04:00
Rickard Nilsson c01b8a76e4 gnomeicontheme: Update to 3.4.0 2012-08-01 11:50:42 +02:00
Eelco Dolstra 7bfdeb102b kde-workspace: Disable parallel building 
Maybe this fixes this build failure:

In file included from /tmp/nix-build-103m3iz49n04a7h1pzinalqnw7x5g0da-kde-workspace-4.8.4.drv-0/kde-workspace-4.8.4/plasma/generic/runners/kill/killrunner.h:28:0,
                 from /tmp/nix-build-103m3iz49n04a7h1pzinalqnw7x5g0da-kde-workspace-4.8.4.drv-0/kde-workspace-4.8.4/plasma/generic/runners/kill/killrunner.cpp:20:
/tmp/nix-build-103m3iz49n04a7h1pzinalqnw7x5g0da-kde-workspace-4.8.4.drv-0/kde-workspace-4.8.4/plasma/generic/runners/kill/killrunner_config.h:24:34: fatal error: ui_killrunner_config.h: No such file or directory
compilation terminated.

http://hydra.nixos.org/build/2837527
 2012-07-25 14:49:16 -04:00
Joachim Schiele 538b17a791 fixed most virt-manager issues! 2012-07-20 23:27:24 +00:00
Antono Vasiljev cd7027bdae GNOME3: at-spi2-atk (TODO: deal with gschemas.compiled conflict) 2012-07-18 01:46:29 +03:00
Antono Vasiljev 78c742c720 GNOME3: at-spi2-core 2012-07-18 01:29:22 +03:00
Antono Vasiljev 78310258e3 Attempt to define isolated attrset for gnome-3 2012-07-10 19:03:13 +03:00
Peter Simons f9d9a0c4ca gtkglextmm: add version 1.2.0 
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
 2012-07-02 17:13:36 +02:00
Peter Simons 07e94a8892 gconfmm: add version 2.28.3 
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
 2012-07-02 17:13:35 +02:00
Yury G. Kudryashov 29b8d20f33 Fix old typo in kdeutils/superkaramba.nix 
svn path=/nixpkgs/trunk/; revision=34408
 2012-06-09 13:09:59 +00:00
Yury G. Kudryashov 98a130a504 Fix some find_* 
svn path=/nixpkgs/trunk/; revision=34407
 2012-06-09 13:09:56 +00:00
Yury G. Kudryashov e4c0e87db0 KDE SC 4.8.4 (automatic changes) 
svn path=/nixpkgs/trunk/; revision=34400
 2012-06-09 13:09:29 +00:00
Cillian de Roiste 6bf4d9522a Submitting patch by qknight (Joachim Schiele) to add Gnome2 python bindings 
svn path=/nixpkgs/trunk/; revision=34203
 2012-05-21 22:46:40 +00:00
Rickard Nilsson 5a270abcb6 Added missing pygtk dependency to Gnome VTE library. 
svn path=/nixpkgs/trunk/; revision=34194
 2012-05-21 14:58:16 +00:00
Rickard Nilsson cd55352e46 Updated the Xfce URLs. 
The upstream releases have moved from http://www.xfce.org/archive to
http://archive.xfce.org.

svn path=/nixpkgs/trunk/; revision=34128
 2012-05-15 21:45:35 +00:00
Mathijs Kwik 6ef610851e kde okular: include pkgconfig, otherwise libspectre isn't found (.ps viewing) 
svn path=/nixpkgs/trunk/; revision=33676
 2012-04-09 10:17:20 +00:00
Yury G. Kudryashov ef0b72dd6c kde-runtime: drop patch (applied upstream) 
svn path=/nixpkgs/trunk/; revision=33632
 2012-04-05 20:04:51 +00:00
Yury G. Kudryashov 7aeb6ef2bb Remove ksecrets, fix outputHash 
svn path=/nixpkgs/trunk/; revision=33622
 2012-04-05 13:50:47 +00:00
Yury G. Kudryashov e1743e57be qt-4.8.1, kde-4.8.2 
svn path=/nixpkgs/trunk/; revision=33621
 2012-04-05 13:50:34 +00:00
Yury G. Kudryashov defd86049c Merge ^/nixpkgs/trunk. 
This merge leads to a big rebuild, but this wouldn't hurt as I'm going to
reintegrate this branch soon.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33455
 2012-03-28 15:42:42 +00:00
Alexander Tsamutali b1952ce587 desktops/e17: Updated. 
svn path=/nixpkgs/trunk/; revision=33404
 2012-03-25 13:50:39 +00:00
Yury G. Kudryashov 295971e153 Disable smokekde.attica 
svn path=/nixpkgs/trunk/; revision=33387
 2012-03-23 18:56:41 +00:00
Yury G. Kudryashov a827b5f709 smokekde: disable akonadi&kdepimlibs 
svn path=/nixpkgs/trunk/; revision=33345
 2012-03-22 08:43:14 +00:00
Yury G. Kudryashov 9bb1684622 Add kde48.qtruby 
svn path=/nixpkgs/trunk/; revision=33313
 2012-03-20 22:10:53 +00:00
Yury G. Kudryashov 9dcf8dffa2 Enable perlqt and smokekde from kdebindings 
I had to patch their buildsystem. I'm going to submit the patches upstream next
week.

svn path=/nixpkgs/trunk/; revision=33309
 2012-03-20 21:45:15 +00:00
Yury G. Kudryashov b113433d51 Move libwnck to top-level 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33253
 2012-03-19 04:36:47 +00:00
Yury G. Kudryashov 3d0b778848 Move gnome-doc-utils and gtk-doc to top-level 
Add compatibility attrs.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33252
 2012-03-19 04:36:41 +00:00
Yury G. Kudryashov a466941945 Move last piece o gnome3 to top-level 
Since there is no common release schedule, I'd prefer to avoid gnome3 set at
all.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33203
 2012-03-17 16:46:12 +00:00
Yury G. Kudryashov ee5b976a93 Remove gnome3.clutter 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33202
 2012-03-17 16:46:06 +00:00
Yury G. Kudryashov d1860f6def Move gnome3.GConf to GConf3 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33201
 2012-03-17 16:46:02 +00:00
Yury G. Kudryashov ddb01436a0 Move gnome3.libgnome_keyring to libgnome_keyring3 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33200
 2012-03-17 16:45:56 +00:00
Yury G. Kudryashov 60669aa0fc Remove gnome3.glib_networking 
Use pkgs.glib_networking

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33199
 2012-03-17 16:45:50 +00:00
Yury G. Kudryashov eee4797659 gnome-3: we use the top-level glib 
GNOME-3 uses the top-level glib. If this will change later, one should override
*many* packages in gnome3 set.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33198
 2012-03-17 16:45:43 +00:00
Yury G. Kudryashov d96524476d Move libsoup to development/libraries 
It is used in many packages outside of gnome2 set.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33197
 2012-03-17 16:45:37 +00:00
Yury G. Kudryashov 785d18e02b svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33111
 2012-03-15 15:09:36 +00:00
Yury G. Kudryashov fe1115caf4 Make nixpkgs ready for gst_all attrset removal 
svn path=/nixpkgs/trunk/; revision=33092
 2012-03-14 22:44:52 +00:00
Yury G. Kudryashov 68fe867e19 Get rid of most references to gtkLibs 
svn path=/nixpkgs/trunk/; revision=33088
 2012-03-14 21:57:32 +00:00
Yury G. Kudryashov c719876055 Remove unused files 
svn path=/nixpkgs/trunk/; revision=32991
 2012-03-11 14:52:03 +00:00
Yury G. Kudryashov 39ceaa7aff kde-runtime: apply patch that (hopefully) fixes virtuoso-t eating 100% CPU 
svn path=/nixpkgs/trunk/; revision=32988
 2012-03-11 14:35:19 +00:00
Yury G. Kudryashov 0a66c08eb9 kdepim-runtime: drop patch 
svn path=/nixpkgs/trunk/; revision=32984
 2012-03-11 14:07:30 +00:00
Yury G. Kudryashov 736ecb4c53 Remove esound and libaudiofile 
svn path=/nixpkgs/trunk/; revision=32983
 2012-03-11 14:07:27 +00:00
Yury G. Kudryashov 0cea832a1b Remove unused builder 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=32946
 2012-03-09 07:13:14 +00:00
Yury G. Kudryashov e060892aac gvfs-1.10.1 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=32945
 2012-03-09 07:13:11 +00:00
Yury G. Kudryashov 91fb91d9e0 libsoup-2.36.1 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=32944
 2012-03-09 07:13:08 +00:00
Yury G. Kudryashov a5eb37cc37 gnome-doc-utils-0.18.1 
svn path=/nixpkgs/trunk/; revision=32934
 2012-03-08 23:15:51 +00:00
Yury G. Kudryashov b0dbd38ea6 Move libcroco and librsvg to top-level 
svn path=/nixpkgs/trunk/; revision=32933
 2012-03-08 22:57:05 +00:00
Yury G. Kudryashov 01c4e30a8a gnome-control-center-2.32.1 
svn path=/nixpkgs/trunk/; revision=32932
 2012-03-08 22:46:10 +00:00
Yury G. Kudryashov 711fada6ee gnome-settings-daemon-2.32.1 
svn path=/nixpkgs/trunk/; revision=32931
 2012-03-08 22:46:06 +00:00
Yury G. Kudryashov 86080768f1 metacity-2.30.3 
svn path=/nixpkgs/trunk/; revision=32930
 2012-03-08 22:46:03 +00:00
Yury G. Kudryashov 793d0c983c Move gsettings-desktop-schemas to data/misc 
svn path=/nixpkgs/trunk/; revision=32929
 2012-03-08 22:45:58 +00:00
Yury G. Kudryashov ec84a1f0b8 libcroco-0.6.4 
svn path=/nixpkgs/trunk/; revision=32928
 2012-03-08 22:45:54 +00:00
Yury G. Kudryashov b196e5f125 libgnomekbd-2.32.0 
svn path=/nixpkgs/trunk/; revision=32927
 2012-03-08 22:45:51 +00:00
Yury G. Kudryashov c3eb93ae3b gnome-panel-2.32.1 
svn path=/nixpkgs/trunk/; revision=32926
 2012-03-08 22:45:47 +00:00
Yury G. Kudryashov 3372c8abfd librsvg-2.34.2 
svn path=/nixpkgs/trunk/; revision=32925
 2012-03-08 22:45:42 +00:00
Yury G. Kudryashov 396fcedaed libwnck-2.30.7 
svn path=/nixpkgs/trunk/; revision=32924
 2012-03-08 22:45:38 +00:00
Yury G. Kudryashov a85944b665 gnome-desktop-2.32.1 
svn path=/nixpkgs/trunk/; revision=32922
 2012-03-08 22:45:32 +00:00
Yury G. Kudryashov cfe4427418 gnome-session-2.32.1 
svn path=/nixpkgs/trunk/; revision=32921
 2012-03-08 22:45:28 +00:00
Yury G. Kudryashov dff711a9db GConf: depend on gtk 
It needs gtk only for 'gtk-sanity-check-2' program. We should split this program
to a dedicated package.

svn path=/nixpkgs/trunk/; revision=32920
 2012-03-08 22:45:25 +00:00
Yury G. Kudryashov 9a4c1acfb5 GConf-2.32.4 
svn path=/nixpkgs/trunk/; revision=32919
 2012-03-08 22:45:22 +00:00
Yury G. Kudryashov b409732c69 gnome-menus-2.30.5 
svn path=/nixpkgs/trunk/; revision=32918
 2012-03-08 22:45:18 +00:00
Yury G. Kudryashov 9fb93537bb zenity-2.32.1, remove CPPFLAGS magic 
svn path=/nixpkgs/trunk/; revision=32917
 2012-03-08 22:45:15 +00:00
Yury G. Kudryashov e7e3a28ac6 gnome-vfs-monikers: cleanup CPPFLAGS 
svn path=/nixpkgs/trunk/; revision=32916
 2012-03-08 22:45:11 +00:00
Yury G. Kudryashov 5d42d15d15 at-spi-1.32.0 
svn path=/nixpkgs/trunk/; revision=32915
 2012-03-08 22:45:02 +00:00
Yury G. Kudryashov b88e0e8807 libgnomeui depends on libgnome-keyring, not gnome-keyring 
svn path=/nixpkgs/trunk/; revision=32907
 2012-03-08 17:16:04 +00:00
Yury G. Kudryashov 1a62d14cdd Move glib-networking to top namespace 
svn path=/nixpkgs/trunk/; revision=32905
 2012-03-08 16:49:08 +00:00
Yury G. Kudryashov 065d71635d gnome-icon-theme-2.30.3 
svn path=/nixpkgs/trunk/; revision=32900
 2012-03-08 15:37:23 +00:00
Yury G. Kudryashov 5020497c95 libsoup: depend on libgnome-keyring 
svn path=/nixpkgs/trunk/; revision=32899
 2012-03-08 15:37:19 +00:00
Yury G. Kudryashov 99337fff9d gnome-keyring-2-30.3 
svn path=/nixpkgs/trunk/; revision=32897
 2012-03-08 15:36:34 +00:00
Yury G. Kudryashov e402a4a6a6 gvfs: depend on libgnome-keyring, not gnome-keyring 
svn path=/nixpkgs/trunk/; revision=32888
 2012-03-08 13:06:47 +00:00
Yury G. Kudryashov 9abf1b03a9 Move libgnome-keyring to development/libraries 
svn path=/nixpkgs/trunk/; revision=32887
 2012-03-08 13:06:44 +00:00
Yury G. Kudryashov 7390600a6e libsoup-2.34.3 
svn path=/nixpkgs/trunk/; revision=32883
 2012-03-08 10:14:37 +00:00
Yury G. Kudryashov 91ef1c05ab gnome2: gvfs-1.8.2 
svn path=/nixpkgs/trunk/; revision=32877
 2012-03-08 09:27:13 +00:00
Yury G. Kudryashov c65ada160e KDE-4.8.1 
* Switch to .tar.xz.
* Update fixed-output derivations hashes.
* Add kde-base-artwork (ksplashx themes)

svn path=/nixpkgs/trunk/; revision=32874
 2012-03-08 06:53:44 +00:00
Peter Simons f7896f322e libgnomeprint: fix gcc 4.6 compilation error 
svn path=/nixpkgs/trunk/; revision=32832
 2012-03-06 20:04:58 +00:00
Yury G. Kudryashov b7642bfdfb svn merge ^/nixpkgs/trunk 
I need the latest KDE-related changes

svn path=/nixpkgs/branches/stdenv-updates/; revision=32806
 2012-03-05 21:01:47 +00:00
Yury G. Kudryashov 296eff8fbd Pass pkgconfig to kdeplasma-addons 
svn path=/nixpkgs/trunk/; revision=32805
 2012-03-05 20:59:19 +00:00
Yury G. Kudryashov 3b39886275 Oops, fix evaluation 
Forgotten to pass pkgconfig to kdeplasma-addons

svn path=/nixpkgs/trunk/; revision=32804
 2012-03-05 20:59:15 +00:00
Yury G. Kudryashov 55adb6c2f7 kdeplasma-addons depends on libdbusmenu-qt 
svn path=/nixpkgs/trunk/; revision=32803
 2012-03-05 20:51:25 +00:00
Yury G. Kudryashov 4767246246 kdeplasma-addons needs pkg-config to find some dependencies 
svn path=/nixpkgs/trunk/; revision=32802
 2012-03-05 20:51:18 +00:00
Yury G. Kudryashov 57fd764a39 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
 2012-03-05 10:00:23 +00:00
Yury G. Kudryashov e07a111edc kdelibs depend on xz. Really. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32397
 2012-02-19 11:19:11 +00:00
Yury G. Kudryashov 313a029f16 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32396
 2012-02-19 11:16:24 +00:00
Yury G. Kudryashov 5c6a3faf4e Merge ^/nixpkgs/trunk 
svn tried to change libpng/default.nix version, I've changed libpng/12.nix
version manually.

svn path=/nixpkgs/branches/libpng15/; revision=32395
 2012-02-19 11:06:00 +00:00
Yury G. Kudryashov 08f6682666 KDE-4.7: build with qt-4.8 
svn path=/nixpkgs/trunk/; revision=32392
 2012-02-19 09:22:33 +00:00
Yury G. Kudryashov 024c247807 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32382
 2012-02-18 16:26:34 +00:00
Eelco Dolstra ce544df561 * Revert r31596 (which changes the Qt for KDE 4.7). This doesn't 
belong in the stdenv branch and breaks KDE
  (http://hydra.nixos.org/build/2068311).

svn path=/nixpkgs/branches/stdenv-updates/; revision=32381
 2012-02-18 01:30:22 +00:00
Arie Middelkoop 453768b1cc kde-runtime requires libjpeg as buildInput. 
svn path=/nixpkgs/trunk/; revision=32363
 2012-02-17 18:55:36 +00:00
Yury G. Kudryashov 14a5b4991c svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32360
 2012-02-17 17:44:20 +00:00
Yury G. Kudryashov 79d0d410cb svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32350
 2012-02-17 13:43:31 +00:00
Yury G. Kudryashov 882b8ea871 kde47.libkdcraw: fix build with qt-4.8 
svn path=/nixpkgs/trunk/; revision=32349
 2012-02-17 13:36:41 +00:00
Yury G. Kudryashov 070874c5f1 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32321
 2012-02-16 11:23:36 +00:00
Yury G. Kudryashov c81f618a34 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32273
 2012-02-14 14:33:10 +00:00
Yury G. Kudryashov 5d70cfcb25 kdepim-runtime: fix mailindexer eating 100% CPU 
svn path=/nixpkgs/trunk/; revision=32271
 2012-02-14 14:29:22 +00:00
Yury G. Kudryashov e155073b2c svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31888
 2012-01-27 17:49:20 +00:00
Yury G. Kudryashov b31c67e24d svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31887
 2012-01-27 16:43:39 +00:00
Yury G. Kudryashov afc0aea6d1 kalzium: patch pushed upstream 
svn path=/nixpkgs/trunk/; revision=31886
 2012-01-27 16:31:54 +00:00
Yury G. Kudryashov 3256c40575 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31878
 2012-01-27 11:48:58 +00:00
Yury G. Kudryashov fdae7ad9f4 Pass stable/unstable to l10n 
svn path=/nixpkgs/trunk/; revision=31876
 2012-01-27 10:03:32 +00:00
Yury G. Kudryashov 94372bc342 akonadi-1.7.0 
svn path=/nixpkgs/trunk/; revision=31871
 2012-01-26 20:07:54 +00:00
Yury G. Kudryashov 5b132f6e96 svn merge ^/nixpkgs/trunk 
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
 2012-01-26 15:27:03 +00:00