Commit Graph

1334 Commits

Author SHA1 Message Date
Ludovic Courtès
3bda68d779 Linux: Attempt to copy more debugging info to $out.
svn path=/nixpkgs/trunk/; revision=21624
2010-05-06 11:52:49 +00:00
Ludovic Courtès
074f450ab3 Linux: Patch incorrect absolute paths in makefiles.
svn path=/nixpkgs/trunk/; revision=21623
2010-05-06 11:52:43 +00:00
Ludovic Courtès
96f2d289bc Don't strip Linux modules in the SystemTap variant.
svn path=/nixpkgs/trunk/; revision=21619
2010-05-05 19:48:52 +00:00
Ludovic Courtès
588be9d6db Add a Linux kernel suitable for SystemTap.
svn path=/nixpkgs/trunk/; revision=21618
2010-05-05 19:48:46 +00:00
Yury G. Kudryashov
b03f3bd8a1 Add platforms to xf86-input-wacom
svn path=/nixpkgs/trunk/; revision=21614
2010-05-05 18:23:08 +00:00
Ludovic Courtès
be07b7f60d tcp-wrapper: Apply patches with `--batch' to please the latest GNU Patch.
svn path=/nixpkgs/trunk/; revision=21594
2010-05-04 13:32:00 +00:00
Peter Simons
85b7c134cb pkgs/os-specific/darwin/lipo: add support for running the native Darwin lipo utility
svn path=/nixpkgs/trunk/; revision=21426
2010-04-29 14:56:44 +00:00
Ludovic Courtès
0df57866a6 pam_login: Really apply `sys-stat-h.patch'.
svn path=/nixpkgs/trunk/; revision=21402
2010-04-28 12:37:06 +00:00
Eelco Dolstra
18849f0f24 * `--exec-prefix=$out/bin' causes programs to be installed in
$out/bin/bin and $out/bin/sbin, which breaks NixOS (see
  e.g. http://hydra.nixos.org/build/380092).

svn path=/nixpkgs/trunk/; revision=21339
2010-04-27 10:46:41 +00:00
Eelco Dolstra
68d9e26bcb * Linux 2.6.32.12, 2.6.33.3.
svn path=/nixpkgs/trunk/; revision=21338
2010-04-27 09:52:36 +00:00
Ludovic Courtès
76b699eb22 pam_login: Fix build on recent glibc.
svn path=/nixpkgs/trunk/; revision=21337
2010-04-27 09:43:26 +00:00
Ludovic Courtès
7802763b45 Linux nfs-utils 1.2.2.
svn path=/nixpkgs/trunk/; revision=21336
2010-04-27 09:43:22 +00:00
Marc Weber
9ae4b8b11c wpa_supplicant: enable qt gui, deprecate old broken derivation building gui
svn path=/nixpkgs/trunk/; revision=21332
2010-04-27 04:38:41 +00:00
Ludovic Courtès
fff97995f3 pwdutils: Fix compilation with recent glibc.
svn path=/nixpkgs/trunk/; revision=21318
2010-04-26 09:30:53 +00:00
Ludovic Courtès
9534d10db6 pwdutils: Use GnuTLS instead of OpenSSL.
svn path=/nixpkgs/trunk/; revision=21300
2010-04-24 21:02:42 +00:00
Ludovic Courtès
8e905083ae pwdutils 3.2.6.
svn path=/nixpkgs/trunk/; revision=21299
2010-04-24 21:02:37 +00:00
Lluís Batlle i Rossell
6f2fac6466 Merging from trunk.
I hope I resolved the conflicts well (gmp and gccCross)


svn path=/nixpkgs/branches/stdenv-updates/; revision=21251
2010-04-22 21:44:33 +00:00
Lluís Batlle i Rossell
80862759f2 Updating util-linux, so the 2nd util-linux change in few minutes; that may
annoy less.

svn path=/nixpkgs/trunk/; revision=21221
2010-04-21 21:35:38 +00:00
Lluís Batlle i Rossell
1f942f92bf Making utillinux build also 'write'. (Thank you, niksnut)
svn path=/nixpkgs/trunk/; revision=21219
2010-04-21 20:47:15 +00:00
Eelco Dolstra
8a4805ba22 * Updated nvidia-x11 to 195.36.15.
svn path=/nixpkgs/trunk/; revision=21209
2010-04-21 14:47:13 +00:00
Eelco Dolstra
108e86ce6c * Update the firmware for the IWL 3945.
svn path=/nixpkgs/trunk/; revision=21204
2010-04-21 12:32:16 +00:00
Eelco Dolstra
9e9f8e45b3 * Updated wpa_supplicant to 0.7.2.
svn path=/nixpkgs/trunk/; revision=21200
2010-04-21 11:37:15 +00:00
Eelco Dolstra
b86fd1a1ec * Added rfkill, a tool for controlling the wireless kill switch on
Linux.

svn path=/nixpkgs/trunk/; revision=21199
2010-04-21 11:21:15 +00:00
Marc Weber
6ce15d655f adding wvdial, wvstreams, usb_modeswitch
svn path=/nixpkgs/trunk/; revision=21131
2010-04-16 15:56:28 +00:00
Marco Maggesi
5d94294dd5 pkgs/os-specific/linux/blcr: update to version 0.8.2
svn path=/nixpkgs/trunk/; revision=21091
2010-04-15 12:08:08 +00:00
Yury G. Kudryashov
61198b7d61 Typo. Forgotten to remove dashes
svn path=/nixpkgs/trunk/; revision=21045
2010-04-13 07:23:55 +00:00
Yury G. Kudryashov
3653309cb3 Match capabilities instead of name
Didn't work for ALPS touchpads

svn path=/nixpkgs/trunk/; revision=21043
2010-04-13 06:49:34 +00:00
Yury G. Kudryashov
a9d1a2825b Initial xf86-input-wacom nix expression
Builds here. Haven't tested whether it works with real hardware yet.

svn path=/nixpkgs/trunk/; revision=21019
2010-04-11 22:42:28 +00:00
Eelco Dolstra
5330be5fbb * Latest Linux kernels.
svn path=/nixpkgs/trunk/; revision=20952
2010-04-06 10:33:49 +00:00
Lluís Batlle i Rossell
19b9811012 Making a bunch of basic programs cross-buildable.
After this, the 'bootstrap-tools' can be cross-built.


svn path=/nixpkgs/branches/stdenv-updates/; revision=20945
2010-04-04 18:10:42 +00:00
Lluís Batlle i Rossell
e37d850227 Updating the nvidia legacy drivers, so they build with linux 2.6.33
svn path=/nixpkgs/trunk/; revision=20943
2010-04-04 18:01:36 +00:00
Michael Raskin
5ff7d302ea Update FUSE
svn path=/nixpkgs/trunk/; revision=20751
2010-03-18 21:12:59 +00:00
Michael Raskin
b4b3cb2d01 Fix version problems in Zen-kernel expression
svn path=/nixpkgs/trunk/; revision=20727
2010-03-18 05:26:50 +00:00
Michael Raskin
6934d0770c Fix build of fresh Zen kernels: POSIX ACL seems to be non-optional in OCFS2 now
svn path=/nixpkgs/trunk/; revision=20684
2010-03-17 10:04:35 +00:00
Michael Raskin
f7aad3221a Data for Zen-kernel 2.6.33-zen1
svn path=/nixpkgs/trunk/; revision=20675
2010-03-17 06:41:09 +00:00
Eelco Dolstra
f02cd9d59c * Linux updated to 2.6.32.10, 2.6.33.1.
svn path=/nixpkgs/trunk/; revision=20646
2010-03-16 11:44:28 +00:00
Lluís Batlle i Rossell
71bf444504 Updating uclibc (This new release fixed a problem in ._start that gave me a lot
of headache in mips)

svn path=/nixpkgs/trunk/; revision=20613
2010-03-14 14:05:04 +00:00
Lluís Batlle i Rossell
5b7f1ef09a Making busybox cross build with kernel 2.4 for mipsel (I had to disable 'ionice', which
requires some headers >= 2.6.12).

I also add the kernel 2.4 headers expression I forgot in my last commit.

svn path=/nixpkgs/trunk/; revision=20540
2010-03-10 21:32:35 +00:00
Lluís Batlle i Rossell
fb6adb13ac Updating busybox. I left only a single busybox in its directory. The others, coming from the old
cross-building nixpkgs implementation, were not referenced anywhere.

This new busybox builds natively, and also cross-builds with uclibc.

I updated the uclibc config with a busybox defconfig requirement (something about RPC).

I made the gcc-cross-wrapper properly set the dynamic loader to programs.

After this, 'qemu-arm' can run the dynamically linked busybox cross built for armv5tel--linux-gnueabi.



svn path=/nixpkgs/trunk/; revision=20514
2010-03-09 22:17:38 +00:00
Lluís Batlle i Rossell
dfaee7994d Little update on uclibc: enable ftw.
svn path=/nixpkgs/branches/stdenv-updates/; revision=20513
2010-03-09 20:36:56 +00:00
Lluís Batlle i Rossell
9665611c9e Updating from trunk, to get the main evaluation fix about libcCross.
svn path=/nixpkgs/branches/stdenv-updates/; revision=20512
2010-03-09 18:17:30 +00:00
Lluís Batlle i Rossell
6f9a783232 Trying to get coreutils cross-built with uclibc.
This involved fixing some buildInputs/buildNativeInputs in acl/attr,
and adding a libiconv in some places.


svn path=/nixpkgs/branches/stdenv-updates/; revision=20510
2010-03-09 18:05:38 +00:00
Lluís Batlle i Rossell
936ee28548 Updating utillinux-ng
svn path=/nixpkgs/trunk/; revision=20508
2010-03-09 17:25:03 +00:00
Lluís Batlle i Rossell
5fc076193c Updating uclibc
svn path=/nixpkgs/trunk/; revision=20501
2010-03-09 15:51:45 +00:00
Lluís Batlle i Rossell
1522caa556 Enabling cross-builds with uclibc again (I had that too much abandoned).
Hydra now should even test it.


svn path=/nixpkgs/trunk/; revision=20500
2010-03-09 15:48:25 +00:00
Eelco Dolstra
d2f598122c * qemu-kvm updated to 0.12.3.
svn path=/nixpkgs/trunk/; revision=20489
2010-03-09 12:53:42 +00:00
Eelco Dolstra
53cdaca17e * NVidia driver: revert to 190.53 because 195.36.08 has been withdrawn
due to a fan speed issue (reported by James Cook).

svn path=/nixpkgs/trunk/; revision=20468
2010-03-08 08:16:16 +00:00
Lluís Batlle i Rossell
11c20b3a2c Making the cross kernel builds take properly the cross-built uboot, when needed.
svn path=/nixpkgs/trunk/; revision=20455
2010-03-06 22:04:21 +00:00
Lluís Batlle i Rossell
27b8b6cc66 Made mdadm cross build.
svn path=/nixpkgs/trunk/; revision=20380
2010-03-04 14:44:35 +00:00
Eelco Dolstra
8ba2b6a933 * Latest NVIDIA driver.
svn path=/nixpkgs/trunk/; revision=20352
2010-03-03 14:06:14 +00:00
Lluís Batlle i Rossell
ef1918f200 Allowing the kernel to build in the sheevaplug natively.
svn path=/nixpkgs/trunk/; revision=20284
2010-02-28 08:58:07 +00:00
Lluís Batlle i Rossell
289d728337 Fixing the kernel expressions to allow normal and cross-building, depending
on the native and cross platforms.

I thought I already did that today in a previous commit, but I did all wrong.

svn path=/nixpkgs/trunk/; revision=20280
2010-02-27 21:48:48 +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
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
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
Eelco Dolstra
280ba422b8 * Linux 2.6.32.9.
svn path=/nixpkgs/trunk/; revision=20255
2010-02-25 13:55:57 +00:00
Eelco Dolstra
e04c9a452a * Linux 2.6.33.
svn path=/nixpkgs/trunk/; revision=20246
2010-02-25 12:40:03 +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
Lluís Batlle i Rossell
9727f3d707 Making the i915 module Kernel Mode Setting enabled.
This is required by the X module nowadays, and the linux i686 config does not
have it enabled by default.


svn path=/nixpkgs/trunk/; revision=20136
2010-02-19 18:28:02 +00:00
Lluís Batlle i Rossell
50e309f022 linux: Removing some assertions on armv5tel no more valid when cross-building.
svn path=/nixpkgs/trunk/; revision=20119
2010-02-18 21:10:53 +00:00
Marco Maggesi
0be3d18896 Updated nixkpkgs/pkgs/os-specific/linux/dmtcp/devel.nix
svn path=/nixpkgs/trunk/; revision=20116
2010-02-18 18:49:32 +00:00
Michael Raskin
bf4f2769b1 Fix propagated dependencies in hal
svn path=/nixpkgs/trunk/; revision=20108
2010-02-18 15:44:01 +00:00
Lluís Batlle i Rossell
9bcb6277f3 Changing linux kernel references from vmlinuz to bzImage.
This way we get a simpler kernel build script.

svn path=/nixpkgs/trunk/; revision=20094
2010-02-18 11:34:48 +00:00
Lluís Batlle i Rossell
5fc64e5f9c Again, trying to fix the kernel build.
It seems that there is no make target named 'vmlinuz' that makes the file 'vmlinuz'.
So we need different variables for the make target and the kernel file. Unless we
some day stop using the file 'vmlinuz' in pc, and use bzImage.

svn path=/nixpkgs/trunk/; revision=20092
2010-02-18 10:25:33 +00:00
Lluís Batlle i Rossell
ee72c53378 Trying to fix the non-cross kernel build.
svn path=/nixpkgs/trunk/; revision=20090
2010-02-18 08:02:16 +00:00
Lluís Batlle i Rossell
4e51d7d296 Fixing the linux kernel cross builder (lacking an ARCH again in a make call)
svn path=/nixpkgs/trunk/; revision=20081
2010-02-17 22:36:59 +00:00
Lluís Batlle i Rossell
70cb7050f5 Trying to make the linux kernels also cross-build.
svn path=/nixpkgs/trunk/; revision=20080
2010-02-17 22:20:56 +00:00
Lluís Batlle i Rossell
c86da889cc Made the kernel generate-config "build as modules as you can" an option.
Sepcifically, a nixpkgs "platform" option. So, for PC all remained the same
as it was.

svn path=/nixpkgs/trunk/; revision=20059
2010-02-16 19:27:51 +00:00
Eelco Dolstra
e9ad76a2ff * Upstart updated to 0.6.5.
* Added libnih (a dependency of Upstart).
* Removed the old Upstart 0.3.x.

svn path=/nixpkgs/trunk/; revision=20015
2010-02-15 15:55:39 +00:00
Marco Maggesi
f1f60cef0d Add package dmtcp_devel
svn path=/nixpkgs/trunk/; revision=19972
2010-02-13 11:02:08 +00:00
Lluís Batlle i Rossell
fab150b628 Updating acpid.
svn path=/nixpkgs/trunk/; revision=19942
2010-02-11 18:59:58 +00:00
Eelco Dolstra
2027b96de5 * Linux 2.6.32.8.
svn path=/nixpkgs/trunk/; revision=19933
2010-02-11 14:33:17 +00:00
Lluís Batlle i Rossell
df0800e91d Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19825
2010-02-04 19:08:28 +00:00
Lluís Batlle i Rossell
b8c1641515 Making pam_unix2 not link to libxcrypt under armv5tel, because libxcrypt does not build under it.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19824
2010-02-04 18:40:54 +00:00
Marco Maggesi
3ab915e1fc Add new package pkgs/os-specific/linux/dmtcp/
svn path=/nixpkgs/trunk/; revision=19819
2010-02-04 15:41:45 +00:00
Eelco Dolstra
a709fd64e5 * Turn libxcrypt back on. Without it, it's impossible to login to
NixOS (because pam_unix2 then cannot handle the passwords in
  /etc/shadow).

svn path=/nixpkgs/branches/stdenv-updates/; revision=19810
2010-02-04 09:35:51 +00:00
Eelco Dolstra
a617a7c239 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19786
2010-02-03 14:23:43 +00:00
Eelco Dolstra
41e5edb0b3 * qemu-kvm: link against libuuid.
svn path=/nixpkgs/trunk/; revision=19757
2010-02-01 18:44:08 +00:00
Eelco Dolstra
b22880b12d * qemu-kvm: increase the size of the buffer used to build the smbd
command line.

svn path=/nixpkgs/trunk/; revision=19756
2010-02-01 18:11:53 +00:00
Eelco Dolstra
277e66450b * fuse updated to 2.8.2.
svn path=/nixpkgs/trunk/; revision=19755
2010-02-01 17:08:35 +00:00
Eelco Dolstra
f719b5268e * qemu-kvm: honour $TMPDIR for the qemu-smb temporary directory. This
ensures that Nix cleans up the qemu-smb directory after a VM test
  run (which prevents failures like this one:
  http://hydra.nixos.org/build/275355/nixlog/31/raw).

svn path=/nixpkgs/trunk/; revision=19747
2010-02-01 15:12:49 +00:00
Lluís Batlle i Rossell
2dfeeb47bb Making kbd build in armv5tel-linux. gcc 4.4.3 issues a warning with it, and kbd was compiled with -Werror.
I switch off -Werror in armv5tel-linux.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19735
2010-01-29 21:30:09 +00:00
Eelco Dolstra
26ea153e8b svn path=/nixpkgs/trunk/; revision=19724 2010-01-29 00:38:34 +00:00
Eelco Dolstra
e04beb262e * Strangely, running "make defconfig" before the generator causes
"make config" to print an additional question that the script
  doesn't know how to answer ("Audio Excel DSP 16 [N/y] (NEW) ###").
  Just ignore it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=19713
2010-01-27 15:43:27 +00:00
Eelco Dolstra
9f99223219 * Removed splashutils 1.3 (obsolete).
svn path=/nixpkgs/branches/stdenv-updates/; revision=19710
2010-01-27 14:35:38 +00:00
Eelco Dolstra
bd14a5d297 * qemu-kvm 0.12.2.
svn path=/nixpkgs/trunk/; revision=19705
2010-01-27 10:51:23 +00:00
Eelco Dolstra
561e37cfe0 * Linux 2.6.32.6, 2.6.27.44.
svn path=/nixpkgs/trunk/; revision=19661
2010-01-26 10:18:14 +00:00
Lluís Batlle i Rossell
bcba809460 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19654
2010-01-25 18:52:07 +00:00
Lluís Batlle i Rossell
279ffaa621 Adding ecryptfs, and one of its dependencies: keyutils.
(I have not tried whether they work)

svn path=/nixpkgs/trunk/; revision=19645
2010-01-25 10:34:47 +00:00
Lluís Batlle i Rossell
d8900100e5 Allowing linux-headers to be built for cross-compilations on non-linux platforms.
Updating the list of hydra cross-build jobs to something more ambitious.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19628
2010-01-23 09:41:50 +00:00
Michael Raskin
44457a9ad7 Fixing a typo in options
svn path=/nixpkgs/trunk/; revision=19563
2010-01-20 11:06:20 +00:00
Michael Raskin
d2795e889c Force CFS in zen-kernel not specified as BFS
svn path=/nixpkgs/trunk/; revision=19557
2010-01-20 06:24:29 +00:00
Eelco Dolstra
93b250b960 * Use the Linux 2.6.32 kernel headers.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19552
2010-01-19 18:02:37 +00:00
Marc Weber
3b37933dd4 second part of alsaLib patch + comment
svn path=/nixpkgs/branches/stdenv-updates/; revision=19529
2010-01-18 19:15:36 +00:00
Eelco Dolstra
7c7f9b63ad * kbd 1.15.1.
svn path=/nixpkgs/trunk/; revision=19514
2010-01-18 10:19:11 +00:00
Michael Raskin
30477123ef Allow building kernels for CPUs incapable of running Xen
svn path=/nixpkgs/branches/stdenv-updates/; revision=19489
2010-01-16 20:40:59 +00:00
Lluís Batlle i Rossell
70dd97620c Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=19485
2010-01-16 15:19:23 +00:00
Michael Raskin
c0bca28b2f Do not insist on using CONFIG_PAE if we are trying to build a non-PAE kernel
svn path=/nixpkgs/trunk/; revision=19454
2010-01-15 05:30:00 +00:00
Lluís Batlle i Rossell
9dfe94bc3c Adding a name to the patch for the zen kernel.
kernelPatches need names. Otherwise meta descriptions can't be built.


svn path=/nixpkgs/trunk/; revision=19448
2010-01-14 22:46:13 +00:00
Lluís Batlle i Rossell
9183f21f7e Merging from trunk.
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
2010-01-14 14:49:31 +00:00
Michael Raskin
57681137a8 Fixing the last incorrect args reference
svn path=/nixpkgs/trunk/; revision=19421
2010-01-14 08:06:24 +00:00
Michael Raskin
3e33e35b4d Fix arguments reference
svn path=/nixpkgs/trunk/; revision=19416
2010-01-13 22:09:12 +00:00
Michael Raskin
5bf63365d2 Update options according to renaming of them in Zen
svn path=/nixpkgs/trunk/; revision=19407
2010-01-13 16:19:48 +00:00
Michael Raskin
5cf235ec46 Fix typo
svn path=/nixpkgs/trunk/; revision=19405
2010-01-13 16:02:35 +00:00
Michael Raskin
fdc45114a7 Remove tabs
svn path=/nixpkgs/trunk/; revision=19403
2010-01-13 15:42:08 +00:00
Michael Raskin
5971b486f2 Forgot to clean this up
svn path=/nixpkgs/trunk/; revision=19402
2010-01-13 15:39:41 +00:00
Michael Raskin
a2dc68caf8 New Zen kernel for ne configratiuon style
svn path=/nixpkgs/trunk/; revision=19399
2010-01-13 15:17:27 +00:00
Michael Raskin
77c9077f0a Adding a attrSet to import configuration chunks from
svn path=/nixpkgs/trunk/; revision=19398
2010-01-13 15:16:08 +00:00
Eelco Dolstra
645ae45d55 * Updated LVM2 to 2.02.56. LVM2 now includes device-mapper, so that
package is obsolete.  Also install the udev rules.

svn path=/nixpkgs/trunk/; revision=19293
2010-01-07 16:14:10 +00:00
Eelco Dolstra
0f38401813 * Latest and greatest kernels.
svn path=/nixpkgs/trunk/; revision=19287
2010-01-07 14:10:39 +00:00
Eelco Dolstra
ed4447febd * Urgh - generic.nix doesn't expect a `extraConfig' argument.
svn path=/nixpkgs/trunk/; revision=19205
2010-01-04 13:14:39 +00:00
Eelco Dolstra
3f255b35cd * qemu-kvm updated to 0.12.1.2.
svn path=/nixpkgs/trunk/; revision=19192
2010-01-03 19:36:32 +00:00
Eelco Dolstra
e3c2b77c11 * Add the gcov patch to patches.nix.
svn path=/nixpkgs/trunk/; revision=19190
2010-01-03 17:57:08 +00:00
Nicolas Pierron
e919ca2aec * Add pam_usb package.
Enable PAM login with partitionned USB key.

