dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge commit 'trunk'

Browse Source 
Conflicts:

	pkgs/development/compilers/ocaml/default.nix
	pkgs/development/interpreters/python/default.nix
	pkgs/tools/package-management/nix/unstable.nix
	pkgs/top-level/all-packages.nix

svn path=/nixpkgs/branches/stdenv-updates/; revision=9762
This commit is contained in:
Yury G. Kudryashov 2007-11-19 22:43:29 +00:00
parent e43ce8f723
commit b8fafa21e6
7 changed files with 10382 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/misc/emulators/wine/default.nix
View File

@ -7,11 +7,11 @@ assert stdenv.isLinux;
let lib = import ../../../lib/default.nix; in
stdenv.mkDerivation {
name = "wine-0.9.46";
name = "wine-0.9.49";
src = fetchurl {
url = mirror://sourceforge/wine/wine-0.9.46.tar.bz2;
sha256 = "0c5fapw38bivipi8yzci3swxyhl9g67dpicqzslwmffwbi9y9z3i";
url = mirror://sourceforge/wine/wine-0.9.49.tar.bz2;
sha256 = "d41edd08cf7fd21d7350a633995107533a25f925c8859995d3a6fc131f54b3c1";
};
buildInputs = [

19
pkgs/os-specific/linux/bridge_utils/default.nix Normal file
View File

@ -0,0 +1,19 @@
args:
args.stdenv.mkDerivation {
name = "bridge-utils-1.2";
src = args.fetchurl {
url = http://mirror/sourceforge/bridge/bridge-utils-1.2.tar.gz;
sha256 = "0jg3z51c2c34byg4zi39j9g4b66js5kanjhid77hpa0jdfmryfy9";
};
buildInputs =(with args; [autoconf automake]);
preConfigure="autoreconf";
meta = {
description = "http://sourceforge.net/projects/bridge/";
homepage = [ "http://www.linux-foundation.org/en/Net:Bridge/" "http://sourceforge.net/projects/bridge/" ];
license = "GPL";
};
}

84
pkgs/os-specific/linux/kernel/linux-2.6.21_ck.nix Normal file
View File

@ -0,0 +1,84 @@
{ stdenv, fetchurl, perl, mktemp, module_init_tools
# A list of patches to apply to the kernel. Each element of this list
# should be an attribute set {name, patch} where `name' is a
# symbolic name and `patch' is the actual patch. The patch may
# optionally be compressed with gzip or bzip2.
, kernelPatches ? []
, # Whether to build a User-Mode Linux kernel.
userModeLinux ? false
, # Allows you to set your own kernel version suffix (e.g.,
# "-my-kernel").
localVersion ? ""
, # Your own kernel configuration file, if you don't want to use the
# default.
kernelConfig ? null
, # A list of additional statements to be appended to the
# configuration file.
extraConfig ? []
}:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
let
lib = import ../../../lib;
version = "2.6.21";
in
stdenv.mkDerivation {
name = if userModeLinux then "user-mode-linux-${version}" else "linux-${version}";
builder = ./builder.sh;
src = fetchurl {
url = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2";
sha256 = "f187b12d70e0a48ce81f0472dfe9504fb5f0f966be339ac9d57dd2b991a74942";
};
patches = map (p: p.patch) kernelPatches;
extraConfig =
let addNewlines = map (s: "\n" + s + "\n");
configFromPatches =
map (p: if p ? extraConfig then p.extraConfig else "") kernelPatches;
in lib.concatStrings (addNewlines (configFromPatches ++ extraConfig));
config =
if kernelConfig != null then kernelConfig else
if userModeLinux then ./config-2.6.21-uml else
if stdenv.system == "i686-linux" then ./config-2.6.21-i686-smp else
if stdenv.system == "x86_64-linux" then ./config-2.6.21-x86_64-smp else
abort "No kernel configuration for your platform!";
buildInputs = [perl mktemp];
arch =
if userModeLinux then "um" else
if stdenv.system == "i686-linux" then "i386" else
if stdenv.system == "x86_64-linux" then "x86_64" else
abort "Platform ${stdenv.system} is not supported.";
makeFlags = if userModeLinux then "ARCH=um SHELL=bash" else "";
inherit module_init_tools;
allowLocalVersion = false; # don't allow patches to set a suffix
inherit localVersion; # but do allow the user to set one.
meta = {
description =
(if userModeLinux then
"User-Mode Linux"
else
"The Linux kernel") +
(if kernelPatches == [] then "" else
" (with patches: "
+ lib.concatStrings (lib.intersperse ", " (map (x: x.name) kernelPatches))
+ ")");
};
}

5040
pkgs/os-specific/linux/kernel/patch-2.6.21-ck1 Normal file
View File

File diff suppressed because it is too large Load Diff

5167
pkgs/os-specific/linux/kernel/patch-2.6.22-ck1 Normal file
View File

File diff suppressed because it is too large Load Diff

4
pkgs/tools/package-management/nix/unstable.nix
View File

@ -3,14 +3,14 @@
, stateDir ? "/nix/var"
}:
let version = "0.11pre9692"; in
let version = "0.11pre9718"; in
stdenv.mkDerivation {
name = "nix-${version}";
src = fetchurl {
url = "http://nix.cs.uu.nl/dist/nix/nix-${version}/nix-${version}.tar.bz2";
md5 = "35c0bc68b81d20c7fb925bcf8faf4827";
md5 = "cae130dcc51a30eff34fc194e17891f2";
};
buildInputs = [perl curl openssl];

70
pkgs/top-level/all-packages.nix
View File

@ -154,6 +154,13 @@ rec {
version = getConfig [ "environment" "versions" name ];
};
# The same, another syntax.
# Warning: syntax for configuration.nix changed too
useVersion = name: f: f
{
version = getConfig [ "environment" "versions" name ];
};
# Whether user enabled given feature for the given package?
getFlag = flag: package: default:
getConfig [ "environment" "flags" package flag ]
@ -2803,6 +2810,10 @@ rec {
inherit fetchurl stdenv;
};
bridge_utils = import ../os-specific/linux/bridge_utils {
inherit fetchurl stdenv autoconf automake;
};
alsaUtils = import ../os-specific/linux/alsa/utils {
inherit fetchurl stdenv alsaLib ncurses gettext;
};
@ -3011,14 +3022,16 @@ rec {
kernel_2_6_22 = import ../os-specific/linux/kernel/linux-2.6.22.nix {
inherit fetchurl stdenv perl mktemp module_init_tools;
kernelPatches = [
/*{ name = "ext3cow";
patch = ../os-specific/linux/kernel/linux-2.6.20.3-ext3cow.patch;
/*
{ name = "ext3cow";
patch = ../os-specific/linux/kernel/linux-2.6.21.7-ext3cow_wouter.patch;
extraConfig =
"CONFIG_EXT3COW_FS=m\n" +
"CONFIG_EXT3COW_FS_XATTR=y\n" +
"CONFIG_EXT3COW_FS_POSIX_ACL=y\n" +
"CONFIG_EXT3COW_FS_SECURITY=y\n";
}*/
}
*/
{ name = "paravirt-nvidia";
patch = ../os-specific/linux/kernel/2.6.22-paravirt-nvidia.patch;
}
@ -3049,12 +3062,63 @@ rec {
[(getConfig ["kernel" "addConfig"] "")];
};
kernel_2_6_21_ck = import ../os-specific/linux/kernel/linux-2.6.21_ck.nix {
inherit fetchurl stdenv perl mktemp module_init_tools;
kernelPatches = [
{ name = "ext3cow";
patch = ../os-specific/linux/kernel/linux-2.6.21.7-ext3cow_wouter.patch;
extraConfig =
"CONFIG_EXT3COW_FS=m\n" +
"CONFIG_EXT3COW_FS_XATTR=y\n" +
"CONFIG_EXT3COW_FS_POSIX_ACL=y\n" +
"CONFIG_EXT3COW_FS_SECURITY=y\n";
}
{ name = "Con Kolivas Patch";
patch = ../os-specific/linux/kernel/patch-2.6.21-ck1;
}
{ name = "paravirt-nvidia";
patch = ../os-specific/linux/kernel/2.6.20-paravirt-nvidia.patch;
}
{ name = "skas-2.6.20-v9-pre9";
patch = fetchurl {
url = http://www.user-mode-linux.org/~blaisorblade/patches/skas3-2.6/skas-2.6.20-v9-pre9/skas-2.6.20-v9-pre9.patch.bz2;
md5 = "02e619e5b3aaf0f9768f03ac42753e74";
};
extraConfig =
"CONFIG_PROC_MM=y\n" +
"# CONFIG_PROC_MM_DUMPABLE is not set\n";
}
{ name = "fbsplash-0.9.2-r5-2.6.21";
patch = fetchurl {
url = http://dev.gentoo.org/~dsd/genpatches/trunk/2.6.21/4200_fbsplash-0.9.2-r5.patch;
sha256 = "00s8074fzsly2zpir885zqkvq267qyzg6vhsn7n1z2v1z78avxd8";
};
extraConfig = "CONFIG_FB_SPLASH=y";
}
];
};
kernel_2_6_23 = import ../os-specific/linux/kernel/linux-2.6.23.nix {
inherit fetchurl stdenv perl mktemp module_init_tools;
kernelPatches = [
{ name = "paravirt-nvidia";
patch = ../os-specific/linux/kernel/2.6.22-paravirt-nvidia.patch;
}
{ # resume with resume=swap:/dev/xx
name = "tux on ice"; # (swsusp2)
patch = fetchurl {
url = "http://www.tuxonice.net/downloads/all/tuxonice-3.0-rc2-for-2.6.23.1.patch.bz2";
sha256 = "ef86267b6f3d7e309221f5173a881afae1dfa57418be5b3963f2380b0633ca1a";
};
extraConfig = "
CONFIG_SUSPEND2=y
CONFIG_SUSPEND2_FILE=y
CONFIG_SUSPEND2_SWAP=y
CONFIG_CRYPTO_LZF=y
";
}
{ name = "fbsplash-0.9.2-r5-2.6.21";
patch = fetchurl {
url = http://dev.gentoo.org/~dsd/genpatches/trunk/2.6.22/4200_fbsplash-0.9.2-r5.patch;