koral
f24f7010b7
webkitgtk: 2.4.6 -> 2.6.1
2014-10-19 11:45:20 +02:00
Eelco Dolstra
a85dcf4a00
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/development/libraries/libav/default.nix
pkgs/shells/bash/bash-4.2-patches.nix
pkgs/stdenv/generic/default.nix
2014-10-07 00:09:37 +02:00
Luca Bruno
e707530751
giflib: add back the 5.0 version
...
Should fix tracker and may be used to fix
other packages after commit 61f8cee
2014-10-02 01:41:35 +02:00
Luca Bruno
d4b49aa25f
Fix gnome3_10 namespace
2014-09-15 01:38:06 +02:00
Luca Bruno
e4e39f26ba
Change default from gnome 3.10 to gnome 3.12
2014-09-08 18:35:45 +02:00
Vladimír Čunát
e51f73652d
Merge recent master into staging
...
Hydra: ?compare=1149952
Conflicts:
nixos/doc/manual/configuration.xml (changed split file)
nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
2014-08-30 10:04:02 +02:00
Domen Kožar
39320b0fa3
gnome3.gitg: fix build by updating it to unstable
2014-08-28 20:53:01 +02:00
Eelco Dolstra
c77fde7810
yelp: Fix description
2014-08-24 15:25:27 +02:00
Luca Bruno
36bef2b267
gobject-introspection: refer to shlibs with absolute paths in typelibs
...
After this, LD_LIBRARY_PATH should not be required anymore.
The patch has been applied only for .la files, so there may
be some other cases missing.
2014-08-14 23:16:51 +02:00
Luca Bruno
47c1261939
dconf: update to 0.20.0 due to gdm requiring dconf compile
2014-08-12 11:23:10 +02:00
Peter Simons
2d326e5032
Merge remote-tracking branch 'origin/master' into staging.
...
Conflicts:
pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Mateusz Kowalczyk
7a45996233
Turn some license strings into lib.licenses values
2014-07-28 11:31:14 +02:00
Eelco Dolstra
ff97b7dbe6
Merge remote-tracking branch 'origin/master' into staging
2014-07-14 17:04:55 +02:00
Luca Bruno
6aa0a5d9d3
libvte: fix .la file to include the libpath for ncurses
...
Without this patch, the .la file only added -lncurses without
specifying the nix store path, forcing the propagation
of ncurses as build input.
Also enable parallel building and add myself to the maintainers.
2014-07-10 23:13:54 +02:00
Luca Bruno
da9b510996
Move at_spi2_core and at_spi2_atk outside of the gnome3 attrset
2014-07-10 11:39:16 +02:00
John Wiegley
4304487003
libcroco: weaken platform requirement for building on darwin
2014-06-25 11:14:35 -07:00
Bjørn Forsman
76672dd9e3
accountsservice: be consistent in naming (always two 's')
...
The package is (correctly) named 'accountsservice' (with two 's'), but
the attribute and expression path lacked one 's'. Fix it.
2014-06-22 21:32:16 +02:00
Bjørn Forsman
9e46a0d748
gvfs: add more supported protocols in gnome 3.10. Closes #2880
...
This change has been successfully tested on gnome 3.12 (thanks
@lethalman!). Now bring it to gnome 3.10, which currently is the default
gnome3 version in NixOS.
I've build and run tested it (success: smb:// protocol now work in
Nautilus).
2014-06-11 23:10:40 +02:00
Luca Bruno
4a2936e74d
nautilus-sendto: add to gnome 3.10
2014-05-29 12:38:50 +02:00
Luca Bruno
48e969d776
Fix gnome3 evaluation due to missing glib_networking
2014-05-22 11:17:00 +02:00
Luca Bruno
df95a8cc2f
upower: add 0.99 version for gnome 3.12
2014-05-20 13:41:39 +02:00
Luca Bruno
d05fa3ccfe
Branch gnome 3.12
2014-05-20 13:41:33 +02:00
