fixup! Add schema validation for specific subsystems

This commit is contained in:
Brian Leung 2022-09-01 14:52:29 -07:00
parent 45101cccc4
commit e928819208
No known key found for this signature in database
GPG Key ID: 2D86D6A94C8BB3B1
5 changed files with 6 additions and 6 deletions

View File

@ -7,7 +7,7 @@
"type": "object",
"properties": {
"nodejsVersion": {
"type": "integer"
"type": "string"
}
}
}

View File

@ -1,5 +1,5 @@
{
"_subsystem": {
"nodejsVersion": 14
"nodejsVersion": "14"
}
}

View File

@ -44,9 +44,9 @@
nodejs =
if args ? nodejs
then args.nodejs
then b.toString args.nodejs
else
pkgs."nodejs-${builtins.toString nodejsVersion}_x"
pkgs."nodejs-${nodejsVersion}_x"
or (throw "Could not find nodejs version '${nodejsVersion}' in pkgs");
nodeSources = runCommandLocal "node-sources" {} ''

View File

@ -170,7 +170,7 @@
subsystemName = "nodejs";
subsystemAttrs = {nodejsVersion = args.nodejs;};
subsystemAttrs = {nodejsVersion = b.toString args.nodejs;};
# functions
serializePackages = inputData: let

View File

@ -140,7 +140,7 @@
subsystemName = "nodejs";
subsystemAttrs = {nodejsVersion = args.nodejs;};
subsystemAttrs = {nodejsVersion = b.toString args.nodejs;};
keys = {
yarnName = rawObj: finalObj: