diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-12 12:00:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-12 12:00:55 +0000 |
| commit | 1b3033ebfb1e92c3166b75c7f820d066f3dd3665 (patch) | |
| tree | 77dac8b89ea940a62046ea26db0bdaa3a14faad7 /pkgs/os-specific/linux | |
| parent | 85abdfd32e1c46e46c47853297820de456628296 (diff) | |
| parent | 2709b7a1c6693cff8d5e44ccaf3f17385ed26d10 (diff) | |
| download | nixpkgs-1b3033ebfb1e92c3166b75c7f820d066f3dd3665.tar nixpkgs-1b3033ebfb1e92c3166b75c7f820d066f3dd3665.tar.gz nixpkgs-1b3033ebfb1e92c3166b75c7f820d066f3dd3665.tar.bz2 nixpkgs-1b3033ebfb1e92c3166b75c7f820d066f3dd3665.tar.lz nixpkgs-1b3033ebfb1e92c3166b75c7f820d066f3dd3665.tar.xz nixpkgs-1b3033ebfb1e92c3166b75c7f820d066f3dd3665.tar.zst nixpkgs-1b3033ebfb1e92c3166b75c7f820d066f3dd3665.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/kernels-org.json | 8 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-libre.nix | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 49b2fddba1d..c16aa954e64 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -12,12 +12,12 @@ "hash": "sha256:1v453q4sf0j8708ivs1zmdf645hgimqvxfc8xz7czgnnmipn3zdr" }, "5.15": { - "version": "5.15.137", - "hash": "sha256:1xxjbxldrhmnh2q6rykpxyfbj8xqgl82q30n8sfavrzr14bb4jcp" + "version": "5.15.138", + "hash": "sha256:1ajaxy97gx0c9cdxiyxa49ykfsykir22i9abfrcizh71ci0yb15g" }, "5.10": { - "version": "5.10.199", - "hash": "sha256:1h944syk7n6c4j1djlx19n77alzwbxcdza77c9ykicgfynhpgsm0" + "version": "5.10.200", + "hash": "sha256:012i41bj8rcqn0vhfxrwq3gg82nb6pp2cwq8n146wj47pwgrcbcx" }, "5.4": { "version": "5.4.260", diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index e9af8a2be35..9cf5f46cfb8 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19438"; - sha256 = "14bdnxw23d0pl53b1rn7g69wn9a7hr6c0q8zd5p6j2aap0i7c4a4"; + rev = "19441"; + sha256 = "1z0x8cw9nr7qf5qh3xjf6rg20q0i79bg71lik847sabyb6vcrk0z"; } , ... }: |