Eelco Dolstra
4ae3e32e82
Merge pull request #4012 from ibeex/master
...
added darwin as supported platform for meld
2014-09-09 15:35:58 +02:00
Ivan Brkanac
841f45b231
added darwin ass supported platform for meld, added get text as requirement for scroollkeeper
2014-09-09 15:21:04 +02:00
Eelco Dolstra
585983bc95
Merge remote-tracking branch 'origin/staging'
...
Conflicts:
pkgs/applications/version-management/subversion/default.nix
2014-09-08 11:42:09 +02:00
Vladimír Čunát
06fea81c6e
Merge recent master into staging
...
Hydra: ?compare=1150594
2014-09-06 16:52:45 +02:00
Luca Bruno
7d6a27a780
evolution: fix build
2014-09-05 12:46:16 +02:00
Michael Raskin
a3b9bf6c87
Merge pull request #3653 from iyzsong/nixos/xfce4-mixer
...
nixos: don't set variables for gstreamer-0.10 (fix #3652 )
2014-09-04 20:54:57 +04:00
Luca Bruno
1d0c2faf6b
totem: drop upstream patch after update
2014-09-03 10:02:41 +02:00
Luca Bruno
e23504c0b2
evolution-data-server: update from 3.12.2 to 3.12.5
2014-09-03 10:02:41 +02:00
Luca Bruno
268a5618f4
Merge branch 'gnome3'
2014-09-02 12:59:47 +02:00
Luca Bruno
17e96cd1a3
vte: update from 0.36.2 to 0.36.3
2014-09-02 12:57:10 +02:00
Luca Bruno
12018a0df9
gnome3_12.tracker: update from 1.0.1 to 1.0.3, potentially fixes CVE-2012-2671, CVE-2012-6109
2014-09-02 12:56:07 +02:00
Luca Bruno
f02ab3f9c4
gnome3_12.totem: update from 3.12.1 to 3.12.2
2014-09-02 12:56:01 +02:00
Luca Bruno
70991e666e
gnome3_12.gtksourceview: update from 3.12.2 to 3.12.3
2014-09-02 12:55:54 +02:00
Luca Bruno
7cb6d4cd87
gnome3_12.grilo-plugins: update from 0.2.12 to 0.2.13
2014-09-02 12:55:46 +02:00
Luca Bruno
4426b5aca7
grilo: update from 0.2.10 to 0.2.11
2014-09-02 12:55:33 +02:00
Luca Bruno
b00b560dba
gnome3_12.gnome-user-docs: update from 3.12.1 to 3.12.2
2014-09-02 12:54:38 +02:00
Luca Bruno
ac7f0a8cf2
gnome3_12.gnome-music: update from 3.12.2 to 3.12.2.1
2014-09-02 12:54:30 +02:00
Luca Bruno
95dffc12e8
gnome3_12.gnome-calculator: update from 3.12.1 to 3.12.3
2014-09-02 12:54:22 +02:00
Luca Bruno
f08c327ab2
gnome3_12.gedit: update from 3.12.1 to 3.12.2
2014-09-02 12:54:14 +02:00
Luca Bruno
f3bc1dc263
gnome3_12.geary: update from 0.6.0 to 0.6.2
2014-09-02 12:54:08 +02:00
Luca Bruno
de51a490f5
gnome3_12.folks: update from 0.9.6 to 0.9.8
2014-09-02 12:54:01 +02:00
Luca Bruno
64746e1f24
gnome3_12.evolution: update from 3.12.2 to 3.12.5
2014-09-02 12:53:49 +02:00
Luca Bruno
df6d65ad55
gnome3_12.empathy: update from 3.12.2 to 3.12.5
2014-09-02 12:53:41 +02:00
Peter Simons
1c0d15b90e
Merge branch 'origin/master' into staging.
...
Conflicts:
pkgs/development/libraries/ffmpeg/2.x.nix
pkgs/development/libraries/serf/default.nix
2014-09-02 12:31:03 +02:00
Luca Bruno
463585a5ec
gnome-tweak-tool: update 3.10.1 -> 3.12.0
2014-09-02 11:24:49 +02:00
Luca Bruno
eaeee57483
gnome-tweak-tool: update 3.10.1 -> 3.12.0
2014-09-02 11:20:26 +02:00
Damien Cassou
9a26b38ad3
Make sure gnome-python has gnomevfs binding
2014-08-30 15:56:22 +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
Bjørn Forsman
c9baba9212
Fix many package descriptions
...
(My OCD kicked in today...)
Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.
I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.
I've tried to stay away from generated expressions (and I think I
succeeded).
Some specifics worth mentioning:
* cron, has "Vixie Cron" in its description. The "Vixie" part is not
mentioned anywhere else. I kept it in a parenthesis at the end of the
description.
* ctags description started with "Exuberant Ctags ...", and the
"exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
at the end of description.
* nix has the description "The Nix Deployment System". Since that
doesn't really say much what it is/does (especially after removing
the package name!), I changed that to "Powerful package manager that
makes package management reliable and reproducible" (borrowed from
nixos.org).
* Tons of "GNU Foo, Foo is a [the important bits]" descriptions
is changed to just [the important bits]. If the package name doesn't
contain GNU I don't think it's needed to say it in the description
either.
2014-08-24 22:31:37 +02:00
Eelco Dolstra
c77fde7810
yelp: Fix description
2014-08-24 15:25:27 +02:00
Domen Kožar
e93eb33058
gtkglext: cleanup
2014-08-23 11:46:54 +02:00
Vladimír Čunát
91db3f6b45
kde4: security patch for CVE-2014-5033
2014-08-21 15:13:18 +02:00
Vladimír Čunát
d4e9fd2a90
Merge recent master into staging
...
Hydra: ?compare=1148749
Conflicts (easy):
nixos/modules/virtualisation/containers.nix
2014-08-21 15:09:31 +02:00
Vladimír Čunát
90874bfc44
gdm-3.12: disable parallel building
...
Reason:
gdm-client-glue.h:7:0: error: unterminated #ifndef
http://hydra.nixos.org/build/13488683
2014-08-19 18:36:06 +02:00
宋文武
8f1623b38b
xfce4-mixer: use wrapper to set GST_PLUGIN_SYSTEM_PATH
2014-08-19 09:57:30 +08: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
dfbc9ff781
gpaste: new package
...
Clipboard management system with GNOME3 integration
https://github.com/Keruspe/GPaste
2014-08-14 21:16:42 +02:00
Luca Bruno
1a29fcae69
gdm: Add very experimental display manager
2014-08-12 11:23:42 +02:00
Luca Bruno
3962ec068f
gnome-shell: find icons inside gdm
2014-08-12 11:23:11 +02:00
Luca Bruno
2e5c13d398
vino: fix missing remote-desktop icon
2014-08-12 11:23:11 +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
Vladimír Čunát
1b169722a3
Merge branch 'x-updates'
...
Close #3147 .
The only major update is freetype-2.5, I think (it cost lots of work).
2014-08-03 11:29:01 +02:00
Luca Bruno
7a4a132085
Revert "gnome-shell: enable parallel building"
...
This reverts commit 9ec0a105d3
2014-08-03 09:56:16 +02:00
Vladimír Čunát
6295a3ca36
Merge recent master into x-updates
...
Hydra: ?compare=1142825
Conflicts (easy):
pkgs/applications/audio/lmms/default.nix
pkgs/desktops/e18/enlightenment.nix
pkgs/games/exult/default.nix
pkgs/os-specific/linux/alsa-plugins/default.nix
2014-08-02 05:08:07 +02:00
Vladimír Čunát
ace3d4685d
xfce4-appfinder: update 4.9.4 -> 4.10.1
...
(cherry picked from commit 8aa892489e
2014-07-31 16:30:04 +02:00
Vladimír Čunát
bc8abb2242
libxfce4util: minor update 4.10.0 -> 4.10.1
...
(cherry picked from commit 5c72dac548
2014-07-31 16:30:04 +02:00
Vladimír Čunát
880fb28ecd
xfce4-power-manager: update to 1.3.0, supporting upower-0.99
...
(cherry picked from commit 2027dcc4f9
2014-07-31 16:30:04 +02:00
Sven Keidel
6a7d82d000
added meta information
2014-07-31 00:49:14 +02:00
