nix-community/dream2nix
1
1
Fork 0
mirror of https://github.com/nix-community/dream2nix.git synced 2024-12-19 04:21:52 +03:00
Code Issues Projects Releases Wiki Activity

fixup! Add schema validation for specific subsystems

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/specifications/subsystems/nodejs/dream-lock-schema.json
View File

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

2
src/specifications/subsystems/nodejs/dream.lock.example.json
View File

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

4
src/subsystems/nodejs/builders/granular/default.nix
View File

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

2
src/subsystems/nodejs/translators/package-lock/default.nix
View File

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

2
src/subsystems/nodejs/translators/yarn-lock/default.nix
View File

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