diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-06-12 09:59:45 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-06-18 18:14:17 +0000 |
| commit | c5571a126859eb658ffd7340cb580f7d91f12bb6 (patch) | |
| tree | 577573c3bf14d9849246d52daece719a10eaf138 /nixpkgs/pkgs/misc/arm-trusted-firmware | |
| parent | 828bd4e8ddcbcd354ddfd99f55af69ee8ff5d9e7 (diff) | |
| parent | 98e3b90b6c8f400ae5438ef868eb992a64b75ce5 (diff) | |
| download | nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.gz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.bz2 nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.lz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.xz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.zst nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.zip | |
Merge commit '98e3b90b6c8f400ae5438ef868eb992a64b75ce5'
Diffstat (limited to 'nixpkgs/pkgs/misc/arm-trusted-firmware')
| -rw-r--r-- | nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix b/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix index 73e2a96d0cde..01c35d99ae7e 100644 --- a/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix +++ b/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix @@ -6,7 +6,7 @@ let , platform , extraMakeFlags ? [] , extraMeta ? {} - , version ? "2.0" + , version ? "2.1" , ... } @ args: stdenv.mkDerivation (rec { @@ -17,7 +17,7 @@ let owner = "ARM-software"; repo = "arm-trusted-firmware"; rev = "refs/tags/v${version}"; - sha256 = "087pkwa6slxff0aiz3v42gww007nww97bl1p96fvvs7rr1y14gjx"; + sha256 = "1gy5qskrjy8n3kxdcm1dx8b45l5b75n0pm8pq80wl6xic1ycy24r"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -57,15 +57,7 @@ in rec { inherit buildArmTrustedFirmware; armTrustedFirmwareAllwinner = buildArmTrustedFirmware rec { - version = "1.0"; - src = fetchFromGitHub { - owner = "apritzel"; - repo = "arm-trusted-firmware"; - # Branch: `allwinner` - rev = "91f2402d941036a0db092d5375d0535c270b9121"; - sha256 = "0lbipkxb01w97r6ah8wdbwxir3013rp249fcqhlzh2gjwhp5l1ys"; - }; - platform = "sun50iw1p1"; + platform = "sun50i_a64"; extraMeta.platforms = ["aarch64-linux"]; filesToInstall = ["build/${platform}/release/bl31.bin"]; }; |