nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-11 16:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,006 Commits 191 Branches 125 Tags 8.5 GiB
eeb8e36bad
Commit Graph

1212 Commits

Author SHA1 Message Date
Joachim Schiele
d7dc9cd0d2 fixed a patch which was rejected, i wonder why it was still there... 2013-07-31 18:15:53 +00:00
Eelco Dolstra
70d6623586 Fix a name collision between two distinct KDE wallpaper packages 2013-07-30 16:52:11 +02:00
Karn Kallio
57ce3126d7 kde-base-artwork: fix hash. 2013-07-17 20:16:24 +02:00
Eelco Dolstra
66021f9cd8 Fix kdenetwork 2013-07-17 15:01:50 +02:00
Eelco Dolstra
dfd621745a Remove KDE 4.10.4 2013-07-17 15:01:50 +02:00
Eelco Dolstra
8e8c3d665c Remove KDE 4.7 
It's obsolete.
 2013-07-16 22:54:04 +02:00
Evgeny Egorochkin
da4be371e9 make package use mirror:// for gnu, savannah and gnome repositories where possible 2013-07-14 05:23:06 +03:00
Evgeny Egorochkin
fb07ba725b libgnomeprintui: fix version to match tarball 2013-07-14 02:08:50 +03:00
Evgeny Egorochkin
f95ece9acd KDE 4.10: bump to 4.10.5 2013-07-12 16:36:12 +03:00
Vladimír Čunát
6f5e5cfe06 kde4: unify used libcanberra 
I wondered why I'm getting two versions in the closure of KDE apps.
 2013-07-05 14:45:44 +02:00
Joachim Schiele
f064ee612f Merge pull request #709 from qknight/kdenetwork-kopete-fixes 
fixes two issues via patches to get knetwork compiling; both patches are minimal and mine is now also upstream
 2013-07-05 04:38:34 -07:00
Peter Simons
400d4a03b0 Update references to 'rLang' to the new name 'R'. 2013-07-04 23:41:22 +02:00
Joachim Schiele
d8f8d052c5 fixes two issues via patches to get knetwork compiling 
kopete-4.10.4-kopete-linphonemediaengine.patch
----------------------------------------------
patch copied from here:
  https://bugs.kde.org/show_bug.cgi?id=318825

kopete-4.10.4-kopete-stun.patch
-------------------------------
  when compiling kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/channelmanager.cc
  it would produce this error:

  kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stunrequest.h:91:9: error: ‘StunMessageType’ does not name a type

  problem:
    this is cased by a cyclic use of stun.h, stunrequest.h and channelmanager.cc with the outcome,
    that kdenetwork couldn't be compiled since kopete fails to build.

  solution:
    move the StunMessageType enum into its own #ifndef
 2013-07-03 16:35:03 +02:00
Jason "Don" O'Conal
a42133a102 gnome.GConf: fix build on darwin 
* disable polkit
* add --enable-static to configureFlags
 2013-07-04 00:21:46 +10:00
Jason "Don" O'Conal
6307798b45 gnome.ORBit2: fix build on darwin 
* add libintlOrEmpty to build inputs
 2013-07-03 22:03:47 +10:00
Mathijs Kwik
bf61d25dac kde 4.10: option to use a libcanberra with gtk support 
by default (as it was before), kde depends on a libcanberra with its
gtk dependency removed so a kde system can be gtk-free.

However, both firefox and chromium depend on gtk+ and libcanberra too.
So this leads to 2 versions being installed. this option combats that
by letting the kde use the other libcanberra
 2013-06-27 21:35:22 +02:00
Domen Kozar
35431a7d7b libgnomeprint: build on linux 2013-06-18 22:50:15 +02:00
Vladimír Čunát
3d1491c166 kde410.kdepimlibs: add pkgconfig 
Accidentally noticed the request in logs.
 2013-06-13 13:02:24 +02:00
Vladimír Čunát
7db886fdb9 Merge remote-tracking branch 'hydra/master' into x-updates 
Conflicts (taken from @7c6f434c):
	pkgs/development/libraries/libgphoto2/default.nix
 2013-06-08 15:41:39 +00:00
Evgeny Egorochkin
d2807428eb KDE 4.10: update to 4.10.4 2013-06-05 19:41:28 +03:00
Vladimír Čunát
b770365574 ReRevert Merge x-updates into master 
This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix
 2013-05-29 23:25:02 +02:00
