diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-17 14:19:14 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-17 14:19:14 +0100 |
| commit | 5bb548d2e4c866ce55efdd2e1cee5e9e72863156 (patch) | |
| tree | 9276447eeac077bcea3e6013ebb37f7bba642be8 /pkgs/os-specific/linux/kernel | |
| parent | b4dd943f1635a7e8d2e440b703fa01c6c2126164 (diff) | |
| parent | 3544f3223166583f1e5459822250f1821b258c1e (diff) | |
| download | nixlib-5bb548d2e4c866ce55efdd2e1cee5e9e72863156.tar nixlib-5bb548d2e4c866ce55efdd2e1cee5e9e72863156.tar.gz nixlib-5bb548d2e4c866ce55efdd2e1cee5e9e72863156.tar.bz2 nixlib-5bb548d2e4c866ce55efdd2e1cee5e9e72863156.tar.lz nixlib-5bb548d2e4c866ce55efdd2e1cee5e9e72863156.tar.xz nixlib-5bb548d2e4c866ce55efdd2e1cee5e9e72863156.tar.zst nixlib-5bb548d2e4c866ce55efdd2e1cee5e9e72863156.zip | |
Merge remote-tracking branch 'origin/master' into stdenv-updates
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.0.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.7.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index 4ac4a4b263b5..97b3a6bfd0dc 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -230,7 +230,7 @@ in import ./generic.nix ( rec { - version = "3.0.57"; + version = "3.0.58"; 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 = "12rf48ymwsgr133d6cydsajjxb3zihrcrfhpdv185x07dbri9nbl"; + sha256 = "10ahi60ass970vjlhnzcf0y5fk3g7ck1a1lnwzy0kkywp6nb2c10"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index a03e39508912..eef4847e5b2e 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -239,7 +239,7 @@ in import ./generic.nix ( rec { - version = "3.4.24"; + version = "3.4.25"; 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 = "1vxyb68ckzgm88jj7xzmwr2hmj5vdry5irvfr89klgqr95mmhkd1"; + sha256 = "0jlnrjxyyfw2f87mr9y8c4337yfbnrj5jp3vhm33dwy7i3vdpfs6"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.7.nix b/pkgs/os-specific/linux/kernel/linux-3.7.nix index 1a02910b5c80..4a092fe6b3a7 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.7.nix @@ -245,7 +245,7 @@ in import ./generic.nix ( rec { - version = "3.7.1"; + version = "3.7.2"; 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 = "0mbjvrr0658gg052hbf32vfcmlzfsr777wgmaxrpkpzbfs1qpjp1"; + sha256 = "09s1z2z15xnnqm2syr76l7s3s14zzsalifnnfmry52ibizllzh04"; }; config = configWithPlatform stdenv.platform; |