diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-08-27 12:01:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-27 12:01:46 +0000 |
| commit | 6e4706d62aa401dbe5e137100e0ef8710a59ff6c (patch) | |
| tree | 648225eba8845793708e722b53e15e993344e3e6 /pkgs/os-specific | |
| parent | 66a7270d23bcdf5508a001671f751929a5c40a68 (diff) | |
| parent | aced2eb8300296c810dc60507df539e95726b297 (diff) | |
| download | nixpkgs-6e4706d62aa401dbe5e137100e0ef8710a59ff6c.tar nixpkgs-6e4706d62aa401dbe5e137100e0ef8710a59ff6c.tar.gz nixpkgs-6e4706d62aa401dbe5e137100e0ef8710a59ff6c.tar.bz2 nixpkgs-6e4706d62aa401dbe5e137100e0ef8710a59ff6c.tar.lz nixpkgs-6e4706d62aa401dbe5e137100e0ef8710a59ff6c.tar.xz nixpkgs-6e4706d62aa401dbe5e137100e0ef8710a59ff6c.tar.zst nixpkgs-6e4706d62aa401dbe5e137100e0ef8710a59ff6c.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-zen.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/raspberrypi-eeprom/default.nix | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index f35b5ad8e42..7750b776575 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -2,7 +2,7 @@ let # having the full version string here makes it easier to update - modDirVersion = "5.13.12-zen1"; + modDirVersion = "5.13.13-zen1"; parts = lib.splitString "-" modDirVersion; version = lib.elemAt parts 0; suffix = lib.elemAt parts 1; @@ -19,7 +19,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${modDirVersion}"; - sha256 = "sha256-UHcQZlQ164oVMVK/Fqggoi+aTDFrLv9Tngsy/q74+Bc="; + sha256 = "sha256-aTTbhXy0wsDDCSbX1k27l9g3FliqwE6TbRq2zkI3mnw="; }; structuredExtraConfig = with lib.kernel; { diff --git a/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix b/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix index fd0da72aa92..32378e451e8 100644 --- a/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix +++ b/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix @@ -28,6 +28,7 @@ stdenvNoCC.mkDerivation rec { cp rpi-eeprom-config rpi-eeprom-update $out/bin cp -r firmware/{beta,critical,old,stable} $out/share/rpi-eeprom + cp -P firmware/default firmware/latest $out/share/rpi-eeprom ''; fixupPhase = '' |