mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-24 02:46:38 +00:00
Code Issues Wiki Activity
26466 commits 199 branches 125 tags 9.8 GiB
Commit graph

6492 commits

Author SHA1 Message Date
Sander van der Burg 1d255f9ab3 titaniumsdk: Added version 3.1 next to version 2.1, and make it configurable 2013-04-16 14:08:37 +02:00
viric d2d69902e8 Merge pull request #456 from bjornfor/premake 
premake: bump to version 4.3
 2013-04-15 14:35:46 -07:00
Lluís Batlle i Rossell 37b1937704 pidgin-otr: update to 4.0.0 2013-04-15 21:35:26 +02:00
Lluís Batlle i Rossell d0d1385e1d pidgin-otr: setting its libotr to 3.2 too 2013-04-15 20:15:19 +02:00
Lluís Batlle i Rossell b628bbda90 libotr: adding back libotr 3.2; bitlbee failed without it 2013-04-15 20:15:19 +02:00
Vladimír Čunát 6bd036d5f9 non-linux attempts to fix: libbonobo and libjpeg 2013-04-14 14:06:10 +02:00
Vladimír Čunát d8a2ae8d01 some libintl and libiconv cleanups + non-linux fixes 2013-04-14 13:43:09 +02:00
Lluís Batlle i Rossell 5f2a1806e5 Adding irssi-otr. 2013-04-13 17:17:47 +02:00
Lluís Batlle i Rossell 49d4d308d4 Adding freenet 
I don't build freenet_ext or bcprov, I just take the jar.
Freenet irc people told me that freenet_ext barely changes and it's a hell to build.
 2013-04-13 15:01:46 +02:00
Vladimír Čunát 17ae1617dc Merge branch 'master' into x-updates 
Conflicts (systemd version is split on x-updates):
	pkgs/os-specific/linux/systemd/default.nix
 2013-04-13 12:21:31 +02:00
Florian Friesdorf 2cb87d9ca1 pythonPackages.ipythonLight: no qt/numpy dependency 2013-04-13 10:02:17 +02:00
Lluís Batlle i Rossell dc50bd550a Adding fish (blowfish over irc) for irssi. 2013-04-13 01:35:16 +02:00
Lluís Batlle i Rossell aaf0a34f2a Adding silc-client as irssi plugin 
Alone, with its own irssi, doesn't build.
 2013-04-12 21:39:07 +02:00
Lluís Batlle i Rossell cdd57eb434 Adding silc-server. 2013-04-12 21:39:06 +02:00
Vladimír Čunát 96dd66bf25 Revert "wxGTK: temporarily disable gstreamer support" 
This reverts commit 9b187c0be1.
Orbit should work again, thanks to @MarcWeber.
 2013-04-12 03:22:27 +02:00
Cillian de Róiste 562cb3f460 Add Plymouth: WIP 2013-04-12 01:58:38 +02:00
Marc Weber 18297893a3 dbus_daemon is referenced by nixos 2013-04-12 00:19:15 +02:00
Vladimír Čunát 8249695b61 Merge branch 'master' into x-updates 
Needed that to fix the tarball.
 2013-04-11 23:31:33 +02:00
Vladimír Čunát 7d9607f151 dbus: minor update, reorganize and polish the expression 2013-04-11 22:17:26 +02:00
Shea Levy 1c2565a8ef Add hipchat messaging client 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-04-11 14:42:32 -04:00
Lluís Batlle i Rossell d8f98d1a85 Adding avxsynth. 
To add it, I also add ffms and log4cpp.
 2013-04-10 15:12:37 +02:00
Eelco Dolstra bfa358c76e firefox: Update to 20.0 2013-04-09 18:00:26 +02:00
Bjørn Forsman 38c7d196ac premake: bump to version 4.3 
aacskeys depends on premake3, so keep that version around.
 2013-04-08 21:06:54 +02:00
Rickard Nilsson 1f82083c20 darktable: Update to 1.2 2013-04-08 18:22:15 +02:00
Peter Simons cde41fe551 perl-packages.nix, all-packages.nix: generally refer to 'postgresql' instead of 'postgresql92' 
This allows users to override the 'postgres' attribute with a different version
and have the effect propagated to all other packages that depend on it.
 2013-04-06 15:24:11 +02:00
