diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-02-04 22:00:07 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-02-04 22:00:07 +0100 |
| commit | 4495d06a7fde26f15ed256f08a24115a013637ea (patch) | |
| tree | 15732b2661ddc8c258110a52f259fdf4c3537c0d /pkgs/os-specific/linux/kernel/linux-3.4.nix | |
| parent | 31810da31c98d6e634e2b5cb8eece3e3a67ce0cc (diff) | |
| parent | 643772777369229da75157e9192e3dd7bd2805fb (diff) | |
| download | nixlib-4495d06a7fde26f15ed256f08a24115a013637ea.tar nixlib-4495d06a7fde26f15ed256f08a24115a013637ea.tar.gz nixlib-4495d06a7fde26f15ed256f08a24115a013637ea.tar.bz2 nixlib-4495d06a7fde26f15ed256f08a24115a013637ea.tar.lz nixlib-4495d06a7fde26f15ed256f08a24115a013637ea.tar.xz nixlib-4495d06a7fde26f15ed256f08a24115a013637ea.tar.zst nixlib-4495d06a7fde26f15ed256f08a24115a013637ea.zip | |
Merge branch 'master' into staging
Conflicts (simple): pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/top-level/all-packages.nix
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 d4da722f6c2b..2d0530237210 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.105"; + version = "3.4.106"; extraMeta.branch = "3.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0xhwdkpcmvbvk1rq0mz2f2pmh322flly7wr66wdd5bypfvanrk23"; + sha256 = "1l1k2kmlz0j12ly63w3mhvdzp5fpc22ajda4kw66fyjx96npm8sc"; }; kernelPatches = args.kernelPatches ++ |