Merge branch 'master' of github.com:NixOS/nixpkgs into staging-next

This commit is contained in:
Jonathan Ringer
2019-12-30 10:14:18 -08:00
45 changed files with 806 additions and 180 deletions
+1 -1
View File
@@ -300,7 +300,7 @@ in {
ubootSheevaplug = buildUBoot {
defconfig = "sheevaplug_defconfig";
extraMeta.platforms = ["armv5tel-linux"];
filesToInstall = ["u-boot.bin"];
filesToInstall = ["u-boot.kwb"];
};
ubootSopine = buildUBoot {