Commit Graph

13612 Commits

Author SHA1 Message Date
Eelco Dolstra
11b67ccee5 * Move buildPythonPackage and setuptools into python-packages.nix.
This ensures that they're built with the same "python" argument.

svn path=/nixpkgs/branches/modular-python/; revision=26593
2011-03-29 15:02:15 +00:00
Eelco Dolstra
1439ae44be * Sync with the trunk.
svn path=/nixpkgs/branches/modular-python/; revision=26586
2011-03-28 20:22:30 +00:00
Lluís Batlle i Rossell
497fc7bb94 Making btanks work (and adding smpeg).
svn path=/nixpkgs/trunk/; revision=26585
2011-03-28 18:58:49 +00:00
Eelco Dolstra
c1b64da1c9 * xen: use wrapPython.
svn path=/nixpkgs/branches/modular-python/; revision=26584
2011-03-28 18:12:32 +00:00
Eelco Dolstra
968496e69b * wrapPythonPrograms: rewrite the common "#! .../env python" idiom to
"#! .../python".

svn path=/nixpkgs/branches/modular-python/; revision=26583
2011-03-28 17:19:27 +00:00
Eelco Dolstra
7b3bda471d * keepnote: depend on pythonPackages.sqlite3 rather than pythonFull.
svn path=/nixpkgs/branches/modular-python/; revision=26582
2011-03-28 16:48:31 +00:00
Eelco Dolstra
0a7b7374ac * Bazaar: depend on readline.
svn path=/nixpkgs/branches/modular-python/; revision=26581
2011-03-28 16:48:02 +00:00
Eelco Dolstra
47adaa80e3 * Move the wrapPythonPrograms function into a separate setup hook
(wrapPython).

svn path=/nixpkgs/branches/modular-python/; revision=26580
2011-03-28 16:33:33 +00:00
Lluís Batlle i Rossell
3dcaa029ab Adding the zod engine, a multiplayer zed remake.
svn path=/nixpkgs/trunk/; revision=26577
2011-03-28 16:08:29 +00:00
Lluís Batlle i Rossell
8bf1dd5cef Updating xchm
svn path=/nixpkgs/trunk/; revision=26576
2011-03-28 16:08:26 +00:00
Lluís Batlle i Rossell
655a9ea9c3 Adding the racing videogame VDrift.
I added the asio library as a side effect.

svn path=/nixpkgs/trunk/; revision=26575
2011-03-28 16:08:21 +00:00
Lluís Batlle i Rossell
97182f0bcb Making SDL_gfx and SDL_image find the SDL headers, by a postInstall patch.
They expected to sit in the same directory as the SDL headers.

svn path=/nixpkgs/trunk/; revision=26574
2011-03-28 16:08:17 +00:00
Eelco Dolstra
641834ddf6 * Bazaar: update to 2.3.1.
svn path=/nixpkgs/branches/modular-python/; revision=26573
2011-03-28 15:47:50 +00:00
Eelco Dolstra
83b3ab4657 * Adobe Reader: depend on gdk_pixbuf (from Marc Weber). Also update
to 9.4.2.

svn path=/nixpkgs/trunk/; revision=26572
2011-03-28 15:46:10 +00:00
Eelco Dolstra
120d1757fe * buildPythonPackage: added an argument `pythonPath' to specify Python
dependencies that are *not* propagated to the user environment
  (as opposed to `propagatedBuildInputs').  For instance, if you
  install `iotop', you typically don't want its Python dependencies
  polluting the user environment.
  
* buildPythonPackage: some cleanup (e.g. use function argument
  defaults instead of `if attrs ? foo then attrs.foo else []').

