Commit graph

8422 commits

Author SHA1 Message Date
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
2ba0d9d3ae fuloong linux: add CGROUPS and disable FTRACE
FTRACE was making linux not load at all. And systemd
wants cgroups.
2013-03-30 23:38:39 +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
Peter Simons
6692fbd0ae haskell-defaults.nix: remove useless for cabal2nix on GHC 6.10.4
We cannot build 'tar' on that platform, which is a dependency of cabal2nix.
2013-03-30 00:12:36 +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
Eelco Dolstra
bd1c8a5048 prettytable: Update to 0.7.1 2013-03-29 20:08:34 +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
Peter Simons
905c058b6d haskell-accelerate-cuda needs old version of language-c-quote. 2013-03-29 17:51:29 +01:00
Peter Simons
e83c6b2749 haskell-language-c-quote: add version 0.7.1 2013-03-29 17:51:29 +01:00
Peter Simons
82030c4ba2 haskell-split: add version 0.2.1.3 2013-03-29 17:51:29 +01:00
Peter Simons
8a134745de haskell-hspec-expectations: add version 0.3.2 2013-03-29 17:51:29 +01: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
Peter Simons
02384dfc93 release-haskell.nix: adapt file to the new release-lib.nix 2013-03-29 16:46:59 +01: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
Rob Vermaas
6796240289 Add aws-sdk and deps (node library) 2013-03-29 15:04:02 +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
Domen Kožar
c2b44a8da0 Merge pull request #418 from bjornfor/pitz
pitz: new package
2013-03-28 09:39:53 -07:00
Bjørn Forsman
4b1042cf02 pitz: new package
pitz is a distributed bug tracker, inspired by ditz. Homepage:
http://pitz.tplus1.com/

pitz has a command line interface, pitz-<command>, and a webapp,
pitz-webapp.

TODO: pitz has a pitz-shell utility that depends on ipython, but when I
enabled it it raised an exception. I think it depends on an old IPython
version:

  from IPython.Shell import IPShellEmbed
  ImportError: No module named Shell

A broken pitz-shell doesn't affect the rest of the command line
interface nor the webapp, so it is not critical to have it working.

There are not many distributed bug trackers out there, so I hope that
adding pitz to nixpkgs may inspire people to support pitz (or similar
software).
2013-03-28 17:25:42 +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
Shea Levy
7a69bd708e Add the DBIxClassHelpers package
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-27 16:35:54 -04: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
Rok Garbas
310c732276 Merge pull request #415 from bjornfor/ipython-pylab
ipython: modularize and enable more features
2013-03-27 09:30:22 -07:00
Bjørn Forsman
25c49767f3 ipython: modularize and enable more features
Add these new attributes (all default to true):

  notebookSupport
  qtconsoleSupport
  pylabSupport
  pylabQtSupport

This adds jinja2, matplotlib, pyqt4 and sip as new dependencies of
ipython.

This commit fixes "ipython --pylab" so that it no more errors out with
"ImportError: No module named matplotlib" (which was my initial goal).
2013-03-27 15:39:03 +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
6601435473 beaker: skip tests as they fail 2013-03-27 09:22:24 +01:00
Domen Kozar
34841f9527 link bconsole to almir bin dir 2013-03-27 09:21:59 +01:00
Domen Kozar
f2e4d3a1c1 add deluge to top-level packages 2013-03-27 02:36:10 +01:00
Domen Kozar
c07d0b9b78 Add almir and it's dependencies. 2013-03-27 02:30:07 +01:00
aszlig
f1dcd8c11f
python-deluge: Fix GUI support.
Actually only pyGtkGlade was missing in propagatedBuildInputs. In addition,
buildInputs is quite redundant in this case, so let's drop it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-03-27 00:26:56 +01:00
Rommel M. Martinez
1c4e7e78ce Add chicken-4.8.1 2013-03-26 22:52:54 +08:00
Eelco Dolstra
c5f45036e6 release-lib.nix: Make the set of supported platforms an argument 2013-03-26 13:12:25 +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
Eelco Dolstra
78de3c912d Only return Hydra jobs for supported platforms 2013-03-26 11:59:00 +01:00
Eelco Dolstra
cffc126e14 Make Nixpkgs jobs unique
That is, there are now distinct jobs like ‘coreutils.x86_64-linux’ and
‘coreutils.x86_64-darwin’, rather than a single job ‘coreutils’ with
multiple builds.  This means that testing a job is simpler:

  $ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux

See https://github.com/NixOS/hydra/issues/60 for the motivation.
2013-03-26 11:58:59 +01:00
Peter Simons
f2726c5c57 perl-GD: update to version 2.49 in a blind attempt to fix test suite failures on x86-linux 2013-03-26 02:19:22 +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
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
b7a8b5fc11 haskell-HGL: drop obsolete library that doesn't compile anymore with recent GHCs 2013-03-25 14:25:52 +01:00
Peter Simons
03149a85dc rsync: fix build an FreeBSD (by disabling ACL support) 2013-03-25 12:44:22 +01:00
Peter Simons
aff27c669e haskell-cuda: add version 0.5.0.1 2013-03-25 11:47:58 +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
Peter Simons
6f85323164 haskell-circle-packing: add version 0.1.0.2 2013-03-24 18:08:35 +01:00
Peter Simons
8de45f4da4 haskell-arithmoi: add version 0.4.0.3 2013-03-24 17:44:05 +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
Peter Simons
35c86a3d99 release-haskell.nix: configure package set for ghc 6.10.4, 6.12.3 and 7.0.4 2013-03-23 18:44:44 +01:00
Peter Simons
439809b6c6 Fix build of haskell-platform 2009.2.0.2. 2013-03-23 18:44:44 +01:00
Peter Simons
f684ed19ba haskell-editline: add old version 0.2.1.0 2013-03-23 18:44:44 +01:00
Peter Simons
573e61ea6f pkgs/top-level/release-haskell.nix: configure Hydra to verify that important Haskell packages build
At the moment, this file is used only by my own Hydra instance.
2013-03-23 15:58:14 +01:00
Sander van der Burg
5add198e3d nijs: updated to 0.0.5 2013-03-23 15:24:59 +01:00
Rok Garbas
fb127d28cb ipython: adding depenencies for ipython's notebook 2013-03-23 00:38:18 +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
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
Florian Friesdorf
36ca429641 ipdbplugin: nose ipdb plugin, nosetests --ipdb 2013-03-19 19:14:47 +01: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
4ef33e7a67 perlPackages: add SGMLSpm
Required by iputils to create the manpages.
2013-03-18 15:07:19 +01:00
Peter Simons
a3e96d7d94 Merge pull request #393 from aforemny/haskell-authenticate-oauth
Add haskell-authenticate-oauth
2013-03-18 06:21:56 -07:00
Lluís Batlle i Rossell
ec99c8625b openjade: making it build
It wants an older perl.
2013-03-18 13:56:51 +01:00
Alexander Foremny
7c071ade78 Add haskell-authenticate-oauth 2013-03-18 13:29:00 +01:00
Peter Simons
3e4b863c62 Merge pull request #388 from aforemny/haskell-netwire
Add haskell-netwire
2013-03-18 04:20:23 -07:00
Peter Simons
c78d28fb72 Merge pull request #389 from aforemny/haskell-cereal-conduit
Add haskell-cereal-conduit
2013-03-18 04:19:51 -07:00
Peter Simons
dad328f766 Merge pull request #390 from aforemny/haskell-stm-conduit
Add haskell-stm-conduit
2013-03-18 04:19:29 -07:00
Peter Simons
07bbcaf29e haskell-GLUT: add version 2.4.0.0 2013-03-18 12:17:24 +01:00
Peter Simons
f642dcd638 haskell-OpenGL: add version 2.8.0.0 2013-03-18 12:17:24 +01:00
Peter Simons
852350301f haskell-mmorph: add version 1.0.0 2013-03-18 12:17:24 +01:00
Peter Simons
26a39d2dbc haskell-monad-par: update to version 0.3.4.1 2013-03-18 12:17:24 +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
Rok Garbas
4ec3035a04 pythonPackage.turses: update to 0.2.13 2013-03-17 15:24:45 +01:00
Rok Garbas
cad8f4b0f6 pythonPackage.flake8: update to 2.0
flake8 is not depending on pyflakes, mccabe, pep8 which were also updated or added.
2013-03-17 15:23:56 +01:00
Rok Garbas
cdcfc953bf pythonPackages.httplib2: update to 0.8 2013-03-17 15:17:20 +01:00
Rok Garbas
44ec42ed93 pythonPackages.alot: update to 0.3.4 (and stable revision) 2013-03-17 15:15:56 +01: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
8082dd3753 Add haskell-stm-conduit
This adds the dependency haskell-stm-chans as well.
2013-03-16 15:33:16 +01:00
Alexander Foremny
4873645bef Add haskell-cereal-conduit 2013-03-16 15:24:09 +01:00
Alexander Foremny
47ca534deb Add haskell-netwire 2013-03-16 15:14:29 +01: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
Peter Simons
e0b0be9fb3 pkgs/top-level/release.nix: enable Hydra builds of GHC versions 6.10.4, 6.12.3, 7.0.4, 7.4.2, and 7.6.2
Ensure that binary packages of the compiler itself are available from Hydra.
2013-03-14 19:25:27 +01:00
Eelco Dolstra
3bf249cb12 Module::Find: Update to 0.11 2013-03-14 16:37:18 +01: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
Shea Levy
0a52bc5d8e Add Catalyst::Action::REST perlPackage
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-13 09:02:27 -04: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
aeb00df015 Merge branch 'deluge136' of git://github.com/iElectric/nixpkgs
Trivial upgrade, deluged still starts fine.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-11 21:00:00 -04:00
Domen Kožar
a69d56a807 upgrade deluge to 1.3.6 2013-03-12 01:13:52 +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
Sander van der Burg
3d55f1d222 nijs: Bump to 0.0.4 2013-03-11 17:43:59 +01:00
Andres Loeh
db104a8c3f haskell-constraints: add package 2013-03-11 12:47:01 +01:00
Peter Simons
e1f633bdae all-packages.nix: strip trailing whitespace 2013-03-11 11:36:15 +01:00
Peter Simons
e45d55964b alex: update to version 3.0.5 2013-03-11 11:26:14 +01:00
Sander van der Burg
53ee192dc5 perl-Error: bump to 0.17019 2013-03-11 11:10:10 +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
Александр Цамутали
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
Peter Simons
acd06b6ea0 haskell-shake: add version 0.9.1 2013-03-09 13:11:48 +01:00
Peter Simons
edfcb485a8 jailbreak-cabal: build jailbreak-cabal with a version of Cabal that has its unit tests disabled
Cabal's unit test suite depends on testFrameworkQuickcheck2, which
depends on jailbreakCabal, which depends on Cabal: *BOOM*
2013-03-09 13:04:19 +01:00
Peter Simons
63cd00856e haskell-defaults.nix: don't pass inconsistent Cabal versions to cabal2nix 2013-03-09 13:04:19 +01:00
Peter Simons
78140c3acd haskell-packages.nix: add 'disableTests' convenience function 2013-03-09 13:04:19 +01:00
Peter Simons
3704855f78 pkgs/top-level/haskell-defaults.nix: cosmetic 2013-03-09 13:04:19 +01:00
Florian Friesdorf
a49bd047c0 add older buildout152 2013-03-09 10:41:27 +01:00
Florian Friesdorf
de36ddf7e7 add older pycrypto25 2013-03-09 10:24:38 +01:00
Shea Levy
08d076d6fc Merge branch 'perl.130308' of git://github.com/jcumming/nixpkgs
Trivial update to XML-LibXML perlPackage

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 19:17:40 -05: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
Shea Levy
f2c79c4542 Remove some references to non-existent packages 2013-03-08 16:36:59 -05:00
Jack Cummings
1e2e5babf1 XML-LibXML-2.0014, as XML-LibXML-2.0001 doesn't exist upstream anymore 2013-03-08 07:44:30 -08:00
Peter Simons
cf53885d84 haskell-syb: update to version 0.4.0 2013-03-08 13:43:35 +01:00
Peter Simons
d7bc87693f haskell-quickcheck: update to version 2.6 2013-03-08 13:43:21 +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