Commit graph

69 commits

Author SHA1 Message Date
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
Peter Simons 5f32207dfc Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-24 19:27:08 +01:00
Vladimír Čunát 787b150089 gnome2.libart_lgpl: update 2013-02-21 21:51:09 +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 f536aa7e7a Merge pull request #293 from vcunat/vlada/intltool
unify intltool
2013-02-14 12:29:29 -08: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 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
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 1d8e80f1b9 Fix gvfs build
http://hydra.nixos.org/build/3156351
2012-10-15 12:13:39 -04: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
Rickard Nilsson c01b8a76e4 gnomeicontheme: Update to 3.4.0 2012-08-01 11:50:42 +02:00
Joachim Schiele 538b17a791 fixed most virt-manager issues! 2012-07-20 23:27:24 +00: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
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
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 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 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 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