From 009668465ed07712a51d0b00e33e2d9e00d203ad Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Mon, 12 Jul 2021 11:18:25 +0200 Subject: gcc-arm-embedded: add numVersion attribute for convenience There are builds which rely on having the numeric version of gcc (eg "10.2.1") declared in an environment variable. Running 'arm-none-eabi-gcc --version' returns: "arm-none-eabi-gcc (GNU Arm Embedded Toolchain 10-2020-q4-major) 10.2.1 20201103 (release)" However, the attribute arm-none-eabi-gcc.version is "10-2020-q4-major", from which there is no way to derive "10.2.1". Contrast this with the attribute gcc.version which (at this time) gives "10.3.0". By adding a numVersion attribute, consumers of this package can correctly determine what GCC version is being executed. Signed-off-by: Sirio Balmelli --- pkgs/development/compilers/gcc-arm-embedded/10/default.nix | 1 + pkgs/development/compilers/gcc-arm-embedded/6/default.nix | 1 + pkgs/development/compilers/gcc-arm-embedded/7/default.nix | 1 + pkgs/development/compilers/gcc-arm-embedded/8/default.nix | 1 + pkgs/development/compilers/gcc-arm-embedded/9/default.nix | 1 + 5 files changed, 5 insertions(+) (limited to 'pkgs/development/compilers') diff --git a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix b/pkgs/development/compilers/gcc-arm-embedded/10/default.nix index 943ddd100a2..88dd4d37f7b 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/10/default.nix @@ -7,6 +7,7 @@ stdenv.mkDerivation rec { pname = "gcc-arm-embedded"; version = "10-2020-q4-major"; + numVersion = "10.2.1"; subdir = "10-2020q4"; suffix = { diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix index 266863d95b2..6dd6ab027f1 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix @@ -7,6 +7,7 @@ stdenv.mkDerivation rec { pname = "gcc-arm-embedded"; version = "6-2017-q2-update"; + numVersion = "6.3.1"; subdir = "6-2017q2"; suffix = { diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix index 4f2135446f6..d2ff1c87550 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix @@ -7,6 +7,7 @@ stdenv.mkDerivation rec { pname = "gcc-arm-embedded"; version = "7-2018-q2-update"; + numVersion = "7.3.1"; subdir = "7-2018q2"; suffix = { diff --git a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix index 2d85113527c..4fbc58f15a8 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix @@ -7,6 +7,7 @@ stdenv.mkDerivation rec { pname = "gcc-arm-embedded"; version = "8-2019-q3-update"; + numVersion = "8.3.1"; subdir = "8-2019q3/RC1.1"; suffix = { diff --git a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix index 944d7c7b159..073dc10dd44 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix @@ -7,6 +7,7 @@ stdenv.mkDerivation rec { pname = "gcc-arm-embedded"; version = "9-2020-q2-update"; + numVersion = "9.3.1"; subdir = "9-2020q2"; suffix = { -- cgit 1.4.1 From d66917c4df5addb334a761d8e1e4279105e8c9ac Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 12 Jul 2021 13:11:14 +0200 Subject: gcc-arm-embedded: use numVersion as version, rename version to release followup to 009668465ed07712a51d0b00e33e2d9e00d203ad --- pkgs/development/compilers/gcc-arm-embedded/10/default.nix | 6 +++--- pkgs/development/compilers/gcc-arm-embedded/6/default.nix | 6 +++--- pkgs/development/compilers/gcc-arm-embedded/7/default.nix | 6 +++--- pkgs/development/compilers/gcc-arm-embedded/8/default.nix | 6 +++--- pkgs/development/compilers/gcc-arm-embedded/9/default.nix | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) (limited to 'pkgs/development/compilers') diff --git a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix b/pkgs/development/compilers/gcc-arm-embedded/10/default.nix index 88dd4d37f7b..441ce6cdcd5 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/10/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { pname = "gcc-arm-embedded"; - version = "10-2020-q4-major"; - numVersion = "10.2.1"; + version = "10.2.1"; + release = "10-2020-q4-major"; subdir = "10-2020q4"; suffix = { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${suffix}.tar.bz2"; + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; sha256 = { aarch64-linux = "0spkbh7vnda1w0nvavk342nb24nqxn8kln3k9j85mzil560qqg9l"; x86_64-darwin = "1h5xn0npwkilqxg7ifrymsl7kjpafr9r9gjqgcpb0kjxavijvldy"; diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix index 6dd6ab027f1..bab73948ace 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { pname = "gcc-arm-embedded"; - version = "6-2017-q2-update"; - numVersion = "6.3.1"; + version = "6.3.1"; + release = "6-2017-q2-update"; subdir = "6-2017q2"; suffix = { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${suffix}.tar.bz2"; + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; sha256 = { x86_64-darwin = "0019ylpq4inq7p5gydpmc9m8ni72fz2csrjlqmgx1698998q0c3x"; x86_64-linux = "1hvwi02mx34al525sngnl0cm7dkmzxfkb1brq9kvbv28wcplp3p6"; diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix index d2ff1c87550..ccd99e096f8 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { pname = "gcc-arm-embedded"; - version = "7-2018-q2-update"; - numVersion = "7.3.1"; + version = "7.3.1"; + release = "7-2018-q2-update"; subdir = "7-2018q2"; suffix = { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${suffix}.tar.bz2"; + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; sha256 = { x86_64-darwin = "0nc7m0mpa39qyhfyydxkkyqm7spfc27xf6ygi2vd2aym4r9azi61"; x86_64-linux = "0sgysp3hfpgrkcbfiwkp0a7ymqs02khfbrjabm52b5z61sgi05xv"; diff --git a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix index 4fbc58f15a8..363e87ecb65 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { pname = "gcc-arm-embedded"; - version = "8-2019-q3-update"; - numVersion = "8.3.1"; + version = "8.3.1"; + release = "8-2019-q3-update"; subdir = "8-2019q3/RC1.1"; suffix = { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${suffix}.tar.bz2"; + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; sha256 = { x86_64-darwin = "fc235ce853bf3bceba46eff4b95764c5935ca07fc4998762ef5e5b7d05f37085"; x86_64-linux = "b50b02b0a16e5aad8620e9d7c31110ef285c1dde28980b1a9448b764d77d8f92"; diff --git a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix index 073dc10dd44..6ff1567286d 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { pname = "gcc-arm-embedded"; - version = "9-2020-q2-update"; - numVersion = "9.3.1"; + version = "9.3.1"; + release = "9-2020-q2-update"; subdir = "9-2020q2"; suffix = { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${suffix}.tar.bz2"; + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; sha256 = { aarch64-linux = "1b5q2y710hy7lddj8vj3zl54gfl74j30kx3hk3i81zrcbv16ah8z"; x86_64-darwin = "1ils9z16wrvglh72m428y5irmd36biq79yj86756whib8izbifdv"; -- cgit 1.4.1