Lluís Batlle i Rossell 78827836cc openlierox: fixing and updating. 2013-04-06 12:09:18 +02:00
Domen Kozar 130c081966 add thinkfan package 2013-04-06 00:34:50 +02:00
Lluís Batlle i Rossell 04d41f95d0 Adding d2x-rebirth, source port of the Descent 2 engine 2013-04-05 22:59:20 +02:00
Lluís Batlle i Rossell 65c008f653 Adding d1x-rebirth, Descent 1 source port. 2013-04-05 22:59:20 +02:00
Lluís Batlle i Rossell d5a036d63d Adding Skype Call Recorder. 2013-04-05 16:03:25 +02:00
Cillian de Róiste 742d198def Add mid2key: a tool which maps midi notes to keystrokes 2013-04-05 01:25:34 +02:00
Lluís Batlle i Rossell d0d4e66652 ffmpeg: update to 1.2 (and patching mplayer2) 
Simple patch required by mplayer2 to build with ffmpeg 1.2.
 2013-04-04 23:07:23 +02:00
viric 4caae69c69 Merge pull request #449 from cpages/dhewm3 
Dhewm3: an SDL port of the Doom 3 GPL code
 2013-04-04 13:14:04 -07:00
Vladimír Čunát 18480ed41b dbus_* naming reorganization 2013-04-04 22:00:59 +02:00
Vladimír Čunát eb2e46aab2 Merge branch 'master' into x-updates 
Conflicts:
	pkgs/applications/graphics/rawtherapee/default.nix
	pkgs/applications/misc/blender/default.nix
	pkgs/applications/networking/browsers/chromium/sources.nix
	pkgs/os-specific/linux/kernel/linux-3.9.nix
	pkgs/top-level/all-packages.nix
 2013-04-04 21:43:40 +02:00
Eelco Dolstra 22d4472d27 postgresql: Make 9.2 the default 
PostgreSQL 8.3 is end-of-life so it shouldn't be our default anymore.

The problem with changing the default PostgreSQL is that it breaks
NixOS installations that have PostgreSQL enabled without specifying an
explicit PostgreSQL version, because PostgreSQL does not do automatic
schema migration if the major version changes.

Thus, it's always a good idea to specify the desired major version
explicitly:

  services.postgresql.package = pkgs.postgresql92;

(In fact, maybe we should remove the default value for
services.postgresql.package.)
 2013-04-04 18:13:09 +02:00
Rickard Nilsson e31ffe6fb0 gmpc 11.8.16: New package, a GTK MPD (Music Player Daemon) client 2013-04-04 17:42:17 +02:00
Rickard Nilsson 7dbec8267c normalize 0.7.7: New package, an audio file normalizer 2013-04-04 17:07:09 +02:00
Vladimír Čunát 94c741c7ad gvfs: add globally, lightWeight by default 
HeavyWeight will be fixed after gnome3 from x-updates.
 2013-04-04 12:02:53 +04:00
Vladimír Čunát 7ce97cc443 udisks: split to udisks1 (stays default) and udisks2 2013-04-04 12:02:53 +04:00
Moritz Ulrich f49becb7a6 Merge branch 'master' into dropbox-py 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>

Conflicts:
	pkgs/top-level/all-packages.nix
 2013-04-04 00:18:48 +02:00
Vladimír Čunát 16f4550761 Merge pull request #411 from ocharles/gnome-themes-standard 
gnome-themes-standard: Initial expression
 2013-04-03 11:59:19 -07:00
Vladimír Čunát a89ca06293 Merge pull request #439 from jcumming/recoll.130401 
recoll: add 1.18.1
 2013-04-03 08:22:33 -07:00
Vladimír Čunát 96d5b0fc26 Merge pull request #419 from MarcWeber/submit/lprof 
lprof: add
 2013-04-03 08:15:30 -07:00
Vladimír Čunát 2cd7d9d29e Merge pull request #417 from the-kenny/g500-control 
g500-control: add
 2013-04-03 08:14:18 -07:00
Carles Pagès 8f2662d480 dhewm3: add current master from github 
This is a port of the Doom 3 source code released under GPL. Amongst others,
this makes use of SDL to be multiplatform, and supports amd64.
 2013-04-02 22:28:30 +02:00
Rickard Nilsson c544639554 darktable: Add 1.2-RC1 as darktable12 2013-04-02 15:53:57 +02:00
Jack Cummings 7bc828366f recoll-1.18.1 2013-04-01 15:42:41 -07:00
viric 7c56d001b2 Merge pull request #427 from mpashton/mpa 
Upgrade kicad to stable 20130325
 2013-04-01 11:05:51 -07:00
