bulk versions.json

packages/arm-trusted-firmware/default.nix

@@ -2,24 +2,24 @@
   stdenv,
   fetchFromGitHub,
   lib,
+  pkgs,
   MODEL ? "5",
   DEBUG ? "0",
   TFA_FLAGS ? "",
 }:
 let
   inherit (lib.trivial) importJSON;
-  versions = importJSON ./versions.json;
+  versionSpec = importJSON ./version.json;
+  versioning = import ../../lib/versioning.nix { inherit lib pkgs; };
+  selected = versioning.selectVariant versionSpec null null;
+  sources = versioning.mkAllSources selected;
+  fw = selected.sources.fw;
 in
 stdenv.mkDerivation rec {
   pname = "arm-trusted-firmware";
-  version = versions.fw.rev;
+  version = if fw ? tag then fw.tag else fw.rev;
 
-  src = fetchFromGitHub {
-    owner = "ARM-software";
-    repo = "arm-trusted-firmware";
-    rev = "${version}";
-    hash = versions.fw.hash;
-  };
+  src = sources.fw;
 
   # Add required host tools if needed:
   nativeBuildInputs = [

packages/arm-trusted-firmware/version.json

@@ -0,0 +1,12 @@
+{
+  "schemaVersion": 1,
+  "sources": {
+    "fw": {
+      "fetcher": "github",
+      "owner": "ARM-software",
+      "repo": "arm-trusted-firmware",
+      "rev": "8fd4c786594239de20669f062e416fe1a37ca59e",
+      "hash": "sha256-eh0b4q6od9ZWAFBQ+wRjpLQEEf8kox2L3l1iHwQtju8="
+    }
+  }
+}

packages/arm-trusted-firmware/versions.json

@@ -1,9 +0,0 @@
-{
-  "fw": {
-    "hash": "sha256-eh0b4q6od9ZWAFBQ+wRjpLQEEf8kox2L3l1iHwQtju8=",
-    "location": "github",
-    "owner": "ARM-software",
-    "repo": "arm-trusted-firmware",
-    "rev": "8fd4c786594239de20669f062e416fe1a37ca59e"
-  }
-}