svn path=/nixpkgs/trunk/; revision=19183
2010-01-03 11:12:05 +00:00
Nicolas Pierron
0232e1222f * Add pmount package.
Mount removable devices as normal user

svn path=/nixpkgs/trunk/; revision=19182
2010-01-03 11:10:22 +00:00
Nicolas Pierron
ab1eec6a60 * Replace usage of 'udevsettle' by 'udevadm settle' in cryptsetup.
svn path=/nixpkgs/trunk/; revision=19178
2010-01-03 11:01:58 +00:00
Lluís Batlle i Rossell
d864771e26 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19139
2009-12-28 11:40:34 +00:00
Lluís Batlle i Rossell
d5aa5641de Fixing the evaluation of the linux kernel (= /= ==)
svn path=/nixpkgs/branches/stdenv-updates/; revision=19138
2009-12-28 11:26:23 +00:00
Lluís Batlle i Rossell
1452ce46a4 Fixing the kernel configuration for the sheevaplug
svn path=/nixpkgs/branches/stdenv-updates/; revision=19137
2009-12-28 10:35:34 +00:00
Nicolas Pierron
feff3bfa1b Add Firmware for the Intel 1000 wireless card.
svn path=/nixpkgs/trunk/; revision=19132
2009-12-26 16:22:51 +00:00
Lluís Batlle i Rossell
57e123fe6c Made pam_login build with gcc 4.4 (disabling its -Werror)
svn path=/nixpkgs/branches/stdenv-updates/; revision=19130
2009-12-26 11:18:59 +00:00
Armijn Hemel
ad0bfe016f update to 1.4.6
svn path=/nixpkgs/trunk/; revision=19125
2009-12-25 19:36:16 +00:00
Armijn Hemel
2323755e8d update to 29
svn path=/nixpkgs/trunk/; revision=19124
2009-12-25 19:30:56 +00:00
Eelco Dolstra
ea5a440d42 * Linux 2.6.32.2, 2.6.27.42.
svn path=/nixpkgs/trunk/; revision=19091
2009-12-24 12:48:01 +00:00
Lluís Batlle i Rossell
3d9eb6a76a Updating iwlwifi-5000 ucode.
svn path=/nixpkgs/trunk/; revision=19080
2009-12-23 16:48:34 +00:00
Ludovic Courtès
fac9a5c936 Replace kernelHeaders' by linuxHeaders'.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19067
2009-12-21 14:04:45 +00:00
Ludovic Courtès
310d6e4bbf Update from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19066
2009-12-21 11:09:23 +00:00
Marc Weber
8058166fe0 adding afuse. A userspace automounter
svn path=/nixpkgs/trunk/; revision=19063
2009-12-21 08:55:27 +00:00
Lluís Batlle i Rossell
9ef11e4c4d Made the linux kernel expressions support 'platform' again (thinking on reusing
most of the kernel expressions for the sheevaplug).
I still have not added anything in the kernels about cross compilation.
I moved the platform definitions out of all-packages.
I have not written good platform definitions for the sheevaplug - only for the
PC.
Only the linux-2.6.32 expression uses the platforms kernelConfig.
The linux-2.6.31 was broken, and I left it broken.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19046
2009-12-19 12:12:24 +00:00
Lluís Batlle i Rossell
5bae851b1e Merging from trunk. I had to give away some structure to build the native
sheevaplug kernel, so the kernel does not build in the sheevaplug right now.
I will try to fix that in next commits.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19045
2009-12-19 11:14:16 +00:00
Eelco Dolstra
c122c7a5ba * Hm, I thought I tested this...
svn path=/nixpkgs/trunk/; revision=19032
2009-12-18 12:23:13 +00:00
Lluís Batlle i Rossell
3e1a06bae1 Updating the nvidia drivers to the latest version.
I added 'perl' as their buildInputs to get them built.
I don't know if it is something new from nvidia, but I imagine it may be
introduced in 2.6.31, for any module building.

