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
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
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
.
Conflicts:
pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
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
Sven Keidel
2d31046a40
gtkpod: bump to 2.1.4
2014-07-31 00:41:17 +02:00
Evgeny Egorochkin
f7ef36428d
libzapojit: fix broken src url
2014-07-29 13:42:45 +03:00
Peter Simons
d0ca8c237e
Fix broken license references.
2014-07-28 11:43:20 +02:00
Mateusz Kowalczyk
7a45996233
Turn some license strings into lib.licenses values
2014-07-28 11:31:14 +02:00
Eelco Dolstra
f64d84698e
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/applications/audio/espeak/edit.nix
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-07-28 11:30:49 +02:00
Matej Cotman
5b97751a8f
fix e18 cpufreq module: set setuid to freqset
2014-07-25 12:49:31 +02:00
Vladimír Čunát
b9045a7d96
Merge branch 'x-updates' into staging
...
...in preparation for a merge to master
2014-07-22 22:28:39 +02:00
Vladimír Čunát
644c9eb6f7
Revert "Merge #3054 : add kde 4.13.2"
...
This is due to breaking evaluation; see the PR discussion.
This reverts commit 6a77d5fd3e
, reversing
changes made to 07a09fbe63
.
Conflicts:
nixos/modules/services/x11/desktop-managers/default.nix
2014-07-22 17:48:14 +02:00
Eelco Dolstra
7f410ef923
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/misc/vim-plugins/default.nix
2014-07-22 11:00:00 +02:00
Vladimír Čunát
4cbf520bfe
e18.enlightenment: fix build by adding bzip2
...
I'm lazy to find how exatly the need propagated in x-updates.
2014-07-21 15:06:44 +02:00
Vladimír Čunát
9b02635faa
Merge recent master into x-updates
...
Hydra: ?compare=1138350
Conflicts:
nixos/modules/services/x11/desktop-managers/default.nix
Two imports were added independently on the same line.
I split it as well, as it was very long now.
2014-07-21 12:05:57 +02:00
Matej Cotman
1afb26fb17
e18: enlightenment desktop manager version 18
2014-07-17 23:00:38 +02:00
Vladimír Čunát
16e35532e4
Merge recent master into x-updates
2014-07-17 19:30:56 +02:00
Eelco Dolstra
ff97b7dbe6
Merge remote-tracking branch 'origin/master' into staging
2014-07-14 17:04:55 +02:00
Luca Bruno
3871005b7c
gtksourceview 3.12: hard code data dirs to nix store path
2014-07-13 16:32:41 +02:00
Luca Bruno
0b82b95322
gnome-shell 3.12: fix at_spi2_core argument
2014-07-12 20:45:20 +02:00
lethalman
38c2901741
Merge pull request #3253 from bjornfor/gnome-boxes
...
Add Gnome Boxes (access remote or virtual systems)
2014-07-12 14:56:41 +02:00
Bjørn Forsman
b8bd3c166e
gnome-boxes: new package
...
gnome-boxes is a simple GNOME 3 application to access remote or virtual
systems.
Tested by creating a Ubuntu 14.04 VM from ISO image and playing around
with it. I cannot seem to get keyboard input to the VM. Mouse works
though.
2014-07-12 14:49:43 +02:00
Luca Bruno
88d9224f6d
caribou 3.12: fix at_spi2_core argument
2014-07-12 11:20:21 +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
Vladimír Čunát
5979d428b4
Merge recent master into x-updates
...
Hydra: ?compare=1134869
Conflicts (just meta):
pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
2014-07-09 22:13:29 +02:00
Luca Bruno
eedda21104
file-roller: fix icons
2014-07-09 22:12:06 +02:00
Vladimír Čunát
7be0fc2e51
xfce4-xkb-plugin: maintenance update
2014-07-07 19:03:48 +02:00
Luca Bruno
1b7d5ff469
empathy: fix icons
2014-07-06 11:31:09 +02:00