Evgeny Egorochkin
64661b0a2b KDE4.10: kde-runtime: fix build against openEXR 2013-05-25 12:01:28 +03:00
Evgeny Egorochkin
6b9c2218c6 KDE 4.10: kdelibs, kdepim: remove todo notices, fix compilation against openEXR. 2013-05-25 12:01:27 +03:00
Evgeny Egorochkin
e15a244a74 KDE 4.10: Akonadi: update to 1.9.2 2013-05-25 12:01:27 +03:00
Mathijs Kwik
b6b9366b7b kde 4.10.3: fix hashes 2013-05-20 18:44:57 +02:00
Evgeny Egorochkin
079a6ad338 KDE 4.10: bugfix release 4.10.3 2013-05-19 19:32:53 +03:00
Mathijs Kwik
0c15d386cb it seems kde 4.10 does not yet use udisks2 
With udisks1, I do see my usb/cardreader drives.
With udisks2, I don't.

So this probably needs to be configured at build-time.
As udisks1 does work, I don't care all that much.
 2013-05-17 09:28:38 +02:00
Evgeny Egorochkin
a6b9035142 KDE 4.10 kdelibs: indicate that kdelibs has udisks2 support. 2013-05-11 21:22:33 +03:00
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat 
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
 2013-05-09 14:03:35 +02:00
Vladimír Čunát
9594a4f6fb xfce: minor updates for several components 
Now tumbler doesn't segfault for me
(at least not as soon as it used to).
 2013-05-08 13:48:51 +02:00
Vladimír Čunát
80e4a64740 xfce4session: bugfix update, superseding the patches 2013-05-08 13:48:51 +02:00
Vladimír Čunát
1278859d31 Merge branch 'master' into x-updates 
Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix
 2013-05-08 13:46:46 +02:00
Evgeny Egorochkin
b7bc27cfff KDE 4.10: propagate nepomuk_core along with kdepimlibs. 2013-05-07 17:23:46 +03:00
Evgeny Egorochkin
0256e55934 Fix KDE 4.8 and 4.7 build against new SIP 2013-05-06 22:15:07 +03:00
Evgeny Egorochkin
f8ee077afc KDE4.10 dolphin-plugins-*: fix the build. 
Patch contributed by Karn Kallio.
 2013-05-06 22:15:07 +03:00
Evgeny Egorochkin
b2f6770208 KDE4.10 kioslave-{svn,perldoc}: Fix build. 
Patch contributed by Karn Kallio.
 2013-05-06 22:15:07 +03:00
Evgeny Egorochkin
6e406edf0a KDE4.10: Kate: Add experimental python support. 2013-05-06 22:15:06 +03:00
Evgeny Egorochkin
ee4a7cbbf4 KDE4.10 print-manager: Fix build. 
Patch contributed by Karn Kallio.
 2013-05-06 22:15:06 +03:00
Evgeny Egorochkin
a1924fca12 KDE4.10: Fix PyKDE4 build I accidentally left in a broken state. Remove notice from kajongg because it 
compiles fine now.
 2013-05-06 22:15:06 +03:00
Evgeny Egorochkin
9f0d9a3b01 KDE 4.10: kdesdk-thumbnailers: Patch the build system to fix build failure. 
Patch contributed by Karn Kallio.
 2013-05-06 22:15:05 +03:00
Evgeny Egorochkin
a2359c02cd KRDC: it builds now, so remove the notice 2013-05-06 22:15:05 +03:00
Evgeny Egorochkin
ccbea23039 KStars: forgot to remove the notice that it doesn't build. 2013-05-06 22:15:05 +03:00
Vladimír Čunát
16c59ef836 xfce4session: fix a bug causing random crashes 
This should work, finally https://bugzilla.xfce.org/show_bug.cgi?id=9709
 2013-05-03 11:59:37 +02:00