svn path=/nixpkgs/trunk/; revision=19029
2009-12-18 11:36:36 +00:00
Eelco Dolstra
fb6d227127 * Merged the kernel-config branch.
svn path=/nixpkgs/trunk/; revision=19022
2009-12-18 10:04:23 +00:00
Lluís Batlle i Rossell
28eef7beaa Updating wpa_supplicant, and enabling its possible syslog output.
svn path=/nixpkgs/trunk/; revision=19001
2009-12-16 19:45:00 +00:00
Eelco Dolstra
cfd6dd29fe * Linux 2.6.32.1.
svn path=/nixpkgs/branches/kernel-config/; revision=19000
2009-12-16 19:22:42 +00:00
Marc Weber
0888bf7107 remove mapRecordFlatten & fix source autofs
svn path=/nixpkgs/trunk/; revision=18987
2009-12-16 05:52:36 +00:00
Eelco Dolstra
f833d465e6 * Enable Kernel Samepage Merging.
svn path=/nixpkgs/branches/kernel-config/; revision=18949
2009-12-14 19:30:25 +00:00
Eelco Dolstra
2e5908b1df * Use the kernel config generator for Linux 2.6.25.
svn path=/nixpkgs/branches/kernel-config/; revision=18948
2009-12-14 19:08:20 +00:00
Eelco Dolstra
fda6775efa * Get rid of some obsolete Linux kernel headers.
svn path=/nixpkgs/branches/kernel-config/; revision=18946
2009-12-14 18:36:43 +00:00
Eelco Dolstra
00c641d336 * Use the kernel config generator for Linux 2.6.28.
* Get rid of Linux 2.6.20 and 2.6.26 (the former was only used for
  building UML).

