movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00
Code Activity

Merge branch 'master' into staging-next

Browse source
This commit is contained in:
Jan Tojnar 2021-01-10 23:24:33 +01:00
commit dd72357155
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
298 changed files with 746 additions and 415 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
View file

@ -20,7 +20,7 @@ let
timeoutStr = if blCfg.timeout == null then "-1" else toString blCfg.timeout;
isAarch64 = pkgs.stdenv.hostPlatform.isAarch64;
optional = pkgs.stdenv.lib.optionalString;
optional = pkgs.lib.optionalString;
configTxt =
pkgs.writeText "config.txt" (''