mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 15:11:35 +00:00
Code Issues Wiki Activity
46955 commits 249 branches 124 tags 7.1 GiB
Commit graph

1460 commits

Author SHA1 Message Date
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
Luca Bruno 1c1747be0d Add gnome shell extensions plugin for browsers 2014-07-05 21:16:31 +02:00
Luca Bruno 55dc58d7d0 evolution-data-server: wrap all libexec executables 2014-07-05 19:52:39 +02:00
Luca Bruno 9ec0a105d3 gnome-shell: enable parallel building 2014-07-05 19:52:38 +02:00
Luca Bruno 5dc9730a63 gnome-music 3.12: add totem-pl-parser to dependencies 2014-07-05 13:52:29 +02:00
Vladimír Čunát aceb30cd93 Merge master into x-updates 
Adds the mass-rebuilding python update.
 2014-07-02 22:54:41 +02:00
Vladimír Čunát 6a77d5fd3e Merge #3054: add kde 4.13.2 2014-06-30 21:26:49 +02:00
Wout Mertens 8e7fded9c9 vte: store patch in repo, source offline 2014-06-30 16:10:50 +02:00
Vladimír Čunát dfd80a1b7e Merge recent master into x-updates 
Hydra eval: 1131611
 2014-06-26 22:05:15 +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
Wout Mertens f34e801dd1 kde: Make kde4_next desktop compile 2014-06-22 19:35:31 +02:00
Peter Simons ca9f7f47ec libgnome: add libogg some more 2014-06-20 18:51:32 +02:00
Peter Simons 9c1a803019 libgnome: fix build by adding missing libogg 2014-06-20 18:40:14 +02:00
Wout Mertens 8dcf70f918 kde: Some tweaks to kde-manifest.sh 
- Allow packages with different versions than $release (kde-workspace)
- Extra checks
 2014-06-19 19:50:38 +02:00
Wout Mertens 8fe3bd5aa4 kde: Copy 4.12 to 4.13 as a base 2014-06-19 15:27:00 +02:00
Vladimír Čunát 8aa892489e xfce4-appfinder: update 4.9.4 -> 4.10.1 2014-06-17 09:02:38 +02:00
Vladimír Čunát 5c72dac548 libxfce4util: minor update 4.10.0 -> 4.10.1 2014-06-17 09:02:38 +02:00