Vladimír Čunát
a8ab0e53a4 xfce4session: make it systemd-aware 
This should solve many issuses, including:
 - show mountable volumes and mount-on-click (in Thunar)
 - fix shutdown actions (and don't ask for password anymore)

It doesn't explicitly depend on anything in x-updates,
but AFAIK noone has tested it against master (yet).
Connected to #441.
 2013-04-29 11:45:37 +02:00
Vladimír Čunát
bde20f3e88 Merge branch 'master' into x-updates 
Conflicts (just taken x-updates):
	pkgs/servers/x11/xorg/overrides.nix
 2013-04-24 06:29:09 +00:00
Vladimír Čunát
400515843c xfce4notifyd: bugfix update, check now, minor fixes 2013-04-21 13:08:11 +02:00
Evgeny Egorochkin
e83c2fa4a0 Add KDE 4.10.2. Not ready for production yet, but does compile. 2013-04-21 05:46:18 +03:00
Vladimír Čunát
e8823c9e5e Merge pull request #441 from ierton/udisks2-xfce 
udisks2 for xfce
 2013-04-20 01:37:14 -07:00
Vladimír Čunát
60ff4d0c7a python_rsvg: couldn't find gtk, fixed now 2013-04-18 10:04:56 +02:00
Vladimír Čunát
ca3e6d30f1 gnome3.at_spi2_core: supply path to system-wide dbus-daemon 2013-04-18 09:54:33 +02:00
Vladimír Čunát
469d098083 gnome2.libgnome: fix for new glib (my own patch) 2013-04-17 19:01:28 +02:00
Vladimír Čunát
6bd036d5f9 non-linux attempts to fix: libbonobo and libjpeg 2013-04-14 14:06:10 +02:00
Vladimír Čunát
f4f8857284 gnome_vfs: fix build by disabling fatality of deprecations 2013-04-13 23:59:24 +02:00
Vladimír Čunát
8249695b61 Merge branch 'master' into x-updates 
Needed that to fix the tarball.
 2013-04-11 23:31:33 +02:00
Marc Weber
88a8330d44 make ORBit2 build again by disabling deprecation warnings for linc2, the commit introducing it didn't show any strong reason 2013-04-08 14:50:10 +02:00
Mathijs Kwik
a288311c0b add terminology: e17 terminal emulator 2013-04-04 22:18:08 +02:00
Mathijs Kwik
07c50d5124 e17/ethumb: support video thumbnails and exif 2013-04-04 22:18:07 +02:00
Mathijs Kwik
6dcddbf3b5 e17/ethumb: add optional dependency on e_dbus 
ethumb_client depends on it, but will fail (skip on installation)
silently when not found
 2013-04-04 22:18:07 +02:00
Mathijs Kwik
d0b30155a5 e17/emotion: enable vlc video backend 
we should probably make this configurable, but for now enabling (and
testing) at least 1 backend is better than none, as emotion without
backends won't anything at all
 2013-04-04 22:18:07 +02:00
Mathijs Kwik
5431663e12 e17/e_dbus: make sure depending packages can find (propagated) dbus 2013-04-04 22:18:07 +02:00
Vladimír Čunát
979f2b0110 xfce: ./support/ not needed anymore 2013-04-04 12:02:53 +04:00
Vladimír Čunát
8406a62973 gtk3: core platform update (versions from GNOME 3.8) 2013-03-29 02:22:29 +01:00
Vladimír Čunát
b1eeae8cac Merge branch 'master' into x-updates 
Conflicts (easy):
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/pango/default.nix
 2013-03-17 11:28:28 +01:00
Vladimír Čunát
8db4152ddf A more complete fix of cyrus-sasl update (broken KDEs). 
This amends commit af656c6698.
 2013-03-13 21:06:37 +01:00
Sander van der Burg
af656c6698 kdepimlibs break against newer cyrus-sasl. Including this extra header fixes it 2013-03-13 10:44:12 +01:00
Vladimír Čunát
feb063cbdc xfce.xfdesktop: regression-fix release 2013-03-10 22:59:45 +01:00
Vladimír Čunát
b8339a1c1d xfce4-power-manager: update this forgotten package 2013-03-09 22:30:42 +01:00
Vladimír Čunát
96a0d0cc6f xfce4-power-manager: update this forgotten package 2013-03-09 22:30:06 +01:00
Vladimír Čunát
feff239bcb xfdesktop: minor update 2013-03-09 18:45:17 +01:00
Vladimír Čunát
86639d9bb9 Merge branch 'master' into x-updates 
Conflicts (taken master versions):
	pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
	pkgs/desktops/xfce/applications/gigolo.nix
	pkgs/desktops/xfce/applications/mousepad.nix
	pkgs/desktops/xfce/applications/ristretto.nix
	pkgs/desktops/xfce/applications/terminal.nix
	pkgs/desktops/xfce/applications/xfce4-mixer.nix
	pkgs/desktops/xfce/applications/xfce4-notifyd.nix
	pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
	pkgs/desktops/xfce/art/xfce4-icon-theme.nix
	pkgs/desktops/xfce/core/exo.nix
	pkgs/desktops/xfce/core/garcon.nix
	pkgs/desktops/xfce/core/gtk-xfce-engine.nix
	pkgs/desktops/xfce/core/libxfce4ui.nix
	pkgs/desktops/xfce/core/libxfce4util.nix
	pkgs/desktops/xfce/core/libxfcegui4.nix
	pkgs/desktops/xfce/core/thunar-volman.nix
	pkgs/desktops/xfce/core/thunar.nix
	pkgs/desktops/xfce/core/tumbler.nix
	pkgs/desktops/xfce/core/xfce4-appfinder.nix
	pkgs/desktops/xfce/core/xfce4-panel.nix
	pkgs/desktops/xfce/core/xfce4-power-manager.nix
	pkgs/desktops/xfce/core/xfce4-session.nix
	pkgs/desktops/xfce/core/xfce4-settings.nix
	pkgs/desktops/xfce/core/xfconf.nix
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/desktops/xfce/core/xfwm4.nix
	pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
	pkgs/development/libraries/webkit/default.nix
	pkgs/top-level/all-packages.nix
 2013-03-09 17:55:37 +01:00
Vladimír Čunát
f0c683faec xfdesktop: minor update 2013-03-09 17:07:50 +01:00
Vladimír Čunát
c3511c115d xfce: fix NixOS support 
Sorry for this forgotten commit.
 2013-03-09 10:51:34 +01:00
Michael Raskin
b26c770651 Exporting XFCE gvfs: it is referenced in NixOS, it is unclear how to remove the dependency cleanly and it affects rebuild even with config that doesn't mention XFCE at all. 2013-03-09 12:20:19 +04:00
Shea Levy
1670244f80 Merge branch 'vlada/xfce-notg' of git://github.com/vcunat/nixpkgs 
This branch refactors xfce and updates it to 4.10. I had been hoping to
find someone besides Vlada to test this (I don't use xfce), but no one
has come forward yet in 2 weeks so if this breaks something they can
make an issue or fix it. It all looks good by inspection.
 2013-03-08 17:03:22 -05:00
Vladimír Čunát
90825913f2 kde48.okteta: disable parallel build 
It often failed on hydra.
 2013-02-28 09:54:22 +01:00
Peter Simons
5f32207dfc Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-24 19:27:08 +01:00
Vladimír Čunát
fb81c8e455 kde48.kdebase_workspace: disable parallel build 
There were frequent problems with this on Hydra.
 2013-02-24 09:44:10 +01:00
Vladimír Čunát
e817e8fcdb gnome3: factor out doCompileSchemas 2013-02-21 21:58:09 +01:00
Vladimír Čunát
787b150089 gnome2.libart_lgpl: update 2013-02-21 21:51:09 +01:00
Vladimír Čunát
dbe8a69a36 libcroco: move to gnome-3, minor update 2013-02-21 21:29:05 +01:00
Vladimír Čunát
4e5fe00a1f gnome3.libgweather: update 2013-02-21 21:26:19 +01:00
Vladimír Čunát
dd4a846b0f update evince, seems to work now 2013-02-21 21:19:50 +01:00
Vladimír Čunát
bf4313cd88 update gsettings-desktop-schemas and make system-wide 
Conflicts:
	pkgs/data/misc/gsettings-desktop-schemas/default.nix
	pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
 2013-02-21 20:42:39 +01:00
Vladimír Čunát
51a413ac1c gnome3: add gnome-icon-theme 2013-02-21 20:38:47 +01:00
Vladimír Čunát
b8a44440e4 gnome3: port and update (lib)gnome-keyring 2013-02-21 20:36:20 +01:00
Vladimír Čunát
38a0bc8cdf add gnome3.gcr; ToDo: tests would fail if enabled 2013-02-21 20:31:24 +01:00
Vladimír Čunát
99b95f9e75 gnome3: fix more nativeBuildInputs 2013-02-21 20:21:00 +01:00
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
Yury G. Kudryashov
68d3727a41 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31848
 2012-01-26 10:11:47 +00:00
Yury G. Kudryashov
2ac0c88674 Fix errors found by test-eval-release 
svn path=/nixpkgs/trunk/; revision=31847
 2012-01-26 10:07:00 +00:00
Yury G. Kudryashov
2ced89b7f1 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31846
 2012-01-26 08:45:19 +00:00
Yury G. Kudryashov
ecea8900e7 KDE-4.8.0 
svn path=/nixpkgs/trunk/; revision=31845
 2012-01-26 08:36:28 +00:00
Karn Kallio
3206dbd63d As pointed out by Yury Kudryashov kde48.kdelibs does not in fact need 
pkgconfig

svn path=/nixpkgs/trunk/; revision=31832
 2012-01-24 22:26:10 +00:00
Karn Kallio
151fcc6133 Get kdelibs from kde48 release candidate to build. 
svn path=/nixpkgs/trunk/; revision=31801
 2012-01-24 01:54:49 +00:00
Karn Kallio
90563b958f kde 4.8 release candidate uses unstable directory for download. 
svn path=/nixpkgs/trunk/; revision=31798
 2012-01-23 21:56:33 +00:00
Yury G. Kudryashov
84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
 2012-01-19 21:31:51 +00:00
Yury G. Kudryashov
a525fdb18d svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31718
 2012-01-19 21:00:43 +00:00
Yury G. Kudryashov
8899e60693 Remove unused patches, fix pykde4 patch 
svn path=/nixpkgs/trunk/; revision=31712
 2012-01-19 20:27:59 +00:00
Eelco Dolstra
3fa83e15e7 * Missed a reference to xz. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31682
 2012-01-19 13:56:57 +00:00
Eelco Dolstra
d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
 2012-01-18 20:53:01 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
 2012-01-18 20:16:00 +00:00