Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 512a85d334ea
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 53129a764dc7
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 19, 2020

  1. uboot: 2020.01 -> 2020.04

    prusnak committed Apr 19, 2020
    Copy the full SHA
    1b9ff92 View commit details

Commits on Apr 22, 2020

  1. Merge pull request #85569 from prusnak/uboot

    uboot: 2020.01 -> 2020.04
    samueldr authored Apr 22, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    53129a7 View commit details
Showing with 17 additions and 5 deletions.
  1. +17 −5 pkgs/misc/uboot/default.nix
22 changes: 17 additions & 5 deletions pkgs/misc/uboot/default.nix
Original file line number Diff line number Diff line change
@@ -1,15 +1,27 @@
{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitHub, bc, bison, dtc, flex
, openssl, swig, meson-tools, armTrustedFirmwareAllwinner
, armTrustedFirmwareRK3328, armTrustedFirmwareRK3399
{ stdenv
, lib
, fetchurl
, fetchpatch
, fetchFromGitHub
, bc
, bison
, dtc
, flex
, openssl
, swig
, meson-tools
, armTrustedFirmwareAllwinner
, armTrustedFirmwareRK3328
, armTrustedFirmwareRK3399
, armTrustedFirmwareS905
, buildPackages
}:

let
defaultVersion = "2020.01";
defaultVersion = "2020.04";
defaultSrc = fetchurl {
url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2";
sha256 = "1w9ml4jl15q6ixpdqzspxjnl7d3rgxd7f99ms1xv5c8869h3qida";
sha256 = "0wjkasnz87q86hx93inspdjfjsinmxi87bcvj30c773x0fpjlwzy";
};
buildUBoot = {
version ? null