svn path=/nixpkgs/branches/modular-python/; revision=26571
2011-03-28 15:30:48 +00:00
Andres Löh
b18dd91057 Removing trailing whitespace.
svn path=/nixpkgs/trunk/; revision=26570
2011-03-28 15:04:00 +00:00
Andres Löh
127a2fc8e0 Added random-fu plus dependencies.
(Unfortunately doesn't compile yet with ghc-7.)

svn path=/nixpkgs/trunk/; revision=26569
2011-03-28 15:03:51 +00:00
Eelco Dolstra
db2b2413db svn path=/nixpkgs/branches/modular-python/; revision=26568 2011-03-28 13:24:21 +00:00
Eelco Dolstra
60c787522f * iotop: don't use pythonFull.
svn path=/nixpkgs/branches/modular-python/; revision=26567
2011-03-28 13:23:52 +00:00
Eelco Dolstra
f119c267de * getmail: don't use pythonFull.
svn path=/nixpkgs/branches/modular-python/; revision=26566
2011-03-28 13:13:15 +00:00
Eelco Dolstra
cef7e52b5a * ipython: simplify.
svn path=/nixpkgs/branches/modular-python/; revision=26565
2011-03-28 12:40:53 +00:00
Eelco Dolstra
3c9f4e6e72 * For convenience, provide pythonFull as a wrapper around Python that
includes all the internal Python modules.

svn path=/nixpkgs/branches/modular-python/; revision=26564
2011-03-28 12:31:56 +00:00
Ludovic Courtès
ed10cda58d Guile-Lib 0.2.0.
svn path=/nixpkgs/trunk/; revision=26563
2011-03-28 12:05:17 +00:00
Ludovic Courtès
b56430e7c0 MPC is now a GNU project.
svn path=/nixpkgs/trunk/; revision=26562
2011-03-28 12:04:59 +00:00
Eelco Dolstra
d449c4db98 * Remove Python 2.6, since the only remaining package that used it
(Calibre) also works with 2.7.

svn path=/nixpkgs/branches/modular-python/; revision=26561
2011-03-28 11:50:47 +00:00
Lluís Batlle i Rossell
5142fda2bf Updating freeimage.
svn path=/nixpkgs/trunk/; revision=26560
2011-03-28 10:22:55 +00:00
Eelco Dolstra
8ca5d5d8b6 * Move python/2.7/modules.nix into python/2.7/default.nix. Also
remove the pythonModules attribute.  The built-in modules are now
  accessible as (e.g.) "python.modules.ssl" or "pythonPackages.ssl".

svn path=/nixpkgs/branches/modular-python/; revision=26559
2011-03-28 09:48:57 +00:00
Michael Raskin
1233bbb9fa Adding PicoLisp
svn path=/nixpkgs/trunk/; revision=26558
2011-03-28 08:16:15 +00:00
Evgeny Egorochkin
4b26d46014 policycoreutils: fix compilation
svn path=/nixpkgs/trunk/; revision=26557
2011-03-28 07:38:16 +00:00
Evgeny Egorochkin
9da3ee5281 ustr: cleanup
svn path=/nixpkgs/trunk/; revision=26556
2011-03-27 23:31:31 +00:00
Lluís Batlle i Rossell
f5f5f80474 Fixing the btanks webpage.
svn path=/nixpkgs/trunk/; revision=26555
2011-03-27 21:26:51 +00:00
Lluís Batlle i Rossell
3df4a63ec2 Adding some skeleton for btanks. It needs smpeg still, to build.
svn path=/nixpkgs/trunk/; revision=26554
2011-03-27 21:18:05 +00:00
Lluís Batlle i Rossell
723fce8d57 Adding the pacman-like game njam.
svn path=/nixpkgs/trunk/; revision=26553
2011-03-27 20:35:08 +00:00
Lluís Batlle i Rossell
a602209a6b Fixing the name of darcnes.
svn path=/nixpkgs/trunk/; revision=26552
2011-03-27 20:14:42 +00:00
Eelco Dolstra
997a5c8ef3 * Revert r26507, which I assume was intented for the stdenv branch.
svn path=/nixpkgs/trunk/; revision=26550
2011-03-27 19:03:06 +00:00
Lluís Batlle i Rossell
6f30a10a2d Adding bzflag.
svn path=/nixpkgs/trunk/; revision=26549
2011-03-27 16:35:45 +00:00
Lluís Batlle i Rossell
1357904982 Committing the aufs2.1 patch by Shea Levy. His comments:
* My motivation for this patch is that kernels < 2.6.36 contain an
     e1000e that does not support the ethernet card that is part of the
     chipset for the second-generation Core-i Intel CPUs, so in order
     to have a more useful livecd I needed to get aufs working with a
     newer kernel, and 2.6.37 is the latest kernel with an official
     aufs release.
   * All sources are downloaded with fetchgit. This is because the aufs
     upstream doesn't provide release tarballs, they just add a tag to
     their git tree for an official release.
   * The make target for the aufs2.1 headers uses a Makefile in the
     kernel build directory that requires that unifdef be in the
     scripts/ subdirectory of the build directory. The way I've dealt
     with this here is by adding "make $makeFlags -C scripts unifdef"
     to the postBuild in the kernel builder. Since the builder is used
     by all kernel versions, this will require rebuilding every kernel
     and kernel-dependent package if the patch is accepted, so one
     alternative I thought of would be to create a fake kernel build
     directory where everything is symlinked to the real build
     directory except scripts/, which is first copied and then make
     unifdef is run before building aufs2.1. If that more complicated
     solution is preferred, or if anyone has ideas for another one, I
     can do that and submit a new patch.
   * The patch was tested by building a livecd ISO that uses it, then
     running the ISO from within virtualbox and installing aufs2.1-util
     from within the livecd environment.
   * The livecd was built using installation-cd-minimal.nix, with two
     changes to the Nixos tree:
        1. boot.kernelPackages = pkgs.linuxPackages_2_6_37 was added to
           profiles/minimal.nix
        2. config.boot.kernelPackages.aufs2 was changed to
           config.boot.kernelPackages.aufs2_1 in iso-image.nix
     I would have preferred to keep all changes within
     profiles/minimal.nix, but I couldn't figure out how to override
     iso-image.nix's definition of boot.extraModulePackages. Livecds
     that use an older kernel can't be built with this iso-image.nix,
     since we don't have aufs2.1 for them (just aufs2). If someone can
     point me to how I can override things set in iso-image.nix, I'd
     appreciate it.

make -C scripts unifdef compiles the unifdef application in the
scripts/ directory, and when Nix copies over the build tree to
$out/lib/modules/$version/build for kernel modules to reference, it
copies over all of scripts/ except the .o files. I can't speak for
other kernel versions, but at the least for 2.6.37.1 unifdef is not
built by default. If you look at the Makefile in scripts, unifdef is
listed  under a comment saying that the following programs are only
built on-demand.

svn path=/nixpkgs/trunk/; revision=26548
2011-03-27 15:18:39 +00:00
Lluís Batlle i Rossell
bd3f5e7340 Adding a key 'exit 0' to myenv. Otherwise it fails to build if pkgconfig is one of the build inputs.
svn path=/nixpkgs/trunk/; revision=26547
2011-03-27 14:08:13 +00:00
Lluís Batlle i Rossell
20ef19e1d2 Updating enet
svn path=/nixpkgs/trunk/; revision=26546
2011-03-27 14:07:38 +00:00
Lluís Batlle i Rossell
08341727ae Updating gpt (patch by Shea Levy)
svn path=/nixpkgs/trunk/; revision=26545
2011-03-27 14:02:51 +00:00
Russell O'Connor
72124a0aa9 Bitcoin.
svn path=/nixpkgs/trunk/; revision=26544
2011-03-27 06:44:34 +00:00
Evgeny Egorochkin
ac951a6469 coreutils: add SELinux support
svn path=/nixpkgs/trunk/; revision=26543
2011-03-27 04:46:25 +00:00
Evgeny Egorochkin
1c9c082d00 policycoreutils: packaged
svn path=/nixpkgs/trunk/; revision=26542
2011-03-27 04:46:19 +00:00
Evgeny Egorochkin
f1201cf75f libsemanage: packaged
svn path=/nixpkgs/trunk/; revision=26541
2011-03-27 04:46:12 +00:00
Evgeny Egorochkin
836b0d259d ustr: packaged
svn path=/nixpkgs/trunk/; revision=26540
2011-03-27 04:46:05 +00:00
Evgeny Egorochkin
8113129d1a sepolgen: packaged
svn path=/nixpkgs/trunk/; revision=26539
2011-03-27 04:45:56 +00:00
Evgeny Egorochkin
28f7f1c192 checkpolicy: packaged
svn path=/nixpkgs/trunk/; revision=26538
2011-03-27 04:45:46 +00:00
Evgeny Egorochkin
deb3dd805f libselinux: version bump
svn path=/nixpkgs/trunk/; revision=26537
2011-03-27 04:45:38 +00:00
Evgeny Egorochkin
ebff531340 remove useless builder
svn path=/nixpkgs/trunk/; revision=26536
2011-03-27 04:45:33 +00:00
Evgeny Egorochkin
b0d3a2f38c libsepol: version bump
svn path=/nixpkgs/trunk/; revision=26535
2011-03-27 04:45:26 +00:00