public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Sync with the trunk.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19786
This commit is contained in:
Eelco Dolstra
2010-02-03 14:23:43 +00:00
parent 0662fcbd23 b5088abe20
commit a617a7c239
60 changed files with 1522 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/fuse/default.nix
View File

@@ -1,13 +1,13 @@
{ stdenv, fetchurl, utillinux }:
stdenv.mkDerivation rec {
name = "fuse-2.8.1";
name = "fuse-2.8.2";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://sourceforge/fuse/${name}.tar.gz";
sha256 = "1brfgm2yxy060i6kcdlg30g2d48r6v9nhyxbfscpr6ijrrb10zq0";
sha256 = "05sfrw4qzhsysdf1qvd89lvin36ry6rvakmm4zjhf3g1f28rwdr6";
};
configureFlags = "--disable-kernel-module";

4
pkgs/os-specific/linux/kernel/linux-2.6.27.nix
View File

@@ -3,11 +3,11 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "", ... }:
import ./generic.nix (
rec {
version = "2.6.27.43";
version = "2.6.27.45";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
sha256 = "0y2fpc6maazzg75ixrzc7h0v0k48jaflbjjcsh6c69f0mq3l8zay";
sha256 = "0hv4pa83ff8kihvjwhxkx01yf5dfrvk9xkn1bzhr9m0rv3s8d6sy";
};
features.iwlwifi = true;

4
pkgs/os-specific/linux/kernel/linux-2.6.32.nix
View File

@@ -4,11 +4,11 @@ args @ { stdenv, fetchurl, platform, userModeLinux ? false, extraConfig ? ""
import ./generic.nix (
rec {
version = "2.6.32.3";
version = "2.6.32.7";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
sha256 = "09zg9xk67vjpfrrb3m4rzql4nd7bz64i9sng5sbdpfgs7d4pi1cp";
sha256 = "0s6xl3x4gwwibdfb68f6aybssp1rl2inx68a3padrb1l49k6lq44";
};
features.iwlwifi = true;

10
pkgs/os-specific/linux/qemu-kvm/default.nix
View File

@@ -1,18 +1,18 @@
{stdenv, fetchurl, zlib, SDL, alsaLib, pkgconfig, pciutils}:
{ stdenv, fetchurl, zlib, SDL, alsaLib, pkgconfig, pciutils, libuuid }:
assert stdenv.isLinux;
stdenv.mkDerivation rec {
name = "qemu-kvm-0.12.1.2";
name = "qemu-kvm-0.12.2";
src = fetchurl {
url = "mirror://sourceforge/kvm/${name}.tar.gz";
sha256 = "1k5xx9rn0n311bgvl6g9c8h1bxj2nhjpjpzbngy0sf9hdjidnba7";
sha256 = "0nmg9dp3h040dkxq5vv4i7ip76v98rnhzqwy4pd88zznawc2k9l2";
};
patches = [ ./unix-domain.patch ];
patches = [ ./unix-domain.patch ./smb-tmpdir.patch ];
buildInputs = [zlib SDL alsaLib pkgconfig pciutils];
buildInputs = [ zlib SDL alsaLib pkgconfig pciutils libuuid ];
preBuild =
''

33
pkgs/os-specific/linux/qemu-kvm/smb-tmpdir.patch Normal file
View File

@@ -0,0 +1,33 @@
Honour $TMPDIR for the qemu-smb temporary directory.
diff -rc -x '*~' qemu-kvm-0.12.2-orig/net/slirp.c qemu-kvm-0.12.2/net/slirp.c
*** qemu-kvm-0.12.2-orig/net/slirp.c 2010-02-01 19:05:24.000000000 +0100
--- qemu-kvm-0.12.2/net/slirp.c 2010-02-01 19:05:54.000000000 +0100
***************
*** 476,486 ****
struct in_addr vserver_addr)
{
static int instance;
! char smb_conf[128];
! char smb_cmdline[128];
FILE *f;
! snprintf(s->smb_dir, sizeof(s->smb_dir), "/tmp/qemu-smb.%ld-%d",
(long)getpid(), instance++);
if (mkdir(s->smb_dir, 0700) < 0) {
qemu_error("could not create samba server dir '%s'\n", s->smb_dir);
--- 476,489 ----
struct in_addr vserver_addr)
{
static int instance;
! char smb_conf[1024];
! char smb_cmdline[1024];
FILE *f;
! char *tmpdir = getenv("TMPDIR");
!
! snprintf(s->smb_dir, sizeof(s->smb_dir), "%s/qemu-smb.%ld-%d",
! tmpdir ? tmpdir : "/tmp",
(long)getpid(), instance++);
if (mkdir(s->smb_dir, 0700) < 0) {
qemu_error("could not create samba server dir '%s'\n", s->smb_dir);