diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-02-23 05:12:00 +0100 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-02-23 05:12:00 +0100 |
| commit | 2930699c8c91e2a74c8f14d417c1415df07fc1cf (patch) | |
| tree | c8bf3c3b859db9d34af3aea4b10f848dc221fb4f /pkgs/os-specific | |
| parent | 85e26d06ac020d4b5e0a4076328fbc43c658b83e (diff) | |
| parent | 5f5062d1ef49274c6eae6e96366ad8200517548a (diff) | |
| download | nixlib-2930699c8c91e2a74c8f14d417c1415df07fc1cf.tar nixlib-2930699c8c91e2a74c8f14d417c1415df07fc1cf.tar.gz nixlib-2930699c8c91e2a74c8f14d417c1415df07fc1cf.tar.bz2 nixlib-2930699c8c91e2a74c8f14d417c1415df07fc1cf.tar.lz nixlib-2930699c8c91e2a74c8f14d417c1415df07fc1cf.tar.xz nixlib-2930699c8c91e2a74c8f14d417c1415df07fc1cf.tar.zst nixlib-2930699c8c91e2a74c8f14d417c1415df07fc1cf.zip | |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/darwin/rectangle/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-rpi.nix | 28 |
2 files changed, 29 insertions, 3 deletions
diff --git a/pkgs/os-specific/darwin/rectangle/default.nix b/pkgs/os-specific/darwin/rectangle/default.nix index 4366e0aedebf..0ada82d0e758 100644 --- a/pkgs/os-specific/darwin/rectangle/default.nix +++ b/pkgs/os-specific/darwin/rectangle/default.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation rec { pname = "rectangle"; - version = "0.75"; + version = "0.76"; src = fetchurl { url = "https://github.com/rxhanson/Rectangle/releases/download/v${version}/Rectangle${version}.dmg"; - hash = "sha256-IjEqT1PHGohuQqgS+IzZKyLoIs0P0V7z42JzNUuzh84="; + hash = "sha256-oHq5mLMWloi6Tf81rjcmUFGwIggtMdyLPqbD/gOzNHU="; }; sourceRoot = "."; diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index ee6516045470..f1449998984b 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPackages, fetchFromGitHub, perl, buildLinux, rpiVersion, ... } @ args: +{ stdenv, lib, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, rpiVersion, ... } @ args: let # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this @@ -27,6 +27,32 @@ lib.overrideDerivation (buildLinux (args // { efiBootStub = false; } // (args.features or {}); + kernelPatches = (args.kernelPatches or []) ++ [ + # Fix "WARNING: unmet direct dependencies detected for MFD_RP1", and + # subsequent build failure. + # https://github.com/NixOS/nixpkgs/pull/268280#issuecomment-1911839809 + # https://github.com/raspberrypi/linux/pull/5900 + { + name = "drm-rp1-depends-on-instead-of-select-MFD_RP1.patch"; + patch = fetchpatch { + url = "https://github.com/peat-psuwit/rpi-linux/commit/6de0bb51929cd3ad4fa27b2a421a2af12e6468f5.patch"; + hash = "sha256-9pHcbgWTiztu48SBaLPVroUnxnXMKeCGt5vEo9V8WGw="; + }; + } + + # Fix `ERROR: modpost: missing MODULE_LICENSE() in <...>/bcm2712-iommu.o` + # by preventing such code from being built as module. + # https://github.com/NixOS/nixpkgs/pull/284035#issuecomment-1913015802 + # https://github.com/raspberrypi/linux/pull/5910 + { + name = "iommu-bcm2712-don-t-allow-building-as-module.patch"; + patch = fetchpatch { + url = "https://github.com/peat-psuwit/rpi-linux/commit/693a5e69bddbcbe1d1b796ebc7581c3597685b1b.patch"; + hash = "sha256-8BYYQDM5By8cTk48ASYKJhGVQnZBIK4PXtV70UtfS+A="; + }; + } + ]; + extraMeta = if (rpiVersion < 3) then { platforms = with lib.platforms; arm; hydraPlatforms = []; |