Commit Graph

38 Commits

Author SHA1 Message Date
Shea Levy
a589bfae17 Update and fix kernel packages to new kernel build
In most cases, this just meant changing kernelDev (now removed from
linuxPackagesFor) to kernel.dev. Some packages needed more work (though
whether that was because of my changes or because they were already
broken, I'm not sure). Specifics:

* psmouse-alps builds on 3.4 but not 3.10, as noted in the comments that
  were already there
* blcr builds on 3.4 but not 3.10, as noted in comments that were
  already there
* open-iscsi, ati-drivers, wis-go7007, and openafsClient don't build on
  3.4 or 3.10 on this branch or on master, so they're marked broken
* A version-specific kernelHeaders package was added

The following packages were removed:

* atheros/madwifi is superceded by official ath*k modules
* aufs is no longer used by any of our kernels
* broadcom-sta v6 (which was already packaged) replaces broadcom-sta
* exmap has not been updated since 2011 and doesn't build
* iscis-target has not been updated since 2010 and doesn't build
* iwlwifi is part of mainline now and doesn't build
* nivida-x11-legacy-96 hasn't been updated since 2008 and doesn't build

Everything not specifically mentioned above builds successfully on 3.10.
I haven't yet tested on 3.4, but will before opening a pull request.

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-04 21:17:04 -05:00
Shea Levy
4fa4ab3a6e Partially revert my recent kernelPackages changes
First, pass in `self' again so that overriding works properly (thanks
for pointing that out, @edolstra)

Second, instead of having linuxPackages*.kernel mean something different
inside the set and out, add a new attribute linuxPackages*.kernelDev,
which for the generic kernel is simply linuxPackages*.kernel but for the
manual-config kernel is the `dev' output (which has the build tree,
source tree, etc.)

The second change required trivial modifications in a bunch of
expressions, I verified that all of the linuxPackages* sets defined in
all-packages.nix have the same drv paths before and after the change.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-24 07:45:00 -04:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra
d3cdacab03 klibc: Fix URL
P.S. the only reason we need klibc is because of the "nfsmount"
program in the initrd.  But I'm pretty sure we can use Busybox's mount
command there.
2012-06-22 12:02:12 -04:00
Yury G. Kudryashov
313a029f16 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32396
2012-02-19 11:16:24 +00:00
Eelco Dolstra
b23126fcc3 * Include the kernel version in kernel-specific packages so that they
can be distinguished in nix-env -qa output.

svn path=/nixpkgs/trunk/; revision=32352
2012-02-17 14:32:28 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Shea Levy
dd9e83b77f Enable building full klibc as a kernelPackage
svn path=/nixpkgs/trunk/; revision=30009
2011-10-25 08:59:39 +00:00
Shea Levy
e0e4770ec9 klibc 1.5.24
svn path=/nixpkgs/trunk/; revision=30008
2011-10-25 08:20:03 +00:00
Lluís Batlle i Rossell
f571bc19d3 Trick to make klibc build for what we may use it for, at least.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23705
2010-09-09 17:48:11 +00:00
Lluís Batlle i Rossell
4869b6304a Adding a patch for klibc so it does not fall in a neverending loop.
It fails building, but at least does not annoy that much.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23640
2010-09-05 06:00:14 +00:00
Lluís Batlle i Rossell
da3ba13fb5 Trying to make gcc 4.5 cross-buildable
svn path=/nixpkgs/branches/stdenv-updates/; revision=22848
2010-08-01 21:21:26 +00:00
Lluís Batlle i Rossell
86345919c2 Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=22254
2010-06-14 09:28:10 +00:00
Eelco Dolstra
6dddd07402 * vmTools: don't use klibc anymore. Just use utillinux/bash/etc.
svn path=/nixpkgs/trunk/; revision=22209
2010-06-10 12:28:04 +00:00
Eelco Dolstra
a15da3571f * Fix the URL.
svn path=/nixpkgs/trunk/; revision=22083
2010-06-01 12:13:59 +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
Ludovic Courtès
fac9a5c936 Replace kernelHeaders' by linuxHeaders'.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19067
2009-12-21 14:04:45 +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
Eelco Dolstra
674211ac9d * Revive klibc 1.5 for now since vmtools still uses its insmod.
svn path=/nixpkgs/trunk/; revision=16040
2009-06-25 08:22:51 +00:00
Eelco Dolstra
1df4221cb3 * klibc 1.5.15. Fixes a segfault in cpio.
svn path=/nixpkgs/trunk/; revision=16020
2009-06-22 14:14:58 +00:00
Eelco Dolstra
7689a348c4 * Got rid of a lot of "postInstall=postInstall" and similar lines in
builders.  These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations.  This is done
  automatically now if setupHook is set.
