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

Merge remote-tracking branch 'origin/master' into systemd

Browse Source
This commit is contained in:
Eelco Dolstra
2013-01-19 00:05:50 +01:00
parent cd5755845f 23853fa81b
commit 9da086c08d
74 changed files with 2796 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/ati-drivers/default.nix
+4 -4
View File
@@ -45,9 +45,9 @@ stdenv.mkDerivation rec {
patchelf
unzip
];
inherit kernel glibc /* glibc only used for setting interpreter */;
LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":"
[ "${xorg.libXrandr}/lib"
"${xorg.libXrender}/lib"
@@ -58,11 +58,11 @@ stdenv.mkDerivation rec {
inherit mesa; # only required to build examples
meta = {
description = "ati drivers";
description = "ATI drivers";
homepage = http://support.amd.com/us/gpudownload/Pages/index.aspx;
license = "unfree";
maintainers = [stdenv.lib.maintainers.marcweber];
platforms = [ "x86_64-linux" ];
#platforms = [ "x86_64-linux" ];
};
# moved assertions here because the name is evaluated when the NixOS manual is generated
pkgs/os-specific/linux/aufs/3.nix
+1
View File
@@ -33,6 +33,7 @@ stdenv.mkDerivation {
'';
passthru = { inherit patch; };
meta = {
description = "Another Unionfs implementation for Linux (third generation)";
homepage = http://aufs.sourceforge.net/;
pkgs/os-specific/linux/cpufrequtils/default.nix
+1 -1
View File
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
name = "cpufrequtils-008";
src = fetchurl {
url = "mirror://kernel/linux/utils/kernel/cpufreq/cpufrequtils-008.tar.gz";
url = http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-008.tar.gz;
md5 = "52d3e09e47ffef634833f7fab168eccf";
};
pkgs/os-specific/linux/kernel/linux-3.0.nix
+2 -2
View File
@@ -230,7 +230,7 @@ in
import ./generic.nix (
rec {
version = "3.0.58";
version = "3.0.59";
preConfigure = ''
substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
@@ -238,7 +238,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "10ahi60ass970vjlhnzcf0y5fk3g7ck1a1lnwzy0kkywp6nb2c10";
sha256 = "0w0l0vsky921j6wvhydl8ggzwkwkhr0lk2lkd7lshhmv9c6bdg86";
};
config = configWithPlatform stdenv.platform;
pkgs/os-specific/linux/kernel/linux-3.2.nix
+2 -2
View File
@@ -237,7 +237,7 @@ in
import ./generic.nix (
rec {
version = "3.2.36";
version = "3.2.37";
testing = false;
modDirVersion = version;
@@ -248,7 +248,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "0jyla0mjh1jjk84jywyvd7n6ax27xarkllfjf991rqj32zinlnzn";
sha256 = "1h8lx0gvb1q962lghjpixa6q89k4yrgvpiw8hplb3w2jicqs4948";
};
config = configWithPlatform stdenv.platform;
pkgs/os-specific/linux/kernel/linux-3.4.nix
+2 -2
View File
@@ -239,7 +239,7 @@ in
import ./generic.nix (
rec {
version = "3.4.25";
version = "3.4.26";
testing = false;
preConfigure = ''
@@ -248,7 +248,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "0jlnrjxyyfw2f87mr9y8c4337yfbnrj5jp3vhm33dwy7i3vdpfs6";
sha256 = "1zmv1g90fgqrabc0qb5ip551mh12ps1zin3hbygysc89j684rbk1";
};
config = configWithPlatform stdenv.platform;
pkgs/os-specific/linux/kernel/linux-3.7.nix
+2 -2
View File
@@ -245,7 +245,7 @@ in
import ./generic.nix (
rec {
version = "3.7.2";
version = "3.7.3";
testing = false;
preConfigure = ''
@@ -254,7 +254,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "09s1z2z15xnnqm2syr76l7s3s14zzsalifnnfmry52ibizllzh04";
sha256 = "05421g78kx01ia0pq3d3y3gkrzqb5grfhhy7vy1ixlq8a23kc6b7";
};
config = configWithPlatform stdenv.platform;
pkgs/os-specific/linux/module-init-tools/default.nix
+1 -1
View File
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
src = [
(fetchurl {
url = mirror://kernel/linux/utils/kernel/module-init-tools/module-init-tools-3.16.tar.bz2;
url = http://ftp.be.debian.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-3.16.tar.bz2;
sha256 = "0jxnz9ahfic79rp93l5wxcbgh4pkv85mwnjlbv1gz3jawv5cvwp1";
})
pkgs/os-specific/linux/pam/default.nix
+1 -1
View File
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "linux-pam-1.1.1";
src = fetchurl {
url = mirror://kernel/linux/libs/pam/library/Linux-PAM-1.1.1.tar.bz2;
url = http://www.linux-pam.org/library/Linux-PAM-1.1.1.tar.bz2;
sha256 = "015r3xdkjpqwcv4lvxavq0nybdpxhfjycqpzbx8agqd5sywkx3b0";
};
pkgs/os-specific/linux/powertop/default.nix
+1
View File
@@ -2,6 +2,7 @@
stdenv.mkDerivation rec {
name = "powertop-2.1";
src = fetchurl {
url = "https://01.org/powertop/sites/default/files/downloads/${name}.tar.gz";
sha256 = "16161nlah4i4hq8vyx7ds1vq7icdzwm7gmyjg0xhcrs1r9n83m1x";
pkgs/os-specific/linux/spl/default.nix
+1 -1
View File
@@ -3,7 +3,7 @@
stdenv.mkDerivation {
name = "spl-0.6.0-rc13-${kernel.version}";
src = fetchurl {
url = http://zfsonlinux.org/downloads/0.6.0-rc13/spl-0.6.0-rc13.tar.gz;
url = http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.0-rc13.tar.gz;
sha256 = "1frbifj1yd7pznlhsqsiksip5amx4ljvasg8h80haaxk0yvvkr9b";
};
pkgs/os-specific/linux/v86d/default.nix
+3 -2
View File
@@ -1,10 +1,11 @@
{stdenv, fetchurl, klibc, kernel, withKlibc ? true}:
stdenv.mkDerivation rec {
name = "v86d-0.1.10-${kernel.version}";
name = "v86d-${version}-${kernel.version}";
version = "0.1.10";
src = fetchurl {
url = "http://dev.gentoo.org/~spock/projects/uvesafb/archive/${name}.tar.bz2";
url = "mirror://gentoo/distfiles//v86d-${version}.tar.bz2";
sha256 = "0p3kwqjis941pns9948dxfnjnl5lwd8f2b6x794whs7g32p68jb3";
};
pkgs/os-specific/linux/zfs/default.nix
+1 -1
View File
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
name = "zfs-0.6.0-rc13-${kernel.version}";
src = fetchurl {
url = http://zfsonlinux.org/downloads/0.6.0-rc13/zfs-0.6.0-rc13.tar.gz;
url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.0-rc13.tar.gz;
sha256 = "1kpx7sa49ir93kmlrjwjzd6v4kzmda4j9cf6bv2p4s3yrmiz3cjv";
};