diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-08-20 14:26:32 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-08-20 14:26:32 +0000 |
| commit | aa983025d6cf8da75b777808c3866ff76afe5f30 (patch) | |
| tree | 9f8937c46bd1c7d7c52a7f0833481374dfb142a0 /pkgs | |
| parent | 16c6da0129983bde1ce81e61e38d22a3016db2bc (diff) | |
| download | nixpkgs-aa983025d6cf8da75b777808c3866ff76afe5f30.tar nixpkgs-aa983025d6cf8da75b777808c3866ff76afe5f30.tar.gz nixpkgs-aa983025d6cf8da75b777808c3866ff76afe5f30.tar.bz2 nixpkgs-aa983025d6cf8da75b777808c3866ff76afe5f30.tar.lz nixpkgs-aa983025d6cf8da75b777808c3866ff76afe5f30.tar.xz nixpkgs-aa983025d6cf8da75b777808c3866ff76afe5f30.tar.zst nixpkgs-aa983025d6cf8da75b777808c3866ff76afe5f30.zip | |
* Linux 2.6.21.7.
svn path=/nixpkgs/trunk/; revision=9176
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-2.6.21.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 25 |
2 files changed, 13 insertions, 16 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.21.nix b/pkgs/os-specific/linux/kernel/linux-2.6.21.nix index aade5218469..b4fd5ad297d 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.21.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.21.nix @@ -24,7 +24,7 @@ let lib = import ../../../lib; - version = "2.6.21.5"; + version = "2.6.21.7"; in @@ -34,7 +34,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://ftp.de.kernel.org/pub/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "1vvfm6xhk81vvc88ibv6siqjq4a3m2204c9fkb5llasywchgyh85"; + sha256 = "1c8ndsz35qd8vyng3xsxjjkjv5bnzyvc9b5vd85fz5v0bjp8hx50"; }; patches = map (p: p.patch) kernelPatches; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 816a383b747..b8c439660e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -176,17 +176,15 @@ rec { allPackages = import ./all-packages.nix; }).stdenv; - stdenv = if (bootStdenv == null) then - let - optionPath = ["replaceStdenv"]; in - let - changer = getConfig optionPath null; in - (if changer != null then - changer {stdenv = defaultStdenv; - overrideSetup = overrideSetup;} - else defaultStdenv) - else - bootStdenv; + stdenv = + if bootStdenv != null then bootStdenv else + let changer = getConfig ["replaceStdenv"] null; + in if changer != null then + changer { + stdenv = defaultStdenv; + overrideSetup = overrideSetup; + } + else defaultStdenv; ### BUILD SUPPORT @@ -3012,7 +3010,7 @@ rec { inherit (xlibs) libX11; }; - eclipse = plugins : + eclipse = plugins: import ../applications/editors/eclipse { inherit fetchurl stdenv makeWrapper jdk; inherit (gtkLibs) gtk glib; @@ -3024,8 +3022,7 @@ rec { eclipseSpoofax = lowPrio (appendToName "with-spoofax" (eclipse [spoofax])); - elinks = (import ../applications/networking/browsers/elinks) - { + elinks = import ../applications/networking/browsers/elinks { inherit stdenv fetchurl python perl ncurses x11 zlib openssl; }; |