diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-04-26 22:52:08 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-04-26 22:52:08 +0200 |
| commit | 30f31c9afcc34336d1d47c62ad4ed39d2dee402a (patch) | |
| tree | e3549d198c833f11e5f6062e10a3fefb9d25a670 /pkgs/os-specific/linux/kernel/linux-3.4.nix | |
| parent | c1cc2348e4d49ab742e964593a7f74cc53c7f9b7 (diff) | |
| parent | 2cb3dc68120701406ac48d7a4da5ff097b092f85 (diff) | |
| download | nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.gz nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.bz2 nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.lz nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.xz nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.zst nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.zip | |
Merge 'master' into staging
(relatively simple conflicts)
Diffstat (limited to 'pkgs/os-specific/linux/kernel/linux-3.4.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 2d053023721..eaf5bfad6d8 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.4.106"; + version = "3.4.107"; extraMeta.branch = "3.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1l1k2kmlz0j12ly63w3mhvdzp5fpc22ajda4kw66fyjx96npm8sc"; + sha256 = "1y3mxisdcnz3kj416bpnnn9cn3wqqjqvcjadhylc1wypqkpcvphq"; }; kernelPatches = args.kernelPatches ++ |