diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-04-22 12:06:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-22 12:06:27 +0000 |
| commit | 1eabfe54137d870456cb16f4cea61e025cc9694b (patch) | |
| tree | 20d75e509bdbba61ed73b79ec7782fdc63e83b1f /pkgs/os-specific | |
| parent | 0502d52b5b13ea85e26fe926acb81ac53d113ebd (diff) | |
| parent | 120744d6208e4e259fdaee8aa4e80f253146dc7d (diff) | |
| download | nixpkgs-1eabfe54137d870456cb16f4cea61e025cc9694b.tar nixpkgs-1eabfe54137d870456cb16f4cea61e025cc9694b.tar.gz nixpkgs-1eabfe54137d870456cb16f4cea61e025cc9694b.tar.bz2 nixpkgs-1eabfe54137d870456cb16f4cea61e025cc9694b.tar.lz nixpkgs-1eabfe54137d870456cb16f4cea61e025cc9694b.tar.xz nixpkgs-1eabfe54137d870456cb16f4cea61e025cc9694b.tar.zst nixpkgs-1eabfe54137d870456cb16f4cea61e025cc9694b.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/firmware/raspberrypi/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-xanmod.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 7e0c48a439d..6a826f63966 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -25,6 +25,6 @@ stdenvNoCC.mkDerivation rec { description = "Firmware for the Raspberry Pi board"; homepage = "https://github.com/raspberrypi/firmware"; license = licenses.unfreeRedistributableFirmware; # See https://github.com/raspberrypi/firmware/blob/master/boot/LICENCE.broadcom - maintainers = with maintainers; [ dezgeg tavyc ]; + maintainers = with maintainers; [ dezgeg ]; }; } diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index e3f0ebf76f5..95f736d9418 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.11.15"; + version = "5.11.16"; suffix = "xanmod1-cacule"; in buildLinux (args // rec { @@ -12,7 +12,7 @@ in owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-Qhq01SgLeNbts86DLi/t70HJfJPmM1So1C4eqVyRLK0="; + sha256 = "sha256-sK2DGJsmKP/gvPyT8HWjPa21OOXydMhGjJzrOkPo71Q="; extraPostFetch = '' rm $out/.config ''; |