commit 791c91ff5278dc16fb34d6cd995dca17d4290c47 · pyrox.dev/nixpkgs

+3 -3

pkgs/development/libraries/libraspberrypi/default.nix

···

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         pname = "libraspberrypi";

     

       10
       10
       -
         version = "unstable-2020-11-30";

     

       10
       10
       +
         version = "unstable-2021-01-11";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "raspberrypi";

     

       14
       14
        
           repo = "userland";

     

       15
       15
       -
           rev = "093b30bbc2fd083d68cc3ee07e6e555c6e592d11";

     

       16
       16
       -
           sha256 = "0n2psqyxlsic9cc5s8h65g0blblw3xws4czhpbbgjm58px3822d7";

     

       15
       15
       +
           rev = "4a0a19b88b43e48c6b51b526b9378289fb712a4c";

     

       16
       16
       +
           sha256 = "0g3a1a7w717h0fwk39banzgjwphh62fx64k130w2s5885lsn5r5k";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         patches = [

+6 -6

pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         pname = "raspberrypi-wireless-firmware";

     

       5
       5
       -
         version = "2020-12-01";

     

       5
       5
       +
         version = "2021-01-28";

     

       6
       6
        
       

     

       7
       7
        
         srcs = [

     

       8
       8
        
           (fetchFromGitHub {

     

       9
       9
        
             name = "bluez-firmware";

     

       10
       10
        
             owner = "RPi-Distro";

     

       11
       11
        
             repo = "bluez-firmware";

     

       12
       12
       -
             rev = "1e4ee0c05bae10002124b56c0e44bb9ac6581ddc";

     

       13
       13
       -
             sha256 = "10n6ibr3ra71f4hlvbpy8csjlgrapawxrr6jmijn470vkcqcpq27";

     

       12
       12
       +
             rev = "e7fd166981ab4bb9a36c2d1500205a078a35714d";

     

       13
       13
       +
             sha256 = "1dkg8mzn7n4afi50ibrda2s33nw2qj52jjjdv9w560q601gms47b";

     

       14
       14
        
           })

     

       15
       15
        
           (fetchFromGitHub {

     

       16
       16
        
             name = "firmware-nonfree";

     

       17
       17
        
             owner = "RPi-Distro";

     

       18
       18
        
             repo = "firmware-nonfree";

     

       19
       19
       -
             rev = "b66ab26cebff689d0d3257f56912b9bb03c20567";

     

       20
       20
       -
             sha256 = "0cffgsp0w7vv7ylpymdddx0bl9dx3pl7snlh30p4rr9srmn8869f";

     

       19
       19
       +
             rev = "83938f78ca2d5a0ffe0c223bb96d72ccc7b71ca5";

     

       20
       20
       +
             sha256 = "1l4zz86y2hjyvdwjy75abyjwh3wqknd71y3vh1iw5nd0hws8ranp";

     

       21
       21
        
           })

     

       22
       22
        
         ];

     

       23
       23
        
       

     
···

       41
       41
        
       

     

       42
       42
        
         outputHashMode = "recursive";

     

       43
       43
        
         outputHashAlgo = "sha256";

     

       44
       44
       -
         outputHash = "17k9y499kjc4zv7ivnsfrgfibwj0ldr3sqdgia4dackbr70jfg2h";

     

       44
       44
       +
         outputHash = "0a54gyrq6jfxxvimaa4yjfiyfwf7wv58v0a32l74yrzyarr3ldby";

     

       45
       45
        
       

     

       46
       46
        
         meta = with lib; {

     

       47
       47
        
           description = "Firmware for builtin Wifi/Bluetooth devices in the Raspberry Pi 3+ and Zero W";

+2 -2

pkgs/os-specific/linux/firmware/raspberrypi/default.nix

···

       3
       3
        
       stdenvNoCC.mkDerivation rec {

     

       4
       4
        
         # NOTE: this should be updated with linux_rpi

     

       5
       5
        
         pname = "raspberrypi-firmware";

     

       6
       6
       -
         version = "1.20201201";

     

       6
       6
       +
         version = "1.20210201";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "raspberrypi";

     

       10
       10
        
           repo = "firmware";

     

       11
       11
        
           rev = version;

     

       12
       12
       -
           sha256 = "09yha3k72yqx29rwnv2j2zm73lzc4jgmcbmcc6yrl1i07x84lx3n";

     

       12
       12
       +
           sha256 = "0frmsixzy9nd8nfg15jsz037522h4gq1hca666cyaf9zg2sa1i7i";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         installPhase = ''

+11 -8

pkgs/os-specific/linux/kernel/linux-rpi.nix

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this

     

       5
       5
       -
         modDirVersion = "5.4.79";

     

       6
       6
       -
         tag = "1.20201201";

     

       5
       5
       +
         modDirVersion = "5.10.11";

     

       6
       6
       +
         tag = "1.20210201";

     

       7
       7
        
       in

     

       8
       8
        
       lib.overrideDerivation (buildLinux (args // {

     

       9
       9
        
         version = "${modDirVersion}-${tag}";

     
···

       13
       13
        
           owner = "raspberrypi";

     

       14
       14
        
           repo = "linux";

     

       15
       15
        
           rev = "raspberrypi-kernel_${tag}-1";

     

       16
       16
       -
           sha256 = "093p5kh5f27djkhbcw371w079lhhihvg3s4by3wzsd40di4fcgn9";

     

       16
       16
       +
           sha256 = "0n4zq47k9bmkgmarrhwvivp10v5ga8y2bphsx0il3kmcpf0c1m3q";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         defconfig = {

     
···

       23
       23
        
           "4" = "bcm2711_defconfig";

     

       24
       24
        
         }.${toString rpiVersion};

     

       25
       25
        
       

     

       26
       26
       -
         extraConfig = ''

     

       27
       27
       -
           # ../drivers/pci/controller/pcie-altera.c:679:8: error: too few arguments to function 'devm_of_pci_get_host_bridge_resources'

     

       28
       28
       -
           PCIE_ALTERA n

     

       29
       29
       -
         '';

     

       30
       30
       -
       

     

       31
       26
        
         features = {

     

       32
       27
        
           efiBootStub = false;

     

       33
       28
        
         } // (args.features or {});

     

       29
       29
       +
       

     

       30
       30
       +
         extraConfig = ''

     

       31
       31
       +
           # ../drivers/gpu/drm/ast/ast_mode.c:851:18: error: initialization of 'void (*)(struct drm_crtc *, struct drm_atomic_state *)' from incompatible pointer type 'void (*)(struct drm_crtc *, struct drm_crtc_state *)' [-Werror=incompatible-pointer-types]

     

       32
       32
       +
           #   851 |  .atomic_flush = ast_crtc_helper_atomic_flush,

     

       33
       33
       +
           #       |                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~

     

       34
       34
       +
           # ../drivers/gpu/drm/ast/ast_mode.c:851:18: note: (near initialization for 'ast_crtc_helper_funcs.atomic_flush')

     

       35
       35
       +
           DRM_AST n

     

       36
       36
       +
         '';

     

       34
       37
        
       

     

       35
       38
        
         extraMeta = if (rpiVersion < 3) then {

     

       36
       39
        
           platforms = with lib.platforms; [ arm ];

+3 -3

pkgs/os-specific/linux/raspberrypi-eeprom/default.nix

···

       3
       3
        
       }:

     

       4
       4
        
       stdenvNoCC.mkDerivation {

     

       5
       5
        
         pname = "raspberrypi-eeprom";

     

       6
       6
       -
         version = "2020-12-11";

     

       6
       6
       +
         version = "2021-01-11";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "raspberrypi";

     

       10
       10
        
           repo = "rpi-eeprom";

     

       11
       11
       -
           rev = "54a9796abbee59067bff9da6b90c1014178f2c21";

     

       12
       12
       -
           sha256 = "0yp7bn444n6yisp4hiblrm00rrvrf213amzb4sh96mlb5nhxspqk";

     

       11
       11
       +
           rev = "54cadc816ba739afd08ead6d679e647de028a65c";

     

       12
       12
       +
           sha256 = "0zlacr4z6h40h0g47195xsbss29gaa7kf8r31h372sxsn8srlnjf";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         buildInputs = [ python3 ];