diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-02-10 20:13:39 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-02-10 20:13:39 +0000 |
| commit | 393251bf8fa98292cecd05785a8c815fa762b3ea (patch) | |
| tree | ab59dcf3808e5a222c2501b51b636d876844e5d0 /nixpkgs/pkgs/os-specific | |
| parent | 0e118743ce5edf9174a320050a7c0eea2199aaaa (diff) | |
| parent | 929cc78363e6878e044556bd291382eab37bcbed (diff) | |
| download | nixlib-393251bf8fa98292cecd05785a8c815fa762b3ea.tar nixlib-393251bf8fa98292cecd05785a8c815fa762b3ea.tar.gz nixlib-393251bf8fa98292cecd05785a8c815fa762b3ea.tar.bz2 nixlib-393251bf8fa98292cecd05785a8c815fa762b3ea.tar.lz nixlib-393251bf8fa98292cecd05785a8c815fa762b3ea.tar.xz nixlib-393251bf8fa98292cecd05785a8c815fa762b3ea.tar.zst nixlib-393251bf8fa98292cecd05785a8c815fa762b3ea.zip | |
Merge commit '929cc78363e6878e044556bd291382eab37bcbed'
Diffstat (limited to 'nixpkgs/pkgs/os-specific')
| -rw-r--r-- | nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 | ||||
| -rw-r--r-- | nixpkgs/pkgs/os-specific/linux/lxc/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix index 9095a63355b5..8edd744ba66c 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.173"; + version = "4.4.174"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0wj2y6y2ac5m6p6ghb4rmxfdxyx0gq7yv7b0qzmdyh4dkpi7qa0f"; + sha256 = "0fdsxfwhn1xqic56c4aafxw1rdqy7s4w0inmkhcnh98lj3fi2lmy"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/lxc/default.nix b/nixpkgs/pkgs/os-specific/linux/lxc/default.nix index 9aae9c6013a9..a8668313465a 100644 --- a/nixpkgs/pkgs/os-specific/linux/lxc/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/lxc/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "lxc-${version}"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "0hcql4srcs2dlf2f67i8v92y2i352zv7nr9hsgs3pih2rhrbh332"; + sha256 = "1igxqgx8q9cp15mcp1y8j564bl85ijw04jcmgb1s5bmfbg1751sd"; }; nativeBuildInputs = [ |