svn path=/nixpkgs/branches/kernel-config/; revision=18945
2009-12-14 18:34:46 +00:00
Eelco Dolstra
ec2fd60f88 * Doh!
svn path=/nixpkgs/branches/kernel-config/; revision=18944
2009-12-14 18:30:52 +00:00
Eelco Dolstra
a6d31beba7 * qemu-kvm updated to 0.11.1.
svn path=/nixpkgs/branches/kernel-config/; revision=18943
2009-12-14 18:30:36 +00:00
Eelco Dolstra
c3e80cbc9f * Get User-Mode Linux to build with a newer kernel. Yes, SHELL really
has to be "/bin/sh" - other values such as "sh" or "bash" or "$(type
  -tP sh)" cause a build error:

  LD      .tmp_vmlinux1
  /nix/store/1yv8i1m76cvwk5w5i5wrk4gj5zyfj6vh-binutils-2.19.1/bin/ld:arch/um/kernel/vmlinux.lds:1: ignoring invalid character `#' in expression
  /nix/store/1yv8i1m76cvwk5w5i5wrk4gj5zyfj6vh-binutils-2.19.1/bin/ld:arch/um/kernel/vmlinux.lds:1: syntax error
  collect2: ld returned 1 exit status

  This is caused by Bash 4.0
  (http://bugzilla.kernel.org/show_bug.cgi?id=13343).

svn path=/nixpkgs/branches/kernel-config/; revision=18941
2009-12-14 17:22:38 +00:00
Eelco Dolstra
03b4efe9c8 * Use the kernel config generator for Linux 2.6.27.
* Move kernel patches out of all-packages.nix to
  os-specific/linux/kernel/patches.nix.
* Make the kernel config available under $out/config (it's also in
  $out/lib/modules/$version/build/.config, but that's kind of hard to
  find).

svn path=/nixpkgs/branches/kernel-config/; revision=18937
2009-12-14 15:28:55 +00:00
Eelco Dolstra
98101f9cb1 * Linux 2.6.32.
svn path=/nixpkgs/branches/kernel-config/; revision=18932
2009-12-14 10:15:52 +00:00
Eelco Dolstra
15c6ede144 * Allow options to be ignored if they don't exist by marking them with
a "?".

svn path=/nixpkgs/branches/kernel-config/; revision=18931
2009-12-14 09:27:15 +00:00
Eelco Dolstra
71ed6194e1 * Get fbcondecor to work.
* Barf on ignored options.

svn path=/nixpkgs/branches/kernel-config/; revision=18914
2009-12-12 18:55:17 +00:00
Lluís Batlle i Rossell
dae3eb2383 Merging from trunk.
I resolved two conflicts:
- cmake (trunk fixes + stdenv-updates cross-compiling)
- all-packages (trunk gcc-wrapper2 + stdenv-updates gcc44)


svn path=/nixpkgs/branches/stdenv-updates/; revision=18912
2009-12-12 18:39:09 +00:00
Eelco Dolstra
03e45e0cb4 * Added a script to generate the kernel configuration.
`generate-config.pl' runs `make config' to generate a Linux kernel
  configuration file.  For each question (i.e. kernel configuration
  option), unless an override is provided, it answers "m" if possible,
  and otherwise uses the default answer (as determined by the default
  config for the architecture).  This is safer than allmodconfig,
  which answers "y" everywhere it can't answer "m" and thus ends up
  enabling a lot of experimental or debug options.  (For this reason,
  a configuration generated by allmodconfig must be carefully checked
  with every new release to ensure that nothing dangerous is enabled.
  The default config should be safer wrt new kernel releases.)

  Overrides are specified in the `config' argument to generic.nix,
  which is a string that contains lines such as `EXT2_FS_POSIX_ACL y'.
  The script warns about ignored options, and aborts if `make config'
  selects an answer inconsistent with the one in `config'.  This
  allows us to be sure that `make config' doesn't silently override
  our configuration values (e.g., depending on other options, it will
  set FB_TILEBLITTING to "y" even if we want it to be "n").

svn path=/nixpkgs/branches/kernel-config/; revision=18910
2009-12-12 13:51:07 +00:00
Marc Weber
5319704f80 removing old bleeding edge cruft replacing it by a niftier version using
source regions which are substituded by the tool nix-repository-manager.
See http://github.com/MarcWeber/nix-repository-manager/raw/master/README.

sourceByName is called sourceFromHead now.

updates: MPlayerTrunk, haxe, neko, netsurf, cinelerra, ctags
cinelerra does no longer build due to Xorg update

svn path=/nixpkgs/trunk/; revision=18894
2009-12-11 13:58:23 +00:00
Lluís Batlle i Rossell
61a6bdad88 Reverting some changes I brought in by error for util-linux-ng (I was trying
their git version, to check some bugfixes they did for my reports).


svn path=/nixpkgs/branches/stdenv-updates/; revision=18880
2009-12-10 15:05:26 +00:00
Lluís Batlle i Rossell
89fe676bb3 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18878
2009-12-10 14:48:45 +00:00
Lluís Batlle i Rossell
60788973d0 Adding a required option to uclibc for util-linux-ng (the git master version,
not that of nixpkgs, which still has bugs) to link well with uclibc.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18852
2009-12-09 13:33:23 +00:00
Eelco Dolstra
87fcfb0df2 * davfs2 updated to 1.4.5.
* neon updated to 0.28.6.

svn path=/nixpkgs/trunk/; revision=18841
2009-12-08 13:08:27 +00:00
Eelco Dolstra
83ee756b0a * Latest FUSE and sshfs.
svn path=/nixpkgs/trunk/; revision=18839
2009-12-08 11:38:34 +00:00
Eelco Dolstra
ebeacec489 * Linux 2.6.27.39.
svn path=/nixpkgs/trunk/; revision=18838
2009-12-08 11:38:19 +00:00
Eelco Dolstra
c726012afe * Refactoring: move most filesystem utilities / FUSE filesystems to
tools/filesystems.  Previously they were all over the place.

svn path=/nixpkgs/trunk/; revision=18809
2009-12-04 15:39:49 +00:00
Lluís Batlle i Rossell
4164de326a Making the cross-builds work with uclibc. There is no easy way of switching
between uclibc/glibc still.
I started the renaming from glibc to libc regarding the cross-toolchain, but I
still have to finish.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18801
2009-12-04 13:35:58 +00:00
Lluís Batlle i Rossell
e9abf7bb0c Updating util-linux-ng
svn path=/nixpkgs/branches/stdenv-updates/; revision=18800
2009-12-04 13:34:18 +00:00
Michael Raskin
84eb2eadef Apply patch from Lluis needed for future ARM merge..
svn path=/nixpkgs/trunk/; revision=18776
2009-12-03 07:08:51 +00:00
Lluís Batlle i Rossell
980d7c04a0 Patching uclibc for it to cope well with glibc-2.10 and above
This goes similar to the kernel-headers recent patch for the same file and
purpose.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18743
2009-12-01 20:52:13 +00:00
Lluís Batlle i Rossell
0e691fca14 Fixing the kernel headers patchPhase.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18697
2009-11-29 18:21:20 +00:00
Ludovic Courtès
83f8715475 linux-headers-2.6.28: Verbosely apply the patch against `unifdef.c'.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18692
2009-11-29 14:59:41 +00:00
Lluís Batlle i Rossell
a3403e6828 Finishing the update from trunk, having resolved the eclipse related directory
renaming.
I think directory renaming breaks the usual merges... because it leaves the
'to be removed' directory in the working directory still. A manual 'rm' of the
'to be removed' directory fixed the commit.

