summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorSamuel Dionne-Riel <samuel@dionne-riel.com>2020-01-22 00:49:57 -0500
committerGitHub <noreply@github.com>2020-01-22 00:49:57 -0500
commit90441b4b47fc7280de6a5bd1a228017caaa0f97f (patch)
tree454fdde0c903babe6d2e2004f95060e3e2350e00 /pkgs/top-level
parentdeb6770eb3eaf3c57f7fc337c25cc1bb2a4492be (diff)
parent7943c33087b2b3d4d10a935bc152fc9dbbca7fd8 (diff)
downloadnixpkgs-90441b4b47fc7280de6a5bd1a228017caaa0f97f.tar
nixpkgs-90441b4b47fc7280de6a5bd1a228017caaa0f97f.tar.gz
nixpkgs-90441b4b47fc7280de6a5bd1a228017caaa0f97f.tar.bz2
nixpkgs-90441b4b47fc7280de6a5bd1a228017caaa0f97f.tar.lz
nixpkgs-90441b4b47fc7280de6a5bd1a228017caaa0f97f.tar.xz
nixpkgs-90441b4b47fc7280de6a5bd1a228017caaa0f97f.tar.zst
nixpkgs-90441b4b47fc7280de6a5bd1a228017caaa0f97f.zip
Merge pull request #78216 from samueldr/u-boot/update/2020.01
uboot: 2019.10 -> 2020.01
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/aliases.nix1
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index c64b56dd5ce..3831db8d401 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -442,6 +442,7 @@ mapAliases ({
   transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06
   truecrypt = veracrypt; # added 2018-10-24
   tshark = wireshark-cli; # added 2018-04-25
+  ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21
   ucsFonts = ucs-fonts; # added 2016-07-15
   ultrastardx-beta = ultrastardx; # added 2017-08-12
   usb_modeswitch = usb-modeswitch; # added 2016-05-10
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0aa4471e2b4..9a8d0ad91d6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17145,7 +17145,7 @@ in
     ubootBananaPi
     ubootBananaPim3
     ubootBananaPim64
-    ubootBeagleboneBlack
+    ubootAmx335xEVM
     ubootClearfog
     ubootGuruplug
     ubootJetsonTK1