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
