Commit Graph

1146 Commits

Author SHA1 Message Date
Vladimír Čunát
f448cc022b changes proposed for 'release-13.10' into x-updates
Conflicts (simple, taking whole higher/later versions):
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/polkit/default.nix
2013-11-05 08:38:15 +01:00
Marc Weber
4a96c8cf6a gnome-autogen.sh: make check_m4macros aware of ACLOCAL_PATH 2013-11-01 10:32:24 +01:00
Mathijs Kwik
f4903d890e Merge branch 'master' into x-updates 2013-11-01 08:35:16 +01:00
Eelco Dolstra
db2a9afb75 Remove obsolete xfceutils attribute 2013-10-30 15:35:09 +01:00
Eelco Dolstra
df548ffc9e Remove unused Xfce files 2013-10-30 15:35:09 +01:00
Evgeny Egorochkin
fd05af8bc0 KDE4.11: update to 4.11.2. Add missing xslt file. 2013-10-07 22:32:47 +03:00
Eelco Dolstra
9faba5f073 Remove KDE 4.8
4.10 has been the default for a while.
2013-10-07 17:12:50 +02:00
Eelco Dolstra
9db68de9e6 polkit, pulseaudio: Drop some Linux-specific dependencies 2013-10-06 00:21:28 +02:00
Vladimír Čunát
cb8fff57c1 update gtk deps, on GNOME-3.10 branches now 2013-10-05 21:25:53 +02:00
Eelco Dolstra
fca11ef500 Fix evaluation errors 2013-10-01 13:12:45 +02:00
James Cook
bae1462276 Disable introspection for gcr.
gcr stopped building after 7fbcc562 (adding introspection into GTK
libs); this gets it to build again.
2013-09-26 18:55:27 -07:00
Peter Simons
75c5fc541d pkgs/desktops/gnome-2/desktop/libgweather: remove dubious assertion
Fix assertion failure from http://hydra.nixos.org/build/5985506/nixlog/1/raw
for some suitable definition of "fixing". Let's see what happens now.
2013-09-15 21:36:18 +02:00
Jason \"Don\" O'Conal
2a73189a9c deluge: fix build on darwin (close #930) 2013-09-14 15:26:48 +02:00
Jason \"Don\" O'Conal
9767a725cc djvulibre: fix build on darwin (close #931) 2013-09-14 15:21:35 +02:00
Vladimír Čunát
c1ed13dad0 Merge branch 'master' into x-updates 2013-09-08 12:04:20 +02:00
Sergey Mironov
28bf9caca2 xfce4-power-manager: fix an brightness plugin issue
Close #943.
2013-09-08 10:56:58 +02:00
Vladimír Čunát
2fda1165da Merge branch 'master' into x-updates 2013-08-28 10:37:41 +02:00
Matej Cotman
93c4fd2855 vte: patch for alt key (close #858)
Edit (vcunat): bump to latest version supporting gtk2.
2013-08-25 19:08:59 +02:00
Evgeny Egorochkin
952aa0e719 KDE: we don't really support anything but Linux right now, so no reason to have all those evaluation
errors.
2013-08-25 01:07:46 +03:00
Vladimír Čunát
c1e62e7e91 Merge branch 'master' into x-updates 2013-08-22 19:29:09 +02:00
Evgeny Egorochkin
b25bcf853f package KDE 4.11 2013-08-21 20:41:07 +03:00
Joachim Schiele
99fe2013ae Merge pull request #797 from qknight/smokegen-patch-fix
fixed patch rejection and added RPATH magic
2013-08-21 00:51:31 -07:00
Joachim Schiele
13df65b89b Merge pull request #798 from qknight/perlqt-patch-fixes
Perlqt patch fixes
2013-08-21 00:51:06 -07:00
Joachim Schiele
a8a7c78f89 Merge pull request #799 from qknight/qtruby-patch-fixes
qtruby patch fixes
2013-08-21 00:50:53 -07:00
Ludovic Courtès
2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Domen Kožar
330219d0c4 add thunar-archive-plugin 2013-08-16 13:57:08 +02:00
Joachim Schiele
7b5a92c49d fixed patch rejection and added RPATH magic 2013-08-15 16:25:02 +00:00
Eelco Dolstra
91bb940160 mousepad: Don't segfault at startup 2013-08-15 16:37:30 +02:00
Eelco Dolstra
a218b2d3cb xfce: Fix missing icons
Xfce didn't have a default value for its icon theme, so most icons
were missing until the user explicitly selected an icon theme in the
appearance settings.  Example:

  http://hydra.nixos.org/build/5717570/download/1/screen.png

This patch sets the Rodent theme as the default (which used to be the
case on NixOS).

http://lists.freebsd.org/pipermail/freebsd-ports/2012-June/076349.html
http://www.freebsd.org/cgi/query-pr.cgi?pr=168688
2013-08-15 16:15:11 +02:00
Joachim Schiele
bb9263edbf removed all patches from perlqt 2013-08-14 17:41:24 +00:00
Joachim Schiele
9109cc6e4f removed one patch which seems to be upstream now 2013-08-14 17:41:06 +00:00
Vladimír Čunát
72a8019334 introspection disabling -- clutter-gtk, NM-applet, gnome_panel
Didn't build as it was, and not needed anywhere AFAIK.
2013-08-06 09:27:34 +02:00
Vladimír Čunát
7fbcc56260 add introspection into GTK libs (part of #517)
This is all work of Marc Weber <marco-oweber@gmx.de>, except for a few nitpicks.

Tested space blowup: IMHO negligible to headers and similar stuff,
e.g. the firefox closure (reported by du) grows from 560 to 579 MB.
Saving space should be handled separately,
e.g. we have the multiple-outputs branch.
2013-08-04 21:11:24 +02:00
Vladimír Čunát
d374527509 GTK-related minor updates 2013-08-03 09:45:22 +02:00
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