Peter Simons 8b3fd09c00 Merge pull request #433 from jcumming/rawtherapee.130331 
rawtherapee-4.0.10
 2013-04-01 02:42:32 -07:00
Peter Simons f7b0e161b0 Merge pull request #432 from jcumming/shntool.130322 
shntool-3.0.10
 2013-04-01 02:39:46 -07:00
Peter Simons 6382266e58 Merge pull request #431 from jcumming/cuetools.130317 
cuetools-1.3.1
 2013-04-01 02:39:17 -07:00
Peter Simons 7b6b0a85d4 Merge pull request #430 from orbitz/add-multitail-5.2.12 
Add multitail
 2013-04-01 02:36:57 -07:00
Jack Cummings 437419a124 rawtherapee-4.0.10 . Add a 'float' option to fftw, as this version of rawtherapee requires it. 2013-03-31 21:33:21 -07:00
Michael Ashton 7b01680d87 kicad: upgrade to stable version 20130325, libraries to r220 
- changed to require wxWidgets 2.9 -- seems to satisfy requirement for
libgtkprint, even with gtk2
 2013-03-31 19:17:02 -07:00
Rok Garbas 98ba667094 adding varnish 2013-04-01 01:24:56 +02:00
Malcolm Matalka d819ee8b7e Add multitail 2013-03-31 19:40:11 +02:00
Rok Garbas 86e5e52d99 plone: upgrading to 4.3rc1 2013-03-31 08:53:23 +02:00
Rok Garbas 38fce2879f Merge pull request #413 from ebzzry/master 
Add chicken-4.8.1
 2013-03-30 23:34:01 -07:00
