Commit Graph

9764 Commits

Author SHA1 Message Date
Lluís Batlle i Rossell
3b747e92e5 Fixing the correct handling of uboot in the initrd and the kernel derivations.
(nixos on sheevaplug)


svn path=/nixpkgs/trunk/; revision=20275
2010-02-27 18:51:06 +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
fca769846a Adding a new special attribute for mkDerivation: crossAttrs. It sits next to
"meta" and "passthru", and these attributes will be appended to the usual
mkDerivation attributes only if the package is cross built.
This allows putting some of the cross-building logic in the mkDerivation
nix parameters, and not only in the final builder script, as it was until now.

svn path=/nixpkgs/trunk/; revision=20272
2010-02-27 17:35:42 +00:00
Lluís Batlle i Rossell
5ca75ac276 Updating gdb
svn path=/nixpkgs/trunk/; revision=20271
2010-02-27 13:00:55 +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
Lluís Batlle i Rossell
72edd54741 Making digikam build with kdeedu, to get the marble widget working to geolocate photos.
svn path=/nixpkgs/trunk/; revision=20266
2010-02-26 10:41:53 +00:00
Michael Raskin
df0922aab7 Fix argument retrieval
svn path=/nixpkgs/trunk/; revision=20263
2010-02-26 07:14:11 +00:00
Michael Raskin
98c282d12b Make Unicode support optional
svn path=/nixpkgs/trunk/; revision=20261
2010-02-26 07:02:18 +00:00
Sander van der Burg
a777402b21 Added library general public license (LGPL 2.0). Although LGPL 2.1 is almost the same, I want to be precise
svn path=/nixpkgs/trunk/; revision=20259
2010-02-25 15:44:28 +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
Eelco Dolstra
280ba422b8 * Linux 2.6.32.9.
svn path=/nixpkgs/trunk/; revision=20255
2010-02-25 13:55:57 +00:00
Rob Vermaas
3e9de0fd12 * nixpkgs: added webalizer
svn path=/nixpkgs/trunk/; revision=20253
2010-02-25 13:30:34 +00:00
Rob Vermaas
e9404a5d83 * remove sawmill
svn path=/nixpkgs/trunk/; revision=20252
2010-02-25 13:28:36 +00:00
Michael Raskin
a45255dee9 Fix Chromium
svn path=/nixpkgs/trunk/; revision=20251
2010-02-25 13:22:51 +00:00
Sander van der Burg
05245ea055 Added licenses to the lib attributeset
svn path=/nixpkgs/trunk/; revision=20249
2010-02-25 13:09:08 +00:00
Sander van der Burg
680c80e0b4 Added initial licenses attributeset to specify meta.license attributes more concisely
svn path=/nixpkgs/trunk/; revision=20248
2010-02-25 13:06:17 +00:00
Michael Raskin
5b4f9b1e56 Update ECL
svn path=/nixpkgs/trunk/; revision=20247
2010-02-25 12:54:46 +00:00
Eelco Dolstra
e04c9a452a * Linux 2.6.33.
svn path=/nixpkgs/trunk/; revision=20246
2010-02-25 12:40:03 +00:00
Ludovic Courtès
f07aa3d96d GNUnet 0.8.1b.
svn path=/nixpkgs/trunk/; revision=20245
2010-02-25 10:31:36 +00:00
Rob Vermaas
c4332bb7a1 nix 0.15pre20231 as nixUnstable
svn path=/nixpkgs/trunk/; revision=20243
2010-02-25 10:01:33 +00:00
Lluís Batlle i Rossell
7d898c52df Adding some important modules to the qemu versatile board and the sheevaplug,
mainly for nfsroot and nixos.


