bulk versions.json

packages/edk2/default.nix

@@ -21,35 +21,16 @@ let
 
   pname = "edk2";
   version = "stable202511";
-  versions = importJSON ./versions.json;
+  versionSpec = importJSON ./version.json;
+  versioning = import ../../lib/versioning.nix { inherit lib pkgs; };
+  selected = versioning.selectVariant versionSpec (if MODEL == "5" then "mjallen" else null) null;
+  sources = versioning.mkAllSources selected;
 
-  repoOwner = (if MODEL == "5" then "-mjallen" else "");
+  edk2Src = sources.edk2;
 
-  edk2Src =  fetchFromGitHub rec {
-    owner = versions."edk2${repoOwner}".owner;
-    repo = "edk2";
-    name = repo;
-    rev = (if MODEL == "5" then versions."edk2${repoOwner}".rev else null);
-    tag = (if MODEL == "5" then null else versions."edk2${repoOwner}".tag);
-    hash = versions."edk2${repoOwner}".hash;
-    fetchSubmodules = true;
-  };
+  edk2NonOsiSrc = sources."edk2-non-osi";
 
-  edk2NonOsiSrc = fetchFromGitHub rec {
-    owner = versions."edk2-non-osi${repoOwner}".owner;
-    repo = "edk2-non-osi";
-    name = repo;
-    rev = versions."edk2-non-osi${repoOwner}".rev;
-    hash = versions."edk2-non-osi${repoOwner}".hash;
-  };
-
-  edk2PlatformsSrc = fetchFromGitHub rec {
-    owner = versions."edk2-platforms${repoOwner}".owner;
-    repo = "edk2-platforms";
-    name = repo;
-    rev = versions."edk2-platforms${repoOwner}".rev;
-    hash = versions."edk2-platforms${repoOwner}".hash;
-  };
+  edk2PlatformsSrc = sources."edk2-platforms";
 
   baseTools = pkgs.${namespace}.edk2-basetools.override {
     version = "stable202511";

packages/edk2/version.json

@@ -0,0 +1,53 @@
+{
+  "schemaVersion": 1,
+  "sources": {
+    "edk2": {
+      "fetcher": "github",
+      "owner": "tianocore",
+      "repo": "edk2",
+      "tag": "edk2-stable202511",
+      "hash": "sha256-R/rgz8dWcDYVoiM67K2UGuq0xXbjjJYBPtJ1FmfGIaU=",
+      "submodules": true
+    },
+    "edk2-non-osi": {
+      "fetcher": "github",
+      "owner": "tianocore",
+      "repo": "edk2-non-osi",
+      "rev": "94d048981116e2e3eda52dad1a89958ee404098d",
+      "hash": "sha256-6yuvVvmGn4yaEksbbvGDX1ZcKpdWBKnwaNjLGvgAWyk="
+    },
+    "edk2-platforms": {
+      "fetcher": "github",
+      "owner": "tianocore",
+      "repo": "edk2-platforms",
+      "rev": "0991a0b643509d900e5d023a0116789827a696e5",
+      "hash": "sha256-IdACr0NStqEpC0TFoKKgDwKT2mqyJwVXW/B7hlRXccI="
+    }
+  },
+  "variants": {
+    "mjallen": {
+      "sources": {
+        "edk2": {
+          "owner": "mjallen18",
+          "repo": "edk2",
+          "rev": "9765be56f1f816ef737153f5588b3294fcc69a63",
+          "tag": null,
+          "hash": "sha256-oqfJbNeOj2BVJqWE+snD6ri3lUO1aNcmPg+eJpjyr5E=",
+          "submodules": true
+        },
+        "edk2-non-osi": {
+          "owner": "mjallen18",
+          "repo": "edk2-non-osi",
+          "rev": "09ee44f07ded544d976be8a03dec3715719f638e",
+          "hash": "sha256-k7nUb3WaRUIr9IlXdam2WGKPOzKjLNVFLfuD5h4veMc="
+        },
+        "edk2-platforms": {
+          "owner": "mjallen18",
+          "repo": "edk2-platforms",
+          "rev": "fdf5a10cc60d1f01030e3ded3c6e69179819cd20",
+          "hash": "sha256-kc5kMEZNLxWFUN8n5+NxXNphkXAtVyjvSAuFyljb8Cs="
+        }
+      }
+    }
+  }
+}

packages/edk2/versions.json

@@ -1,44 +0,0 @@
-{
-  "edk2": {
-    "hash": "sha256-R/rgz8dWcDYVoiM67K2UGuq0xXbjjJYBPtJ1FmfGIaU=",
-    "location": "github",
-    "owner": "tianocore",
-    "repo": "edk2",
-    "tag": "edk2-stable202511"
-  },
-  "edk2-non-osi": {
-    "hash": "sha256-6yuvVvmGn4yaEksbbvGDX1ZcKpdWBKnwaNjLGvgAWyk=",
-    "location": "github",
-    "owner": "tianocore",
-    "repo": "edk2-non-osi",
-    "rev": "94d048981116e2e3eda52dad1a89958ee404098d"
-  },
-  "edk2-platforms": {
-    "hash": "sha256-IdACr0NStqEpC0TFoKKgDwKT2mqyJwVXW/B7hlRXccI=",
-    "location": "github",
-    "owner": "tianocore",
-    "repo": "edk2-platforms",
-    "rev": "0991a0b643509d900e5d023a0116789827a696e5"
-  },
-  "edk2-mjallen": {
-    "hash": "sha256-oqfJbNeOj2BVJqWE+snD6ri3lUO1aNcmPg+eJpjyr5E=",
-    "location": "github",
-    "owner": "mjallen18",
-    "repo": "edk2",
-    "rev": "9765be56f1f816ef737153f5588b3294fcc69a63"
-  },
-  "edk2-non-osi-mjallen": {
-    "hash": "sha256-k7nUb3WaRUIr9IlXdam2WGKPOzKjLNVFLfuD5h4veMc=",
-    "location": "github",
-    "owner": "mjallen18",
-    "repo": "edk2-non-osi",
-    "rev": "09ee44f07ded544d976be8a03dec3715719f638e"
-  },
-  "edk2-platforms-mjallen": {
-    "hash": "sha256-kc5kMEZNLxWFUN8n5+NxXNphkXAtVyjvSAuFyljb8Cs=",
-    "location": "github",
-    "owner": "mjallen18",
-    "repo": "edk2-platforms",
-    "rev": "fdf5a10cc60d1f01030e3ded3c6e69179819cd20"
-  }
-}