* Deleted the initscripts package.  NixOS doesn't use it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
2009-04-23 13:31:10 +00:00
Eelco Dolstra
b48cc44ebf * klibc: install statically linked binaries as well.
* klibc: build against the regular kernel headers instead of depending
  on a kernel build.  This way we don't have to rebuild klibc every
  time the kernel changes.
* splashutils 1.3: compile properly with a klibc that uses unpatched
  kernel headers.

svn path=/nixpkgs/trunk/; revision=13900
2009-01-29 15:44:37 +00:00
Michael Raskin
914e93bb01 merging builder.sh into klibc expression
svn path=/nixpkgs/trunk/; revision=13172
2008-11-02 15:53:55 +00:00
Michael Raskin
83509605b3 Added possibility to change klibc version
svn path=/nixpkgs/trunk/; revision=12563
2008-08-09 08:40:37 +00:00
Eelco Dolstra
a9d19f45db * A function `useKlibc' to build a package using klibc as the C
library.
* Removed devicemapperStatic, e2fsprogsDiet, lvm2Static since they're
  redundant (it's what you get when you use pkgsDiet/pkgsStatic).

svn path=/nixpkgs/trunk/; revision=12554
2008-08-08 19:05:32 +00:00
Eelco Dolstra
031c022a25 * Fix a regression in klibcShrunk.
svn path=/nixpkgs/trunk/; revision=11920
2008-05-28 14:33:49 +00:00
Eelco Dolstra
0aea0db581 * Put all packages that depend on a specific kernel (notably kernel
modules) together in an attribute set returned by the function
  "kernelPackagesFor" that takes a kernel as argument.  For instance,
  kernelPackages_2_6_23 is the result of calling this function with
  kernel_2_6_23.

  This is necessary in NixOS to make it easier to override the kernel:
  it's not enough to just specify a different kernel (via the
  boot.kernel option), but you also need matching nvidiaDriver, aufs,
  iwlwifi, etc.  Having a single attribute set that contains all
  kernel-related packages makes this much easier.

* The kernel now has a passthru attribute "features" that allows NixOS
  expressions to test whether a kernel has certain features.  For
  instance, the externel "iwlwifi" kernel module package should only
  be built on kernels < 2.6.24, as kernels >= 2.6.24 have iwlwifi
  support integrated.  So the NixOS expressions can do the test
  "kernel.features ? iwlwifi" to see if the iwlwifi package should be
  built.

  Kernel patches can declare additional features.  E.g., the fbsplash
  patch adds a "fbSplash" feature.

svn path=/nixpkgs/trunk/; revision=11881
2008-05-22 12:01:24 +00:00
Eelco Dolstra
4624c8bc3f * klibShrunk: just the klibc binaries without header files etc; useful
for installation in initrds.

svn path=/nixpkgs/trunk/; revision=11125
2008-03-14 13:46:47 +00:00
Eelco Dolstra
d39fd2a578 * Rewrite all the kernel.org URLs to mirror://kernel/.
svn path=/nixpkgs/trunk/; revision=9202
2007-08-27 13:59:40 +00:00
Eelco Dolstra
a2db896085 * klibc 1.5.
svn path=/nixpkgs/trunk/; revision=8295
2007-03-15 14:38:39 +00:00
Eelco Dolstra
2fab5f01e3 * Borrowed a patch from Gentoo to get splashutils to work on x86_64.
* Latest klibc.

svn path=/nixpkgs/trunk/; revision=7871
2007-02-06 22:08:13 +00:00
Eelco Dolstra
cd32e67b2b * Remove makeFlags/installFlags redundancy.
svn path=/nixpkgs/trunk/; revision=7501
2006-12-27 18:26:23 +00:00
Eelco Dolstra
510ff785e7 * Urgh, splashutils requires the klibc headers to contain header files
from the fbsplash kernel patch.  So use the actual patched kernel as
  an input to klibc, instead of Glibc's kernel headers.

svn path=/nixpkgs/trunk/; revision=7138
2006-11-26 23:24:40 +00:00
Eelco Dolstra
66b646d7e7 * Latest klibc.
svn path=/nixpkgs/trunk/; revision=7133
2006-11-25 21:49:42 +00:00
Eelco Dolstra
491f505848 * Splashutils.
svn path=/nixpkgs/trunk/; revision=7126
2006-11-25 00:28:15 +00:00
Eelco Dolstra
3389f4bc36 * Copy lots of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=4623
2006-01-30 16:04:03 +00:00
Eelco Dolstra
82e678362f * "." -> "source".
svn path=/nixpkgs/trunk/; revision=4335
2005-12-05 14:11:09 +00:00
Armijn Hemel
a816f506a2 add klibc
svn path=/nixpkgs/trunk/; revision=3723
2005-08-27 20:48:05 +00:00