From 009668465ed07712a51d0b00e33e2d9e00d203ad Mon Sep 17 00:00:00 2001
From: Sirio Balmelli <sirio@b-ad.ch>
Date: Mon, 12 Jul 2021 11:18:25 +0200
Subject: [PATCH] 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 <sirio@b-ad.ch>
---
 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(+)

diff --git a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix b/pkgs/development/compilers/gcc-arm-embedded/10/default.nix
index 943ddd100a21..88dd4d37f7b9 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 266863d95b2e..6dd6ab027f1a 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 4f2135446f61..d2ff1c875508 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 2d85113527c0..4fbc58f15a8d 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 944d7c7b1593..073dc10dd44c 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 = {