Lluís Batlle i Rossell 6281042def Adding oath-toolkit and xmlsec 
I added xmlsec to make it work with oath-toolkit (to build one extra tool
there, that I don't need), but I couldn't make it work together.
 2013-03-31 00:08:17 +01:00
Lluís Batlle i Rossell c908d2130f Adding 'google-authenticator' 2013-03-30 21:06:06 +01:00
Lluís Batlle i Rossell c7cf2b1690 Adding otpw (a one-time password system) 2013-03-30 21:06:05 +01:00
Domen Kožar 3c7ec2b559 Merge pull request #422 from offlinehacker/xpra-0.8.8 
Upgrading xpra to 0.8.8
 2013-03-30 07:45:40 -07:00
Jaka Hudoklin 06425fca37 Upgrading xpra to 0.8.8 2013-03-30 15:23:51 +01:00
Vladimír Čunát 9b187c0be1 wxGTK: temporarily disable gstreamer support 
Currently it needs gconf2 which depends on orbit,
which seems unmaintained and doesn't even build with new glib.
 2013-03-30 12:12:22 +01:00
Lluís Batlle i Rossell 64e4027d91 Making omxplayer build with gcc47 2013-03-29 21:54:28 +01:00
Ludovic Courtès 4576896ef5 pthread-win32: use mingw_headers3', for consistency with gccCrossStageFinal' 2013-03-29 21:46:38 +01:00
Shea Levy eb2e3f648a Pass overrides for perl510Packages too 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-29 13:07:41 -04:00
Shea Levy 34e0c33d6f Allow overriding perlPackages 
__overrides is the worst.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-29 12:41:38 -04:00
Domen Kozar 6026c60388 spring: bump and fix build 2013-03-29 16:43:48 +01:00
Peter Simons c0904ba327 Merge pull request #420 from ocharles/lightdm 
lightdm: Add lightdm and lightdm-gtk-greeter
 2013-03-29 08:19:26 -07:00
Oliver Charles 255f402bdd lightdm: Add lightdm and lightdm-gtk-greeter 2013-03-29 15:37:28 +01:00
Rob Vermaas 2fa4e36946 Add weighttp 0.3 2013-03-29 15:04:59 +01:00
Marc Weber 4926ad90e7 adding lprof 2013-03-29 14:52:47 +01:00
Lluís Batlle i Rossell 5f677039c7 Adding back the 1.5 expression of mupen64plus 
It has a GUI, for example.
 2013-03-28 18:16:40 +01:00
Lluís Batlle i Rossell 3abc3f4a68 Updating mupen64plus, and adding a GUI for it. 
I can't say the GUI works very well... it doesn't find the core properly,
but I couldn't find why.
 2013-03-28 18:13:18 +01:00
Shea Levy cfbdb33197 Add a latest linuxPackages for living on the edge 
Theoretically this could be automatically detected by finding all
packages named 'linux' and choosing the latest, but that's overkill.
Just update it when a new kernel is added.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-28 10:59:40 -04:00
Cillian de Róiste 0caed13c85 Merge: use Python 3.3 as the default version of Python3 2013-03-28 01:13:37 +01:00
Cillian de Róiste 5c40e28dfb Rename oiio to openimageio (more explicit) and add opencolorio 2013-03-28 00:47:47 +01:00
Eelco Dolstra 916c1adb84 Delete all kernels older than 2.6.39 
Systemd doesn't support those kernels, so there is no point in keeping
them around.
 2013-03-27 23:00:02 +01:00
Cillian de Róiste 64bc336f50 Blender 2.66 WIP 2013-03-27 22:25:33 +01:00
Moritz Ulrich ff953e211e New package: dropbox-cli 
dropbox-cli, part of dropbox-nautilus is a small self-contained python
script to control the dropbox daemon.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-03-27 20:12:58 +01:00
Moritz Ulrich e70954f8c8 New package: g500-control 
g500-control is a small tool to configure internal profiles of a
Logitech G500 mouse.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-03-27 19:51:32 +01:00
Lluís Batlle i Rossell 99c65b6693 Making wings work (it works with the old erlang). 2013-03-27 15:38:31 +01:00
Domen Kozar f2e4d3a1c1 add deluge to top-level packages 2013-03-27 02:36:10 +01:00
Rommel M. Martinez 1c4e7e78ce Add chicken-4.8.1 2013-03-26 22:52:54 +08:00
Carles Pagès ceacc508dc mesa: append version of mesa_noglu to mesa buildEnv name. 2013-03-26 13:01:18 +01:00
Eelco Dolstra bcc14c4d3c Add an "unstable" aggregate to replace the "unstable" view 
Views are obsolete, aggregates are the declarative replacement.
 2013-03-26 11:59:00 +01:00
Peter Simons f658d72377 texLiveFull: include texinfo in the generated environment 2013-03-26 01:16:15 +01:00
Peter Simons 270a0009be python3: update to version 3.3.0 2013-03-26 01:16:15 +01:00
Peter Simons 98af10f476 all-packages.nix: mark python3 'hiPrio' so that it takes precedence when version 2.x and 3.x are installed into the same environment 2013-03-26 01:16:15 +01:00
Peter Simons e825c522b6 Merge pull request #409 from pcapriotti/renameutils 
Add renameutils package.
 2013-03-25 11:40:36 -07:00
Oliver Charles 0a947728e2 gnome-themes-standard: Initial expression 2013-03-25 15:23:45 +01:00
Lluís Batlle i Rossell 26ec1abf41 Adding Steam Locomotive, for the fun 2013-03-25 14:57:45 +01:00
Paolo Capriotti f85025a30e Add renameutils package. 2013-03-25 13:45:01 +00:00
Peter Simons 03149a85dc rsync: fix build an FreeBSD (by disabling ACL support) 2013-03-25 12:44:22 +01:00
Mathijs Kwik b1200f1a28 mongodb: upgrade to 2.4.0 2013-03-25 08:08:46 +01:00
Jack Cummings 94a3a5e00a shntool-3.0.10 2013-03-24 22:08:09 -07:00
Peter Simons d2fff5ed22 gnulib: add version 0.0-7898-gdb9cad7 2013-03-24 23:32:14 +01:00
Shea Levy 4fa4ab3a6e Partially revert my recent kernelPackages changes 
First, pass in `self' again so that overriding works properly (thanks
for pointing that out, @edolstra)

Second, instead of having linuxPackages*.kernel mean something different
inside the set and out, add a new attribute linuxPackages*.kernelDev,
which for the generic kernel is simply linuxPackages*.kernel but for the
manual-config kernel is the `dev' output (which has the build tree,
source tree, etc.)

