diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-06 10:38:20 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-06 10:38:20 +0100 |
| commit | 17ab5f9d88b3b4e8442421bc4bf4eb1e913bcc6a (patch) | |
| tree | f140d6d2cd9ecd708dc82303f3f5b279d0a368b4 /pkgs/os-specific | |
| parent | 828f93a32665c9c72f7bf441878a91a11213fdf3 (diff) | |
| parent | 30121dffd40d50c6d4234cdeb9e3b057f848b2b6 (diff) | |
| download | nixpkgs-17ab5f9d88b3b4e8442421bc4bf4eb1e913bcc6a.tar nixpkgs-17ab5f9d88b3b4e8442421bc4bf4eb1e913bcc6a.tar.gz nixpkgs-17ab5f9d88b3b4e8442421bc4bf4eb1e913bcc6a.tar.bz2 nixpkgs-17ab5f9d88b3b4e8442421bc4bf4eb1e913bcc6a.tar.lz nixpkgs-17ab5f9d88b3b4e8442421bc4bf4eb1e913bcc6a.tar.xz nixpkgs-17ab5f9d88b3b4e8442421bc4bf4eb1e913bcc6a.tar.zst nixpkgs-17ab5f9d88b3b4e8442421bc4bf4eb1e913bcc6a.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-libre.nix | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index b43da123e24..0256476218a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.92"; + version = "4.19.93"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "18l3k0hgyanh6axgmmaaff139vpw6lf3fcf9iglpqwgspgw7rhr9"; + sha256 = "0d2qgwnmvnwbsijc8k85sgmywyrv55wpah6qwjk6kgx8h8zx5x9a"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 0eb57180644..89cbf776ac0 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.7"; + version = "5.4.8"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1jgwg5qb7lb30m5ywvpfagzrl6d0i524qpy3v99mina6j4fv5jdb"; + sha256 = "0llss8hbzkwqxx92y419vj2jvq0d8k52iivh3f59wgqr0b4i9i22"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 22fe4eae52e..cb6768a348b 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "17163"; + rev = "17165"; sha256 = "0hyd7wp73w4555d42xcvk4x4nxrfckbzah2ckb4d2aqzxab87789"; } , ... |