diff options
| author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2020-01-21 16:34:09 -0500 |
|---|---|---|
| committer | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2020-01-21 16:39:30 -0500 |
| commit | ca931caf160bd967a89d9c8f9b37ae182022a7f8 (patch) | |
| tree | 555ed3dc1021c8e88d24cf264bd5be82301553bb /pkgs/misc | |
| parent | 4311cfa1577c6b3cba7b50e820d2bddacda52484 (diff) | |
| download | nixpkgs-ca931caf160bd967a89d9c8f9b37ae182022a7f8.tar nixpkgs-ca931caf160bd967a89d9c8f9b37ae182022a7f8.tar.gz nixpkgs-ca931caf160bd967a89d9c8f9b37ae182022a7f8.tar.bz2 nixpkgs-ca931caf160bd967a89d9c8f9b37ae182022a7f8.tar.lz nixpkgs-ca931caf160bd967a89d9c8f9b37ae182022a7f8.tar.xz nixpkgs-ca931caf160bd967a89d9c8f9b37ae182022a7f8.tar.zst nixpkgs-ca931caf160bd967a89d9c8f9b37ae182022a7f8.zip | |
uboot: 2019.10 -> 2020.01
In addition, removes the python2 dependency. Anyway, it was required for the updated revision to build.
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/uboot/default.nix | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 5bd20c0765b..c373364103f 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -6,10 +6,10 @@ }: let - defaultVersion = "2019.10"; + defaultVersion = "2020.01"; defaultSrc = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; - sha256 = "053hcrwwlacqh2niisn0zas95zkbffw5aw5sdhixs8lmfdq60vcd"; + sha256 = "1w9ml4jl15q6ixpdqzspxjnl7d3rgxd7f99ms1xv5c8869h3qida"; }; buildUBoot = { version ? null @@ -28,19 +28,7 @@ let src = if src == null then defaultSrc else src; - patches = [ - # Submitted upstream: https://patchwork.ozlabs.org/patch/1203693/ - (fetchpatch { - url = https://github.com/dezgeg/u-boot/commit/extlinux-path-length-2018-03.patch; - sha256 = "07jafdnxvqv8lz256qy29agjc2k1zj5ad4k28r1w5qkhwj4ixmf8"; - }) - # Submitted upstream: https://patchwork.ozlabs.org/patch/1203678/ - (fetchpatch { - name = "rockchip-allow-loading-larger-kernels.patch"; - url = "https://marc.info/?l=u-boot&m=157537843004298&q=raw"; - sha256 = "0l3l88cc9xkxkraql82pfgpx6nqn4dj7cvfaagh5pzfwkxyw0n3p"; - }) - ] ++ extraPatches; + patches = extraPatches; postPatch = '' patchShebangs tools @@ -53,7 +41,7 @@ let dtc flex openssl - (buildPackages.python2.withPackages (p: [ p.libfdt ])) + (buildPackages.python3.withPackages (p: [ p.libfdt ])) swig ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; |