The second change required trivial modifications in a bunch of
expressions, I verified that all of the linuxPackages* sets defined in
all-packages.nix have the same drv paths before and after the change.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-24 07:45:00 -04:00
Carles Pagès 68be54c8e2 mesa: create a buildEnv that joins mesa (without glu) and glu 
Since mesa-9.x, upstream has separated mesa and glu. @peti suggested using
buildEnv to create a mesa environment that acts like old mesa, which is what
this commit does.
 2013-03-24 12:36:33 +01:00
Lluís Batlle i Rossell 4144141c7b Fixing the teamviewer evaluation and builds. 
Now tested even the tarball, before committing.
 2013-03-22 16:16:37 +01:00
Rok Garbas f7ddf2fc4a Merge pull request #398 from the-kenny/dunst 
dunst, a lightweight notification daemon
 2013-03-22 05:17:02 -07:00
Lluís Batlle i Rossell d716731cf4 teamviewer: adding a work-in-progress lowprio version 8. 
It requires root running a daemon, just to use the client. Suspicious.
 2013-03-22 12:41:16 +01:00
Lluís Batlle i Rossell 930ace150b Adding teamviewer client for linux (www.teamviewer.com) 
In fact it uses wine.
 2013-03-22 12:10:50 +01:00
Mathijs Kwik 8b39202106 add dutch tax application for 2012 2013-03-22 00:00:04 +01:00
Michael Raskin 8e5dc9b5df Fix K3D gtlglext handling 2013-03-21 13:45:12 +04:00
Michael Raskin 3c1ce85692 Fix ZBar build by passing it gtk2 2013-03-21 11:59:07 +04:00
Lluís Batlle i Rossell 90b2dcdd2a Revert "i3 window manager: cairo.override with xcbSupport enabled, on par with i3lock" 
i3 doesn't want cairo at all.

This reverts commit 1eb4377840.
 2013-03-20 22:38:27 +01:00
Moritz Ulrich c2d3d24349 Add dunst, a lightweight notification daemon. 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-03-20 21:35:13 +01:00
modulistic 1eb4377840 i3 window manager: cairo.override with xcbSupport enabled, on par with i3lock 2013-03-20 00:11:58 +01:00
Sergey Mironov 53ea9a8abc bluez5: mark bluez5 with loPrio 2013-03-19 19:19:46 +04:00
Eelco Dolstra 93a963f347 nixUnstable: Update to the latest 
This is mostly to get rid of those annoying Perl warnings in NixOS...
 2013-03-18 22:35:33 +01:00
Lluís Batlle i Rossell 4ae71ad19d Adding the sgml dtd for docbook 3.1 
Required by iputils manpages.
 2013-03-18 15:07:20 +01:00
Lluís Batlle i Rossell ec99c8625b openjade: making it build 
It wants an older perl.
 2013-03-18 13:56:51 +01:00
Peter Simons 4fce144369 Merge pull request #387 from aforemny/cloc 
Add cloc-1.58
 2013-03-18 04:04:04 -07:00
Jack Cummings dbee2b8ee9 cuetools-1.3.1 2013-03-17 16:18:36 -07:00
Lluís Batlle i Rossell 51528e61d9 transmission: update to 2.77, but leave the old 2.60 for its gtk client 
The gtk client in 2.61 and above require a gtk3 we don't have in nixpkgs yet.
 2013-03-17 22:27:55 +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 516133a4fd Merge pull request #378 from cpages/wayland 
wayland: add weston and dependencies
 2013-03-16 11:38:34 -07:00
Vladimír Čunát d898a207b9 Merge pull request #375 from ierton/viewnior 
viewnior: Add viewnior, GTK image viewer program
 2013-03-16 11:33:53 -07:00
Alexander Foremny 4e5b7cd5d1 Add cloc-1.58 2013-03-16 15:06:23 +01:00
Lluís Batlle i Rossell 4dbdbda37f Adding storebrowse, a tool to browse the nix store with a web browser. 
The build script is a bit long due to the upstream go style of things.
 2013-03-16 00:59:25 +01:00
Lluís Batlle i Rossell 9db9af4fa6 opencascade: Adding ode version 
(Open Community version)
 2013-03-15 14:34:53 +01:00
Sergey Mironov dc5c6e1607 bluez5: add experimental expression for bluez5 
bluez5 has many changes relative to bluez4. Most notable are dependency on
linux-3.4 and new dbus API.
 2013-03-14 17:58:31 +04:00
Rob Vermaas 4619675011 Add rsyslog 7.2.6 and its dependencies 2013-03-14 14:13:55 +01:00
Peter Simons a8a6fd4063 texinfo: update to version 5.1 2013-03-13 15:13:40 +01:00
Rob Vermaas b512e3e934 Initial try to update spotify to version 0.8.4.103. Still need to get rid 
of LD_LIBRARY_PATH wrapper, and properly patchelf any libs in the spotify
prefix.
 2013-03-12 22:13:29 +01:00
Sergey Mironov c52bd0c8d8 viewnior: Add viewnior, GTK image viewer program 2013-03-12 23:45:50 +04:00
Lluís Batlle i Rossell 90bca24b38 Adding mktorrent 1.0 2013-03-12 19:43:57 +01:00
Shea Levy 3e61084006 eclipses: use older cairo 
In #167, Marc Weber reported that eclipse crashes after selecting a
workspace with the current nixpkgs cairo. This has the same functional
change as #167, but IMO the implementation is cleaner.

Fixes #167

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-11 19:29:39 -04:00
Shea Levy 897840f76f Add cairo-1.12.2 
Needed for an upcoming fix to eclipse.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-11 19:19:48 -04:00
Shea Levy ef82ab3fca Merge branch 'sdcc' of git://github.com/bjornfor/nixpkgs 
New package, it builds, I ship.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-11 18:51:17 -04:00
Bjørn Forsman 859a227595 sdcc: new nixpkg (SDCC -> Small Device C Compiler) 
SDCC is a retargettable, optimizing ANSI - C compiler suite that targets
the Intel MCS51 based microprocessors (8031, 8032, 8051, 8052, etc.),
Maxim (formerly Dallas) DS80C390 variants, Freescale (formerly Motorola)
HC08 based (hc08, s08) and Zilog Z80 based MCUs (z80, z180, gbz80,
Rabbit 2000/3000, Rabbit 3000A). Work is in progress on supporting the
Microchip PIC16 and PIC18 targets. It can be retargeted for other
microprocessors.
 2013-03-11 21:59:40 +01:00
Peter Simons e1f633bdae all-packages.nix: strip trailing whitespace 2013-03-11 11:36:15 +01:00
Lluís Batlle i Rossell 5e3e07293f Updating glibc locales and info to 2.17 too. 2013-03-10 23:59:08 +01:00
Vladimír Čunát dc5c4917a5 vala: update to 0.19 2013-03-10 19:53:43 +01:00
Carles Pagès 6c949148b6 Merge remote-tracking branch 'upstream/x-updates' into wayland 
Conflicts:
	pkgs/development/libraries/mesa/default.nix
	pkgs/top-level/all-packages.nix
 2013-03-10 18:19:49 +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
Александр Цамутали a39f05f46a applications/audio/jack-rack: New nixpkg. 2013-03-09 18:03:12 +04:00
Александр Цамутали 241f94f59f applications/audio/caps: New nixpkg. 2013-03-09 17:54:59 +04:00
Michael Raskin f5195531ae Adding reference to ZPAQ in all-packages 2013-03-09 17:31:01 +04:00
Shea Levy 9158ad45f1 Merge branch 'xchainkeys' of git://github.com/iyzsong/nixpkgs 
This adds a new package, xchainkeys. It builds, so I ship.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-08 19:08:56 -05:00
Shea Levy 5e434ef318 Merge branch 'p/selinux' of git://github.com/vcunat/nixpkgs 
This branch adds libcap-ng and updates SELinux. It doesn't seem like
anyone is actually using SELinux from nixpkgs, but everything compiles
and looks right.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-08 18:00:16 -05:00
Shea Levy e13c058fd2 Merge branch 'makemkv.130223.0' of git://github.com/jcumming/nixpkgs 
This adds the proprietary makemkv package to convert dvd and blu-ray
videos to mkv.

I've tested that it builds, nothing more.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-08 17:26:53 -05:00
Shea Levy 66ad165829 Merge branch 'add-opam-0.9.5' of git://github.com/orbitz/nixpkgs 
This adds the opam ocaml package, and also adds orbitz as a maintainer.
I've tested that it builds, nothing more.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-08 17:10:54 -05: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
orbitz fd48192018 Add opam 0.9.5 2013-03-08 22:42:22 +01:00
orbitz 6da29419e4 Add opam 0.9.4 2013-03-08 11:56:50 +01:00
Song Wenwu 9cbcbc5323 add xchainkeys-0.11 2013-03-08 13:55:32 +08:00