Commit graph

3615 commits

Author SHA1 Message Date
Lluís Batlle i Rossell 1bb2ab1904 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=20491
2010-03-09 13:33:56 +00:00
Rob Vermaas b44af59afb separate cross builds in separate release expression, will add extra jobset
svn path=/nixpkgs/trunk/; revision=20484
2010-03-09 10:33:31 +00:00
Eelco Dolstra 8d8e6f7e4c * Mark nixSqlite as low priority to prevent it from being installed
accidentally.

svn path=/nixpkgs/trunk/; revision=20481
2010-03-09 08:45:20 +00:00
Eelco Dolstra 596b70a208 * The scheduling priority for the nixpkgs trunk should be higher than
the stdenv branch.

svn path=/nixpkgs/trunk/; revision=20470
2010-03-08 10:29:53 +00:00
Eelco Dolstra 4983b6d87c * Revert to KDE 4.3 because there are build errors
(e.g. http://hydra.nixos.org/build/314745)

svn path=/nixpkgs/trunk/; revision=20469
2010-03-08 10:29:20 +00:00
Lluís Batlle i Rossell 4e59f00501 I added again nasm as lrzip input. It is required in i686-linux at least.
svn path=/nixpkgs/trunk/; revision=20467
2010-03-07 22:46:29 +00:00
Andres Löh 2a1293a3c4 Added csv Haskell package.
svn path=/nixpkgs/trunk/; revision=20464
2010-03-07 22:32:58 +00:00
Lluís Batlle i Rossell 7a2ad368f9 Updating lrzip. It does not depend on nasm anymore.
svn path=/nixpkgs/trunk/; revision=20463
2010-03-07 21:03:50 +00:00
Lluís Batlle i Rossell 7858a1d7d8 Adding assertions for the cross-toolchain attributes, so noone feels tempted
to build them without setting a crossSystem to build for.

svn path=/nixpkgs/trunk/; revision=20459
2010-03-07 00:05:51 +00:00
Lluís Batlle i Rossell dddd34bc4e Updating qemu.
svn path=/nixpkgs/trunk/; revision=20458
2010-03-06 23:37:01 +00:00
Lluís Batlle i Rossell 012e7f196e I removed the function-shape of the cross-toolchain related attributes in the all-packages.nix.
That was more complicating than helping.

svn path=/nixpkgs/trunk/; revision=20457
2010-03-06 23:36:55 +00:00
Lluís Batlle i Rossell f36f99e368 Making gcc cross-buildable, at least for glibc.
svn path=/nixpkgs/branches/stdenv-updates/; revision=20454
2010-03-06 21:41:01 +00:00
Lluís Batlle i Rossell 997723ec9b Trying to make nixUnstable cross-build.
It fails because it builds bin2c for the host system, instead of the build system.
I will wait for a fix upstream.

svn path=/nixpkgs/trunk/; revision=20445
2010-03-05 23:22:36 +00:00
Lluís Batlle i Rossell 48fa4b5257 Updating dwm, and allowing users set their own patches to configure it.
svn path=/nixpkgs/trunk/; revision=20437
2010-03-05 21:49:29 +00:00
Lluís Batlle i Rossell ca86e6992b Updating dmenu.
svn path=/nixpkgs/trunk/; revision=20436
2010-03-05 21:42:24 +00:00
Sander van der Burg f788ae920d Changed KDE 4.4.x to the default KDE version. Changed qt-4.6.x to the default qt4 version (except for the KDE 4.3.x attribute and older PyQt releases
svn path=/nixpkgs/trunk/; revision=20404
2010-03-05 12:00:37 +00:00
Lluís Batlle i Rossell 4523a86c92 Adding the awesome man pages.
svn path=/nixpkgs/trunk/; revision=20394
2010-03-05 09:52:53 +00:00
Lluís Batlle i Rossell 40d3c2f29a Adding graphicsmagick 1.3.7 for octave imread() and alike to work.
svn path=/nixpkgs/trunk/; revision=20390
2010-03-04 16:41:14 +00:00
Lluís Batlle i Rossell ba274e578c Made graphicsmagick-config not say anything about libraries that would be needed for static linking, because we are linking it dynamically.
Made octave link with graphicsmagick to get imread() working.

Nevertheless, imread does not work, because of some problems between octave and latest versions of graphicsmagick: http://www-old.cae.wisc.edu/pipermail/octave-maintainers/2010-February/015295.html

Next to do: add an older version of graphics magick for octave.

svn path=/nixpkgs/trunk/; revision=20389
2010-03-04 16:41:10 +00:00
Lluís Batlle i Rossell 22065c11d9 Adding 'awesome' (and two packages it was depending on)
svn path=/nixpkgs/trunk/; revision=20385
2010-03-04 14:44:56 +00:00
Lluís Batlle i Rossell aa38df2611 Adding GraphicsMagick
svn path=/nixpkgs/trunk/; revision=20383
2010-03-04 14:44:47 +00:00
Lluís Batlle i Rossell c2cbd65668 Getting a better seg3d build. Now it runs from TMPDIR at least.
The installation still fails.

svn path=/nixpkgs/trunk/; revision=20382
2010-03-04 14:44:43 +00:00
Eelco Dolstra 2880af03c8 * Add a Nix expression for the Nix SQLite branch (temporarily).
svn path=/nixpkgs/trunk/; revision=20377
2010-03-04 14:39:47 +00:00
Ludovic Courtès 4aae5c458e python-darcsver: Don't depend on Darcs.
svn path=/nixpkgs/trunk/; revision=20371
2010-03-04 13:28:46 +00:00
Ludovic Courtès 07356746ef Add GNU cppi.
svn path=/nixpkgs/trunk/; revision=20363
2010-03-04 11:10:44 +00:00
Ludovic Courtès 344f2efc5f libcanberra 0.23.
svn path=/nixpkgs/trunk/; revision=20353
2010-03-03 14:27:17 +00:00
Sander van der Burg e51cfc777a Added libv4l which is now a required dependency for kdenetwork-4.4.1
svn path=/nixpkgs/trunk/; revision=20349
2010-03-03 10:37:38 +00:00
Rob Vermaas af2f53ab89 hydra-ant-logger
svn path=/nixpkgs/trunk/; revision=20332
2010-03-02 15:37:04 +00:00
Lluís Batlle i Rossell cc068f0be8 Adding the itk libraries.
Adding a skeleton of the seg3d package. It builds, but libraries and rpaths are wrong.
I hope to fix it soon.

svn path=/nixpkgs/trunk/; revision=20320
2010-03-01 23:31:35 +00:00
Lluís Batlle i Rossell eb047010f8 Trying to get a better expression for uboot upstream, allowing normal and cross build
with proper assertions.


svn path=/nixpkgs/trunk/; revision=20319
2010-03-01 23:22:48 +00:00
Ludovic Courtès a86e0ad8aa pyopengl: Move to `python-packages.nix'.
svn path=/nixpkgs/trunk/; revision=20317
2010-03-01 17:08:25 +00:00
Ludovic Courtès b36dbdf2c4 ExifTool 8.12.
svn path=/nixpkgs/trunk/; revision=20314
2010-03-01 17:08:12 +00:00
Rob Vermaas f3f922f474 ecj for darwin
svn path=/nixpkgs/trunk/; revision=20311
2010-03-01 16:20:47 +00:00
Lluís Batlle i Rossell 152a0c97fa Adding kernelArch to platforms.pc. Needed to make the release.nix tarball happy.
svn path=/nixpkgs/trunk/; revision=20308
2010-03-01 14:06:48 +00:00
Lluís Batlle i Rossell 38a19b7202 Adding the pc kernel headers base config, for the new linux kernel headers to build.
svn path=/nixpkgs/trunk/; revision=20307
2010-03-01 13:12:57 +00:00
Ludovic Courtès 67b7a89daf Move zope.interface' to python-packages.nix'.
svn path=/nixpkgs/trunk/; revision=20305
2010-03-01 13:12:52 +00:00
Ludovic Courtès ff88e57803 GNU Parted 2.2.
svn path=/nixpkgs/trunk/; revision=20304
2010-03-01 13:12:48 +00:00
Rob Vermaas dfca3bc039 set meta.platforms to get rid of hydra evaluation errors (assertions)
svn path=/nixpkgs/trunk/; revision=20301
2010-03-01 12:23:49 +00:00
Lluís Batlle i Rossell b7abafeedc Adding a new python package to allow calibre preview the books
svn path=/nixpkgs/trunk/; revision=20292
2010-02-28 22:55:08 +00:00
Lluís Batlle i Rossell 30a9cbf018 Updating calibre (I had to add a new python package for it: cssutils)
svn path=/nixpkgs/trunk/; revision=20291
2010-02-28 22:42:39 +00:00
Lluís Batlle i Rossell 18f667a954 I missed in release.nix the sheevaplug platform.
svn path=/nixpkgs/trunk/; revision=20282
2010-02-27 22:10:36 +00:00
Lluís Batlle i Rossell 89842675cb Adding more cross build jobs for hydra. Kernels, gdb, mipsel, ultrasparc.
svn path=/nixpkgs/trunk/; revision=20281
2010-02-27 21:56:27 +00:00
Lluís Batlle i Rossell 305a7a2ddf More testing allows fixing more errors from the recent commits.
svn path=/nixpkgs/trunk/; revision=20279
2010-02-27 21:21:20 +00:00
Lluís Batlle i Rossell 4677180b0d Barf. I have to test the expressions before commiting.
svn path=/nixpkgs/trunk/; revision=20278
2010-02-27 20:37:58 +00:00
Lluís Batlle i Rossell 81b325b33f Adding a cross compiler condition for sparc64 due to a gcc bug
svn path=/nixpkgs/trunk/; revision=20277
2010-02-27 20:29:39 +00:00
Lluís Batlle i Rossell 11aa65c28a Simplified much more the expressions for cross building and multiplatform.
I introduce the new nixpkgs parameter "platform", defaulting to "pc",
which was before defined as an attribute of nixpkgs.

I made the crossSystem nixpkgs attribute set parameter contain its own 'platform'.

This allows cross-building a kernel for a given crossSystem.platform in a non-PC
platform.

The actual native platform can be taken from stdenv.platform, and this way we also
avoid the constant passing of 'platform' to packages for platform-dependant builds
(kernel, initrd, ...).

I will update nixos accordingly to these changes, for non-PC platforms to work.

I think we are gaining on flexibility and clearness. I could cross build succesfully
an ultrasparc kernel and a mipsel kernel on PC. But since this change, I should be able
to do this also in non-PC.

Before this change, there was no possibility of distinguishing the "target platform" or
the "native build platform" when cross building, being the single "platform" attribute
always interpreted as target platform.

The platform is a quite relevant attribute set, as it determines the linuxHeaders used
(in the case, by now the only one supported, of linux targets).

The platform attributes are quite linux centric still. Let's hope for more generality to come.

svn path=/nixpkgs/trunk/; revision=20273
2010-02-27 17:35:47 +00:00
Lluís Batlle i Rossell 8f2427c91a Updating the actual platforms in platforms.nix to fit the new requirement:
kernelHeadersBaseConfig.

svn path=/nixpkgs/trunk/; revision=20270
2010-02-27 00:55:03 +00:00
Lluís Batlle i Rossell b1b7266aa3 After some testing with an ultrasparc cross-compiler:
Updating the cross-build expressions, adding some flexibility.
Updated the linux headers used cross building, as 2.6.28 had bugs on endianness in
sparc64.
There were, as usual some bugs in gcc. Maybe not many make a cross compiler to
ultrasparc.

For the record, I could build an ultrasparc kernel with this base nix:
import /etc/nixos/nixpkgs/default.nix   # The root nixpkgs default.nix
{
    crossSystem = {
        config = "sparc64-unknown-linux";
        bigEndian = true;
        arch = "sparc64";
        float = "soft";
        withTLS = true;
        cpu = "ultrasparc";
    };

    config = pkgs: {
      packageOverrides = pkgs : {
        platform = {
            name = "sparc64";
            kernelHeadersBaseConfig = "sparc64_defconfig";
            kernelBaseConfig = "sparc64_defconfig";
            kernelArch = "sparc";
            kernelAutoModules = false;
            kernelTarget = "zImage";
            uboot = null;
        };
      };
    };
}

Although it did not boot directly in qemu-system-sparc64:
[sparc64] Kernel already loaded
Unhandled Exception 0x0000000000000020
PC = 0x0000000000404000 NPC = 0x0000000000404004

svn path=/nixpkgs/trunk/; revision=20269
2010-02-27 00:52:48 +00:00
Eelco Dolstra 61c9c2434f * Updated fbcondecor for Linux 2.6.33.
svn path=/nixpkgs/trunk/; revision=20257
2010-02-25 14:15:42 +00:00
Rob Vermaas e9404a5d83 * remove sawmill
svn path=/nixpkgs/trunk/; revision=20252
2010-02-25 13:28:36 +00:00