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

Merge branch 'master' into x-updates

Browse Source
This commit is contained in:
Vladimír Čunát
2013-08-28 10:37:41 +02:00
parent f0c59e322d ce57c3e917
commit 2fda1165da
103 changed files with 1971 additions and 889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@
let
baseName = "bbswitch";
version = "0.6";
version = "0.7";
name = "${baseName}-${version}-${kernelDev.version}";
in
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://github.com/Bumblebee-Project/${baseName}/archive/v${version}.tar.gz";
sha256 = "1y1wggfrlpxybz5cvrbvvpqa2hh6ncazzdlg9c94sx40n6p5dcf4";
sha256 = "0na6gfnvmp5fjbm430ms342hmrsbr6cf78n6hldqb8js2ry3f8dw";
};
preBuild = ''

12
pkgs/os-specific/linux/firmware/raspberrypi/default.nix
View File

@@ -1,11 +1,15 @@
{stdenv, fetchurl }:
stdenv.mkDerivation {
name = "raspberrypi-firmware-20160106";
let
rev = "3ab17ac25e";
in stdenv.mkDerivation {
name = "raspberrypi-firmware-${rev}";
src = fetchurl {
url = "https://github.com/raspberrypi/firmware/archive/4ade27942e.tar.gz";
sha256 = "0f4p920vr7dcj4hprgil8baqqbnsjx1jykz0pkdx29mqy0n0xanl";
url = "https://github.com/raspberrypi/firmware/archive/${rev}.tar.gz";
sha256 = "080va4zz858bwwgxam8zy58gpwjpxfg7v5h1q5b4cpbzjihsxcx9";
};
installPhase = ''

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

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "3.4.58";
version = "3.4.59";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "11kcxlchiz7ks61yqj29dy2mnncfxcc7qr563wby1k58rvwf8g74";
sha256 = "19ylh9k9qykr8x29jcqv1q6agmyvzx7q5md2yxph4sykjsccqzj7";
};
features.iwlwifi = true;

8
pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix
View File

@@ -1,14 +1,16 @@
{ stdenv, fetchurl, ... } @ args:
let rev = "91a3be5b2b"; in
let
import ./generic.nix (args // rec {
rev = "7849605f5a";
in import ./generic.nix (args // rec {
version = "3.6.y-${rev}";
src = fetchurl {
url = "https://api.github.com/repos/raspberrypi/linux/tarball/${rev}";
name = "linux-raspberrypi-${version}.tar.gz";
sha256 = "04370b1da7610622372940decdc13ddbba2a58c9da3c3bd3e7df930a399f140d";
sha256 = "1diwc5p6az6ipcldwmkq7hb5f15nvdgwzmypixc2vmzmc4ylarxl";
};
features.iwlwifi = true;

13
pkgs/os-specific/linux/nvidia-x11/default.nix
View File

@@ -10,12 +10,7 @@ with stdenv.lib;
let
versionNumber = "319.32";
kernel310patch = fetchurl {
url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/nvidia-linux-3.10.patch?h=packages/nvidia&id=415c1daa9ccb1ec46c172b304f40929239d87af8";
name = "nvidia-linux-3.10.patch";
sha256 = "0nhzg6jdk9sf1vzj519gqi8a2n9xydhz2bcz472pss2cfgbc1ahb";
};
versionNumber = "319.49";
in
@@ -26,18 +21,18 @@ stdenv.mkDerivation {
patches =
[ ./version-test.patch ]
++ optional (!libsOnly && versionAtLeast kernelDev.version "3.10") kernel310patch;
;
src =
if stdenv.system == "i686-linux" then
fetchurl {
url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
sha256 = "02rjiizgb9mgal0qrklzjvfzybv139yv6za8xp045k7qdyqvsqzf";
sha256 = "1ngss9zw109a5xfr3vvhf1ajqjvvqc7j3dzw9h56vddck6kpbc22";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
sha256 = "18268q3pa6v4ygfnlm888jmp84dmg1w9c323cr51pn5jg54vygcm";
sha256 = "1i68jfms8033p2x0r3z4fdjcmkkhbi6yizzc0ck9ydagdgg3liwp";
}
else throw "nvidia-x11 does not support platform ${stdenv.system}";

8
pkgs/os-specific/linux/spl/default.nix
View File

@@ -1,10 +1,10 @@
{ stdenv, fetchurl, kernelDev, perl, autoconf, automake, libtool, coreutils, gawk }:
stdenv.mkDerivation {
name = "spl-0.6.1-${kernelDev.version}";
name = "spl-0.6.2-${kernelDev.version}";
src = fetchurl {
url = "http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.1.tar.gz";
sha256 = "1bnianc00bkpdbcmignzqfv9yr8h6vj56wfl7lkhi9a5m5b3xakb";
url = http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.2.tar.gz;
sha256 = "196scl8q0bkkak6m0p1l1fz254cgsizqm73bf9wk3iynamq7qmrw";
};
patches = [ ./install_prefix.patch ];
@@ -27,6 +27,8 @@ stdenv.mkDerivation {
--with-linux-obj=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build
'';
enableParallelBuilding = true;
meta = {
description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)";

8
pkgs/os-specific/linux/zfs/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, kernelDev, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }:
stdenv.mkDerivation {
name = "zfs-0.6.1-${kernelDev.version}";
name = "zfs-0.6.2-${kernelDev.version}";
src = fetchurl {
url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.1.tar.gz;
sha256 = "1ykph9d4p70mam6lvcx0zld6d34gch15dsilds5ncbxh0m52knl0";
url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.2.tar.gz;
sha256 = "18b5f18k8mwb17r5ippsilmp1a2sqjw9fwn0z82159dkhsadg33b";
};
patches = [ ./mount_zfs_prefix.patch ./nix-build.patch ];
@@ -33,6 +33,8 @@ stdenv.mkDerivation {
--with-spl=${spl}/libexec/spl
'';
enableParallelBuilding = true;
meta = {
description = "ZFS Filesystem Linux Kernel module";
longDescription = ''