svn merge  ^/nixpkgs/trunk


svn path=/nixpkgs/branches/stdenv-updates/; revision=18661
2009-11-26 21:46:08 +00:00
Ludovic Courtès
cfbe19781d Fix `kernelHeaders2628' compilation with glibc 2.11.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18657
2009-11-26 21:04:47 +00:00
Ludovic Courtès
a70f26e178 Fix `kernelHeaders2618' compilation with glibc 2.11.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18656
2009-11-26 20:55:52 +00:00
Lluís Batlle i Rossell
3881f13ad6 Updating the nvidia legacy drivers. Without this update, the drivers
did not work with xorg-server-1.7

svn path=/nixpkgs/trunk/; revision=18574
2009-11-23 21:40:51 +00:00
Michael Raskin
bbd6e56d69 Fix the cleanup-induced problems
svn path=/nixpkgs/trunk/; revision=18554
2009-11-23 12:21:34 +00:00
Lluís Batlle i Rossell
585ba8c27f Big fixes in the cross build:
- Before this changes, cflags and ldflags for the native and the cross compiler
  got mixed. Not all the gcc-wrapper/gcc-cross-wrapper variables are
  independant now, but enough, I think.
- Fixed the generic stdenv expression, which did a big mess on buildInputs and
  buildNativeInputs. Now it distinguishes when there is a stdenvCross or not.
  Maybe we should have a single stdenv and forget about the stdenvCross
  adapter - this could end in a stdenv a bit complex, but simpler than the
  generic stdenv + adapter.
- Added basic support in pkgconfig for cross-builds: a single PKG_CONFIG_PATH
  now works for both the cross and the native compilers, but I think this
  should work well for most cases I can think of.
- I tried to fix the guile expression to cross-biuld; guile is built, but not
  its manual, so the derivation still fails. Guile requires patching to
  cross-build, as far as I understnad.
- Made the glibcCross build to be done through the usage of a
  gcc-cross-wrapper over the gcc-cross-stage-static, instead of using it
  directly.
- Trying to make physfs (a neverball dependency) cross build.
- Updated the gcc expression to support building a cross compiler without getting
  derivation variables mixed with those of the stdenvCross.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18534
2009-11-22 19:51:45 +00:00
Lluís Batlle i Rossell
e85500987b Merging from trunk. I had to do two manual merges, quite trivial I think.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18472
2009-11-19 19:09:10 +00:00
Eelco Dolstra
7f5b839524 * Removed selectVersion. There's no good reason to write
`selectVersion ./foo "bar"' instead of `import ./foo/bar.nix'.
* Replaced `with args' with formal function arguments in several
  packages.
* Renamed several files to `default.nix'.  As a general rule, version
  numbers should only be included in the filename when there is a
  reason to keep multiple versions of a package in Nixpkgs.
  Otherwise, it just makes it harder to update the package.

svn path=/nixpkgs/trunk/; revision=18403
2009-11-18 09:39:59 +00:00
Lluís Batlle i Rossell
2c7fa189fb Making the definition of the cross compiling target an attribute set.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18378
2009-11-16 23:21:13 +00:00
Lluís Batlle i Rossell
9b977f5c60 Fixing many things related to the cross compilation in stdenvCross.
It still does not work, but I think I already get glibc cross compiled.
Next: gcc and g++, and set some setup script hooks on stdenvCross.

It took quite enough hours for this commit.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18351
2009-11-15 05:28:35 +00:00
Lluís Batlle i Rossell
2aba922d30 My first attempt at getting cross compilers in nixpkgs.
My idea is to provide special stdenv expressions that will contain in the path
additional cross compilers. As most expressions for programs accept a stdenv parameter, 
we could substitute this parameter with the special stdenv, which will have a
generic builder that attempts the usual "--target=..." and can additionally
have an env variable like "cross" with the target architecture set.
So, finally we could have additional expressions like this:

bashRealArm = makeOverridable (import ../shells/bash) {
    inherit fetchurl bison;
    stdenv = stdenvCross "armv5tel-unknown-linux-gnueabi";
};

Meanwhile it does not work - I still cannot get the cross-gcc to build.

I think it does not fill the previous expressions with a lot of noise, so I
think it may be a good path to follow.

I only touched some files of the current stdenv: gcc-4.3, kernel headers
2.6.28, glibc 2.9, ...

I tried to use the gcc-cross-wrapper, that may be very outdated. Maybe I will
update it, or update the gcc-wrapper expression to make it fit the cross tools,
but meanwhile I even cannot build gcc, so I have not tested the wrapper.

This new idea on cross compiling is not similar to that of the
nixpkgs/branches/cross-compilation, which mostly added bare new expressions for
anything to be cross compiled, if I understood it correctly.

I cared not to break anything of the usual stdenv in all this work.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18343
2009-11-14 08:11:30 +00:00
Lluís Batlle i Rossell
6864119104 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18341
2009-11-13 19:19:34 +00:00
Lluís Batlle i Rossell
605b62da11 Enabling ipv6 at least as module in the zen5 arm kernel
svn path=/nixpkgs/branches/stdenv-updates/; revision=18315
2009-11-09 23:26:34 +00:00
Lluís Batlle i Rossell
6d092c3371 Adding kvm88, although without the patches kvm86 had for some nix advantages (samba, ...),
because they don't apply directly.

svn path=/nixpkgs/trunk/; revision=18309
2009-11-09 11:55:23 +00:00
Michael Raskin
6722c6c22f A package to feed to HAL to get synaptics support
svn path=/nixpkgs/trunk/; revision=18299
2009-11-08 22:12:55 +00:00
Lluís Batlle i Rossell
1b37fc42bb Updating options for the versatileARM kernel, so it matches something
usable and buildable from a sheevaplug.
I took the additional settings from:
http://fedoraproject.org/wiki/Architectures/ARM/HowToQemu


svn path=/nixpkgs/branches/stdenv-updates/; revision=18296
2009-11-08 20:09:37 +00:00
Lluís Batlle i Rossell
7769ad11bd Updating the logic to put the resulting kernel image into its store path.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18289
2009-11-08 17:19:46 +00:00
Marco Maggesi
e3204aa407 New version of cryopid.
Update package cryopid to a new (unstable) version.
The old (stable) version of cryopid works only with old linux kernels.