svn path=/nixpkgs/trunk/; revision=20238
2010-02-24 22:13:48 +00:00
Lluís Batlle i Rossell
eaf2e0f1fa Trying to get nfsroot boot in versatile (simply adding kernel options for that)
svn path=/nixpkgs/trunk/; revision=20237
2010-02-24 20:35:14 +00:00
Lluís Batlle i Rossell
e668d2689e Adding 'gt5', a diff-capable 'du' browser
svn path=/nixpkgs/trunk/; revision=20236
2010-02-24 19:06:25 +00:00
Michael Raskin
7ec7268649 Added Clozure CL
svn path=/nixpkgs/trunk/; revision=20211
2010-02-24 09:04:29 +00:00
Rob Vermaas
1ed9b2e7a4 update strategoxt 0.18pre version
svn path=/nixpkgs/trunk/; revision=20210
2010-02-24 08:50:59 +00:00
Lluís Batlle i Rossell
93ee9539e2 Made the RTC and the SCSI disks work on versatile.
svn path=/nixpkgs/trunk/; revision=20207
2010-02-23 22:41:16 +00:00
Michael Raskin
24614bdffe Manually fix ecl-config. Not that we really care what it says, but it should not give unsuable flag set
svn path=/nixpkgs/trunk/; revision=20203
2010-02-23 21:32:16 +00:00
Michael Raskin
ecc14afbda Roll back the changes to TeXLive. I failed to make Context work, and these changes made the situation worse
svn path=/nixpkgs/trunk/; revision=20202
2010-02-23 19:14:31 +00:00
Michael Raskin
f90ab6394b Make Vim expression overridable
svn path=/nixpkgs/trunk/; revision=20201
2010-02-23 18:29:11 +00:00
Michael Raskin
9df96554ec Make Vim source overridable and add ECL configuration information. Currently Vim with ECL support requires unofficial source package, like the one retrievable from http://repo.or.cz/w/vim_extended.git
svn path=/nixpkgs/trunk/; revision=20200
2010-02-23 18:10:42 +00:00
Armijn Hemel
68164d951e update to 2.6.6
svn path=/nixpkgs/trunk/; revision=20199
2010-02-23 17:17:53 +00:00
Eelco Dolstra
a4d524eb8b * Use ATerm 2.5 for Nix.
svn path=/nixpkgs/trunk/; revision=20197
2010-02-23 16:14:21 +00:00
Eelco Dolstra
7cbff16472 * This is not the real aterm 2.5 ;-)
svn path=/nixpkgs/trunk/; revision=20196
2010-02-23 16:05:46 +00:00
Marco Maggesi
99237e3da3 Updated nixpkgs/pkgs/os-specific/linux/dmtcp
svn path=/nixpkgs/trunk/; revision=20195
2010-02-23 16:00:37 +00:00
Eelco Dolstra
fe7b877afd * The installed ATerm 2.5 headers refer to SIZEOF_LONG etc., which are
not set anywhere.  This causes other packages to break on 64-bit
  platforms unless they happen to define those macros.  So don't rely
  on them.

svn path=/nixpkgs/trunk/; revision=20194
2010-02-23 14:43:09 +00:00
Lluís Batlle i Rossell
a13774ecfe Making opencascade build its visualization, DRAW, and WOK libraries/tools.
svn path=/nixpkgs/trunk/; revision=20193
2010-02-23 14:20:10 +00:00
Eelco Dolstra
70742ef6b1 svn path=/nixpkgs/trunk/; revision=20190 2010-02-23 12:49:14 +00:00
Eelco Dolstra
3f9cb1d9d2 * Build the Zabbix agent on other platforms.
svn path=/nixpkgs/trunk/; revision=20188
2010-02-23 12:17:23 +00:00
Michael Raskin
17c0e537e3 Fixing some mistakes in TeXLive expressions. Context still does not work, but in a more complicated way
svn path=/nixpkgs/trunk/; revision=20186
2010-02-23 10:52:19 +00:00
Lluís Batlle i Rossell
26c4567797 Making the integratorCP board boot. It still has no mmc support.
svn path=/nixpkgs/trunk/; revision=20184
2010-02-22 23:44:02 +00:00
Lluís Batlle i Rossell
5ec8e9cc7e Removing mentions in all-packages to already removed expressions (old cross build)
svn path=/nixpkgs/trunk/; revision=20183
2010-02-22 23:43:29 +00:00
Michael Raskin
023ff2a74a Fix some interpreter paths
svn path=/nixpkgs/trunk/; revision=20182
2010-02-22 23:40:39 +00:00
Michael Raskin
4b22e9d61d Adding cfdg - context-free design grammar
svn path=/nixpkgs/trunk/; revision=20166
2010-02-22 10:46:49 +00:00
Lluís Batlle i Rossell
454fb58a39 Updating psi, so it builds with gcc 4.4
svn path=/nixpkgs/trunk/; revision=20165
2010-02-22 09:53:17 +00:00
Ludovic Courtès
913503155a GNU Sharutils: Pass `gettext'; run the test suite.
svn path=/nixpkgs/trunk/; revision=20164
2010-02-22 09:52:39 +00:00
Ludovic Courtès
7abc6a6b7d GNU Sharutils 4.8.
svn path=/nixpkgs/trunk/; revision=20163
2010-02-22 09:07:15 +00:00
Lluís Batlle i Rossell
fbb0906d14 Fixing a sourceforge url inside meshlab.
svn path=/nixpkgs/trunk/; revision=20162
2010-02-22 08:15:34 +00:00
Lluís Batlle i Rossell
ead553d9e5 Updating ddd, and adding a small patch for it to compile with gcc 4.4
svn path=/nixpkgs/trunk/; revision=20161
2010-02-22 08:08:29 +00:00
Lluís Batlle i Rossell
75e0d28624 Updating upx - now it builds with gcc 4.4
svn path=/nixpkgs/trunk/; revision=20160
2010-02-22 08:08:23 +00:00