diff options
| author | Ben Wolsieffer <benwolsieffer@gmail.com> | 2019-01-05 16:10:10 -0500 |
|---|---|---|
| committer | Ben Wolsieffer <benwolsieffer@gmail.com> | 2019-01-18 17:53:21 -0500 |
| commit | 404773e33673e0bf0ca31ae04f33ea75de76b133 (patch) | |
| tree | 8e525ad96889622a5647f9694a1cdf1d70536706 /pkgs | |
| parent | 26079c4da73172f4d51ceca2ef9a641bcc1e0777 (diff) | |
| download | nixlib-404773e33673e0bf0ca31ae04f33ea75de76b133.tar nixlib-404773e33673e0bf0ca31ae04f33ea75de76b133.tar.gz nixlib-404773e33673e0bf0ca31ae04f33ea75de76b133.tar.bz2 nixlib-404773e33673e0bf0ca31ae04f33ea75de76b133.tar.lz nixlib-404773e33673e0bf0ca31ae04f33ea75de76b133.tar.xz nixlib-404773e33673e0bf0ca31ae04f33ea75de76b133.tar.zst nixlib-404773e33673e0bf0ca31ae04f33ea75de76b133.zip | |
uboot: use pname and cleanup version specification
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/misc/uboot/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/misc/uboot/rock64.nix | 1 | ||||
| -rw-r--r-- | pkgs/misc/uboot/rockpro64.nix | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 5affd93279c9..a8e46671caec 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -4,7 +4,8 @@ }: let - buildUBoot = { filesToInstall + buildUBoot = { version ? "2018.09" + , filesToInstall , installDir ? "$out" , defconfig , extraConfig ? "" @@ -14,8 +15,8 @@ let , ... } @ args: stdenv.mkDerivation (rec { - name = "uboot-${defconfig}-${version}"; - version = args.version or "2018.09"; + pname = "uboot-${defconfig}"; + inherit version; src = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"; diff --git a/pkgs/misc/uboot/rock64.nix b/pkgs/misc/uboot/rock64.nix index 2037036f53d7..af8d044387a4 100644 --- a/pkgs/misc/uboot/rock64.nix +++ b/pkgs/misc/uboot/rock64.nix @@ -6,7 +6,6 @@ sha256 = "189f7h6wj2yrcc5ga103jnyysykf9j3j9p1vcy7791bxwxqxnggf"; }; in buildUBoot rec { - name = "uboot-${defconfig}-${version}"; version = "2017.09"; src = fetchFromGitHub { diff --git a/pkgs/misc/uboot/rockpro64.nix b/pkgs/misc/uboot/rockpro64.nix index f885fc37a228..d8802e6d5f55 100644 --- a/pkgs/misc/uboot/rockpro64.nix +++ b/pkgs/misc/uboot/rockpro64.nix @@ -6,7 +6,6 @@ sha256 = "189f7h6wj2yrcc5ga103jnyysykf9j3j9p1vcy7791bxwxqxnggf"; }; in buildUBoot rec { - name = "uboot-${defconfig}-${version}"; version = "2017.09"; src = fetchFromGitHub { |