svn path=/nixpkgs/trunk/; revision=18286
2009-11-08 10:38:07 +00:00
Lluís Batlle i Rossell
4326d07c11 Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates2/; revision=18278
2009-11-08 01:57:40 +00:00
Lluís Batlle i Rossell
f1ee14bfaf Removing fetchgit --depth and its usage. It does not provide much advantages...
I think it takes the recent N commits into the repository, which says very little,
even for wanting master/HEAD.

svn path=/nixpkgs/trunk/; revision=18277
2009-11-08 01:51:20 +00:00
Lluís Batlle i Rossell
4b27d28701 Porting changes from stdenv-updates into this branch.
This comes from:
svn diff  ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff
patch -p0 < diff
and then adding into svn all files new from the patch.

trunk@18255 comes from the last time I updated stdenv-updates from trunk.


svn path=/nixpkgs/stdenv-updates2/; revision=18272
2009-11-08 00:32:12 +00:00
Michael Raskin
6e86ca940f Make a medium-depth checkout
svn path=/nixpkgs/trunk/; revision=18266
2009-11-07 19:43:53 +00:00
Michael Raskin
dca59abcca Update Zen Kernel
svn path=/nixpkgs/trunk/; revision=18174
2009-11-05 23:32:48 +00:00
Michael Raskin
df69473bd2 Add directvnc. Not sure whether it works - for me it hangs, but I have known Radeon issues, it seems
svn path=/nixpkgs/trunk/; revision=18159
2009-11-05 21:10:51 +00:00
Peter Simons
4d675a283e pkgs/development/interpreters/python/2.6/default.nix: fixed build on Darwin
svn path=/nixpkgs/trunk/; revision=18136
2009-11-05 13:44:30 +00:00
Eelco Dolstra
4f839e9a54 * Sync with the trunk.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18122
2009-11-04 22:37:24 +00:00
Eelco Dolstra
45ba16864f * Deleted some obsolete kernels (2.6.20, 2.6.21, 2.6.22, 2.6.23 and
the 2.6.31rcs).

svn path=/nixpkgs/trunk/; revision=18065
2009-11-01 17:17:40 +00:00
Eelco Dolstra
c9b79a3d84 * Oops, wrong version.
svn path=/nixpkgs/trunk/; revision=18057
2009-10-30 18:13:08 +00:00
Eelco Dolstra
65d399ff81 * Upstart 0.6.2.
svn path=/nixpkgs/trunk/; revision=18056
2009-10-30 18:12:28 +00:00
Eelco Dolstra
97ea4b3375 * Updated ALSA.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18055
2009-10-30 15:05:13 +00:00
Eelco Dolstra
35593f5cd5 * NVIDIA X11 driver updated to 190.42.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18023
2009-10-29 13:47:44 +00:00
Eelco Dolstra
41879a5c74 * Linux 2.6.27.38.
svn path=/nixpkgs/trunk/; revision=17985
2009-10-28 12:07:00 +00:00
Michael Raskin
ab85fbeec4 Updating fbterm
svn path=/nixpkgs/trunk/; revision=17981
2009-10-27 23:49:59 +00:00
Ludovic Courtès
37b42b3ab7 Linux: Enable `sdhci', for Ricoh SD readers.
svn path=/nixpkgs/trunk/; revision=17954
2009-10-25 15:22:54 +00:00
Michael Raskin
c6c9129761 Removing references to old zen-kernels that are in archived branches; Updating from zen-sources.org to zen-kernel.org; Updating revision; Adding patch by Pierre to enable external hubs
svn path=/nixpkgs/trunk/; revision=17930
2009-10-23 05:21:54 +00:00
Eelco Dolstra
21ddf5e52e * Linux 2.6.27.37.
svn path=/nixpkgs/trunk/; revision=17909
2009-10-21 13:07:09 +00:00
Peter Simons
90dd9d14bf python-2.6: fixed build on Darwin
* Dropped "nolongdouble.patch". The patch no longer applies to Python 2.6, and
   apparently isn't required anymore either.

 * Added access to native Darwin arch utility. Python tries to run 'arch' in
   the configure stage, but that binary reside in /usr/bin. To make it
   available to the expression, the small wrapper darwinArchUtility is added as
   a buildInput if appropriate.

 * Don't pass --enable-shared. The build fails if we try to enable building of
   shared libraries, apparently because some required libraries aren't linked,
   i.e. the linker call isn't right.

TODO:

 * Figure out how to enable shared linking.

 * The resulting binary on Darwin seem to lack the binascii module.

svn path=/nixpkgs/trunk/; revision=17894
2009-10-20 12:13:49 +00:00
Lluís Batlle i Rossell
662dbb3cb4 Updating ipw2200 firmware from 3.0 to 3.1.
I found no benefit from it. This card worked at most at 500KB/s for me at bitrate 54Mb/s,
and it works the same way with the fw 3.1.

svn path=/nixpkgs/trunk/; revision=17812
2009-10-14 21:56:45 +00:00
Eelco Dolstra
257ffc8e73 * Fix broken meta attributes.
svn path=/nixpkgs/trunk/; revision=17773
2009-10-13 09:39:27 +00:00
Eelco Dolstra
55ad6675dc * Fix some packages that broke because libuuid can be null on Darwin.
buildDefs doesn't like buildInputs containing nulls.
* In all-packages.nix: xfsProgs -> xfsprogs, jfsUtils -> jfsutils to
  match the upstream name.

svn path=/nixpkgs/trunk/; revision=17726
2009-10-08 13:07:56 +00:00
Michael Raskin
cd2e2948a8 Adding a zen-stable head version
svn path=/nixpkgs/trunk/; revision=17663
2009-10-06 06:12:08 +00:00
Michael Raskin
edbbddce1d A case study in transitive overrides. WebKit needs fresh glib. This means it needs a whole slice of system built against glib-2.22.. Added overrides are generic enough, though. So the same way can be used to override everything. I have failed (so far?) to add mkOverridable into stdenv, though.
svn path=/nixpkgs/trunk/; revision=17661
2009-10-06 05:43:51 +00:00
Eelco Dolstra
68082057fe * Urgh.
svn path=/nixpkgs/trunk/; revision=17614
2009-10-02 15:15:18 +00:00
Eelco Dolstra
e4672f42e5 svn path=/nixpkgs/trunk/; revision=17613 2009-10-02 15:06:07 +00:00
Michael Raskin
be8eb4e6d7 Gw6c tarball is now uncompessed.. Do not ask me why
svn path=/nixpkgs/trunk/; revision=17515
2009-09-29 16:22:23 +00:00
Michael Raskin
e2b05ffd3a Gw6c client got updated
svn path=/nixpkgs/trunk/; revision=17513
2009-09-29 15:59:37 +00:00
Eelco Dolstra
176c0e32b1 * net-tools: install the manpages in $out/share/man/manN instead of
$out/share/manN.  Cleaned up the expression at the same time.

svn path=/nixpkgs/trunk/; revision=17509
2009-09-29 15:33:03 +00:00
Michael Raskin
9bcea7563d Boost library reference change no longer needed
svn path=/nixpkgs/trunk/; revision=17487
2009-09-29 04:30:28 +00:00
Eelco Dolstra
af88789507 * Bluez 4.54.
svn path=/nixpkgs/trunk/; revision=17473
2009-09-28 16:25:38 +00:00
Eelco Dolstra
06e126b48f * Latest libsmbios.
* Build HAL with libsmbios support.

svn path=/nixpkgs/trunk/; revision=17472
2009-09-28 15:33:42 +00:00
Eelco Dolstra
9bc85fda47 * qemu-kvm 0.11.0.
svn path=/nixpkgs/trunk/; revision=17468
2009-09-28 14:28:20 +00:00
Eelco Dolstra
b642db4d0e * Build HAL with pm-utils support.
svn path=/nixpkgs/trunk/; revision=17450
2009-09-26 20:29:26 +00:00
Eelco Dolstra
77ba759b5a * Install HAL's umount helper. This is necessary to allow non-root
users to unmount or eject removable media mounted through HAL from
  the command-line.

svn path=/nixpkgs/trunk/; revision=17447
2009-09-26 18:56:53 +00:00
Eelco Dolstra
363f3fd1b9 * Use /etc/pm for the configuration.
svn path=/nixpkgs/trunk/; revision=17446
2009-09-26 17:09:51 +00:00
Eelco Dolstra
a96c83d70e * Build HAL with ConsoleKit and PolicyKit support. Without it, HAL's
configure script prints out this ominous warning:

WARNING: PolicyKit is disabled. You need to manually edit the hal.conf
         file to lock down the service. Failure to do so allows any
         caller to make hald do work on their behalf which may be
         a huge SECURITY HOLE. I repeat: YOU NEED TO EDIT THE FILE
         hal.conf to match your distro/site to avoid NASTY SECURITY HOLES.

  Note that HAL only builds with the old PolicyKit (it looks for
  polkit.pc).  Reverted ConsoleKit to the last version that used the
  old PolicyKit for this reason.

svn path=/nixpkgs/trunk/; revision=17432
2009-09-25 23:05:53 +00:00
Eelco Dolstra
ef2f9c1968 * Added pm-utils.
svn path=/nixpkgs/trunk/; revision=17430
2009-09-25 21:43:25 +00:00
Eelco Dolstra
90fc367427 * e2fsprogs 1.41.9.
svn path=/nixpkgs/trunk/; revision=17429
2009-09-25 20:53:21 +00:00
Eelco Dolstra
213519d327 * Linux 2.6.27.35.
svn path=/nixpkgs/trunk/; revision=17422
2009-09-25 18:59:07 +00:00
Eelco Dolstra
251c7207cf * Revert to KVM 76 in the VM build functions. The latest qemu-kvm has
weird performance and data corruption regressions in the build farm.

svn path=/nixpkgs/trunk/; revision=17364
2009-09-23 14:24:37 +00:00
Peter Simons
8a9c1f6781 htop: updated to version 0.8.3
svn path=/nixpkgs/trunk/; revision=17355
2009-09-22 19:37:18 +00:00
Rob Vermaas
a9d801d645 * added davfs2 1.4.1
svn path=/nixpkgs/trunk/; revision=17345
2009-09-22 08:12:11 +00:00
Marc Weber
8398a33112 pass jackaudio to alsaPlugins also adding convinient wrapper script
svn path=/nixpkgs/trunk/; revision=17340
2009-09-21 15:55:26 +00:00
Marc Weber
862fcb0252 adding alsa-plugin and patching alsa so that you can tell it about additional plugins
svn path=/nixpkgs/trunk/; revision=17316
2009-09-20 21:54:23 +00:00
Marc Weber
295c76b1c1 adding bash completion script for upstart
svn path=/nixpkgs/trunk/; revision=17304
2009-09-20 17:01:24 +00:00
Lluís Batlle i Rossell
8515a7fa68 Adding me as a maintainer, with a pair of packages.
svn path=/nixpkgs/trunk/; revision=17295
2009-09-20 09:37:55 +00:00
Lluís Batlle i Rossell
b1a7cd1692 Fixing cryptsetup build.
svn path=/nixpkgs/trunk/; revision=17293
2009-09-20 09:22:02 +00:00
Michael Raskin
107a5ee327 Adding dmraid
svn path=/nixpkgs/trunk/; revision=17292
2009-09-20 08:38:30 +00:00
Lluís Batlle i Rossell
854293fc7b Adding the nvidia legacy drivers (I still use a geForce 4 AGP)
svn path=/nixpkgs/trunk/; revision=17284
2009-09-19 22:09:08 +00:00
Lluís Batlle i Rossell
72d6ffb8cf Adding the firmware for the rt73 usb wifi nic.
svn path=/nixpkgs/trunk/; revision=17263
2009-09-18 20:45:10 +00:00
Michael Raskin
86a90971d7 I am an idiot. Correcting -zen1 -> -zen2
svn path=/nixpkgs/trunk/; revision=17242
2009-09-18 06:38:36 +00:00
Michael Raskin
f13b0781cc Disabling PRAMFS in Zen Kernel for now
svn path=/nixpkgs/trunk/; revision=17241
2009-09-18 05:00:54 +00:00
Michael Raskin
19b45ac62d adding 2.6.31-zen1 kernel
svn path=/nixpkgs/trunk/; revision=17217
2009-09-17 08:39:00 +00:00
Eelco Dolstra
63dceffb0b * Latest lm_sensors.
svn path=/nixpkgs/trunk/; revision=17170
2009-09-15 22:06:38 +00:00
Michael Raskin
b217a6c57b Try enabling VESA framebuffer
svn path=/nixpkgs/trunk/; revision=17169
2009-09-15 19:21:02 +00:00
Michael Raskin
07ed9e4611 Enable FB_CON_DECOR
svn path=/nixpkgs/trunk/; revision=17159
2009-09-15 12:29:15 +00:00
Michael Raskin
2a5e20ae3a Try enabling fbcondecor
svn path=/nixpkgs/trunk/; revision=17158
2009-09-15 11:37:18 +00:00
Michael Raskin
0428a7405a Fix aufs utilities for NixOS manual
svn path=/nixpkgs/trunk/; revision=17153
2009-09-15 10:28:40 +00:00
Michael Raskin
af269992e1 Update feature set for Zen kernel; also tune HZ settings for BFS scheduler (didn't boot for me last time)
svn path=/nixpkgs/trunk/; revision=17151
2009-09-15 09:16:29 +00:00
Michael Raskin
9ff982e4ab Require AUFS2 support in kernel
svn path=/nixpkgs/trunk/; revision=17150
2009-09-15 08:55:41 +00:00
Michael Raskin
a0fbdffaba fix typo
svn path=/nixpkgs/trunk/; revision=17149
2009-09-15 08:45:10 +00:00
Michael Raskin
9ebb44e92e AUFS2 utilities
svn path=/nixpkgs/trunk/; revision=17147
2009-09-15 07:58:44 +00:00
Michael Raskin
a593492d4f Add a version of Zen kernel with Con Kolivas' BFS scheduler
svn path=/nixpkgs/trunk/; revision=17142
2009-09-14 21:56:31 +00:00
Michael Raskin
5ea58c412e Fix more problems with aufs2
svn path=/nixpkgs/trunk/; revision=17110
2009-09-14 13:30:33 +00:00
Michael Raskin
f4162c9716 Turn off more debug options not needed by default
svn path=/nixpkgs/trunk/; revision=17103
2009-09-13 20:22:37 +00:00
Michael Raskin
a8fa3e9cc9 Removing more debugging options from default 2.6.31 config
svn path=/nixpkgs/trunk/; revision=17101
2009-09-13 20:10:19 +00:00
Michael Raskin
5d3b1a1b07 Change some options most different from mainline to build a probably bootable kernel
svn path=/nixpkgs/trunk/; revision=17095
2009-09-13 16:37:17 +00:00
Michael Raskin
01063c854b Remove option stopping 2.6.31 from booting
svn path=/nixpkgs/trunk/; revision=17094
2009-09-13 16:24:44 +00:00
Eelco Dolstra
eb6f32c9cb * Fix the aufs2 build (hopefully).
svn path=/nixpkgs/trunk/; revision=17080
2009-09-13 10:25:58 +00:00
Michael Raskin
0462878b22 Fixing a typo
svn path=/nixpkgs/trunk/; revision=17067
2009-09-12 07:33:55 +00:00
Michael Raskin
a5023cf381 Adding 2.6.31 kernel and trying to generate config for it without manual operations
svn path=/nixpkgs/trunk/; revision=17065
2009-09-12 07:13:20 +00:00
Michael Raskin
11de02585a Trying to reconfigure kernel to boot
svn path=/nixpkgs/trunk/; revision=17064
2009-09-12 06:59:44 +00:00
Michael Raskin
b3281f994f KQemu needs perl to build
svn path=/nixpkgs/trunk/; revision=17063
2009-09-12 06:11:21 +00:00
Michael Raskin
7cc0f07690 Fix kernel configuration editing script snippets
svn path=/nixpkgs/trunk/; revision=17053
2009-09-11 13:59:32 +00:00
Michael Raskin
ec57ec6d6f Disable IMA because of conflict with aufs
svn path=/nixpkgs/trunk/; revision=17051
2009-09-11 13:50:40 +00:00
Michael Raskin
491255bbb3 Trying to add Zen Linux Kernel
svn path=/nixpkgs/trunk/; revision=17050
2009-09-11 13:16:18 +00:00
Marc Weber
21b7f04330 adding halevt
svn path=/nixpkgs/trunk/; revision=17027
2009-09-10 16:57:53 +00:00
Eelco Dolstra
daceb23a25 * qemu-kvm 0.11.0rc2.
svn path=/nixpkgs/trunk/; revision=16995
2009-09-09 15:44:14 +00:00
Michael Raskin
edd56d707a Update source updater to support fetchgit; add aufs2 using that method. Unfortunately, AUFS2 seems to require some strict conditions on kernel options and version..
svn path=/nixpkgs/trunk/; revision=16983
2009-09-08 09:35:21 +00:00
Eelco Dolstra
e8931adcf3 * Latest NVIDIA driver. This one isn't broken on laptops.
svn path=/nixpkgs/trunk/; revision=16858
2009-08-26 09:01:05 +00:00
Eelco Dolstra
b67e9a0415 * qemu-kvm unix domain patch: when accepting a connection, initialise
the remote address / port to something sensible.  Otherwise
  simultaneous connections to the same guest port don't work properly.

svn path=/nixpkgs/trunk/; revision=16805
2009-08-21 15:40:32 +00:00
Eelco Dolstra
c7eb810826 * haddr -> hport.
svn path=/nixpkgs/trunk/; revision=16804
2009-08-21 14:26:46 +00:00
Eelco Dolstra
2dffe66c92 * Linux 2.6.27.31.
svn path=/nixpkgs/trunk/; revision=16754
2009-08-18 09:29:03 +00:00
Eelco Dolstra
e93367dc45 * Enable auto-mounting/unmounting of optical media and USB sticks
(e.g. in KDE).

svn path=/nixpkgs/trunk/; revision=16745
2009-08-17 02:04:26 +00:00
Eelco Dolstra
6e89ec648c * ConsoleKit compatibility.
svn path=/nixpkgs/trunk/; revision=16740
2009-08-17 00:35:18 +00:00
Eelco Dolstra
9ea1a49aa2 * PolicyKit -> policy-kit (suggested by Ludovic).
* Oops, there already was a polkit package.  Mea culpa...

svn path=/nixpkgs/trunk/; revision=16721
2009-08-14 21:12:46 +00:00
Eelco Dolstra
40854d65b4 svn path=/nixpkgs/trunk/; revision=16700 2009-08-12 13:36:36 +00:00
Eelco Dolstra
bbf64219b4 * More e2fsprogs -> libuuid.
svn path=/nixpkgs/trunk/; revision=16695
2009-08-11 22:29:03 +00:00
Eelco Dolstra
a63c9c8e71 * hal: updated to 0.5.13.
* hal-info: updated to 20090716.

svn path=/nixpkgs/trunk/; revision=16686
2009-08-11 21:03:53 +00:00
Eelco Dolstra
17828d8442 * udev: updated to 145. Dropped support for doing a static build
since we don't need it anymore.  Patched the udev rules/helper
  programs for CD-ROM symlink generation and firmware loading so that
  we don't have to provide our own.

svn path=/nixpkgs/trunk/; revision=16684
2009-08-11 21:00:42 +00:00
Eelco Dolstra
6f70fd1c6b * util-linux-ng: updated to 2.16. Don't build a separate mount
anymore since the build process was very hacky.  Instead
  mount/umount looks for mount helpers in
  /var/run/current-system/sw/sbin.  It would be better to use an
  environment variable, but that would be risky if mount is setuid
  root.
* e2fsprogs: updated to 1.41.8.  Don't build libuuid, libblkid
  etc. anymore, since they have been moved to util-linux-ng.
* nfs-utils: updated to 1.2.0.

svn path=/nixpkgs/trunk/; revision=16682
2009-08-11 20:57:29 +00:00
Eelco Dolstra
c2737e315a * usbutils updated to 0.84.
* usb.ids updated to the latest version.

svn path=/nixpkgs/trunk/; revision=16681
2009-08-11 20:48:56 +00:00
Eelco Dolstra
6e4a53de74 * dmidecode 2.10.
svn path=/nixpkgs/trunk/; revision=16678
2009-08-11 20:43:39 +00:00
Eelco Dolstra
80b0d89ff0 * bluez: store state under /var.
svn path=/nixpkgs/trunk/; revision=16651
2009-08-10 18:24:20 +00:00
Eelco Dolstra
098626dc86 * hport is in network order, so it needs to be converted back to host
order...
* Remove the socket file automatically.

svn path=/nixpkgs/trunk/; revision=16602
2009-08-07 09:54:03 +00:00
Eelco Dolstra
b7b4757ae4 * Added bluez, the Bluetooth stack for Linux.
svn path=/nixpkgs/trunk/; revision=16594
2009-08-05 20:29:36 +00:00
Eelco Dolstra
2ae0060bde * qemu-kvm: a quick hack to support connecting a Unix domain socket on
the host to a TCP port on the guest.  This will be useful for
  automated testing using QEMU virtual machines.  Using TCP ports on
  the host is insecure and hard to manage (since you need to pick an
  available host port).

  For example:

    $ qemu-system-x86_64 ... -redir tcp:65535::514

  creates a Unix domain socket `./65535.socket' on the host.  (There
  is no proper syntax yet, so as a hack all host "ports" above 0xff00
  are treated in this way.)  Connections to that socket are then
  forwarded to TCP port 514 on the guest.  So the guest can do

    $ nc -l -p 514 -e /bin/sh

  to execute a shell for incoming connections on port 514, and then
  the host can do

    $ socat stdio ./65535.socket

  to run a shell on the guest.

svn path=/nixpkgs/trunk/; revision=16593
2009-08-05 17:26:39 +00:00
Eelco Dolstra
a82d1e3d63 * Revert the NVIDIA driver to the previous version. The new one
doesn't work (black screen on startup).

svn path=/nixpkgs/trunk/; revision=16588
2009-08-05 08:54:13 +00:00
Eelco Dolstra
df2f9ee836 * Urgh.
svn path=/nixpkgs/trunk/; revision=16584
2009-08-04 16:03:41 +00:00
Eelco Dolstra
c7dd5c04fc * Obsolete comment.
svn path=/nixpkgs/trunk/; revision=16583
2009-08-04 16:03:13 +00:00
Eelco Dolstra
84c7717cd5 * qemu-kvm is the upstream renaming of the kvm package. It no longer
contains the kernel module, which we didn't build anyway.  The kvm
  package can be deleted eventually.

svn path=/nixpkgs/trunk/; revision=16582
2009-08-04 16:02:27 +00:00
Eelco Dolstra
af3b8475ff * Remove some old KVM versions.
svn path=/nixpkgs/trunk/; revision=16581
2009-08-04 15:57:12 +00:00
Michael Raskin
25b3fe32ad Adding myself as a maintainer of some of the packages
svn path=/nixpkgs/trunk/; revision=16572
2009-08-04 07:49:16 +00:00
Eelco Dolstra
8abae778b8 * Latest NVIDIA driver.
svn path=/nixpkgs/trunk/; revision=16558
2009-08-03 12:18:50 +00:00
Eelco Dolstra
e8dbd26bee * Linux 2.6.27.29.
svn path=/nixpkgs/trunk/; revision=16554
2009-08-03 10:04:20 +00:00
Michael Raskin
be5fc98c97 Really non-PAE configuration this time
svn path=/nixpkgs/trunk/; revision=16552
2009-08-03 09:25:57 +00:00
Michael Raskin
3baa3663c9 Try newer -RC kernel
svn path=/nixpkgs/trunk/; revision=16504
2009-07-29 18:10:26 +00:00
Lluís Batlle i Rossell
d4aedd92cc I revert my changes to get nixpkgs working on armv5tel-linux.
I thought I didn't change stdenv, but I did. This will go soon into the stdenv
branch then.
Reverse-merging r16467 through r16465.


svn path=/nixpkgs/trunk/; revision=16468
2009-07-26 22:47:33 +00:00
Lluís Batlle i Rossell
532fc4a05d Adding armv5tel to the 'if' checks in stdenv, gcc-wrapper and kernel headers
svn path=/nixpkgs/trunk/; revision=16466
2009-07-26 21:48:10 +00:00
Eelco Dolstra
aaca21fcff * iproute2 updated to 2.6.29-1.
svn path=/nixpkgs/trunk/; revision=16446
2009-07-23 21:34:53 +00:00
Eelco Dolstra
4bc2468913 * iptables updated to 1.4.4.
svn path=/nixpkgs/trunk/; revision=16440
2009-07-23 18:16:24 +00:00
Michael Raskin
35f22c0afb Reverting AUFS update
svn path=/nixpkgs/trunk/; revision=16392
2009-07-16 11:39:03 +00:00
Michael Raskin
2b51bd8c6b Use a fresh checkout
svn path=/nixpkgs/trunk/; revision=16391
2009-07-16 11:22:57 +00:00
Michael Raskin
56b232c4cb Update AUFS
svn path=/nixpkgs/trunk/; revision=16389
2009-07-16 11:02:37 +00:00
Michael Raskin
15bec036fa Add 2.6.31-rc2 kernel for now : rc3 has a BtrFS stability regression
svn path=/nixpkgs/trunk/; revision=16384
2009-07-16 06:30:25 +00:00