all repos — searchix @ 9f1a4aaa9960fe3ab664033e1c1f42e62c3fb2e8

Search engine for NixOS, nix-darwin, home-manager and NUR users

fix: incorrect default/example values stored after processing

Alan Pearce
commit

9f1a4aaa9960fe3ab664033e1c1f42e62c3fb2e8

parent

9315125648a12ebab8bce86b8a0af52dcc8427b0

1 file changed, 8 insertions(+), 7 deletions(-)

jump to
M internal/options/process.go → internal/options/process.go
@@ -26,9 +26,9 @@ }
 
 type nixOptionJSON struct {
 	Declarations    []linkJSON
-	Default         nixValueJSON
+	Default         *nixValueJSON
 	Description     string
-	Example         nixValueJSON
+	Example         *nixValueJSON
 	Loc             []string
 	ReadOnly        bool
 	RelatedPackages string

@@ -80,13 +80,12 @@ URL:  makeGitHubFileURL(channelRepoMap[channel], ref, subPath),
 	}, nil
 }
 
-func convertNixValue(nj nixValueJSON) *NixValue {
+func convertNixValue(nj *nixValueJSON) *NixValue {
+	if nj == nil {
+		return nil
+	}
 	switch nj.Type {
 	case "", "literalExpression":
-		if nj.Text == "" {
-			return nil
-		}
-
 		return &NixValue{
 			Text: nj.Text,
 		}

@@ -144,6 +143,8 @@ x := kv.Value.(map[string]interface{})
 
 		var decls []*Link
 		for _, decl := range x["declarations"].([]interface{}) {
+			optJSON = nixOptionJSON{}
+
 			switch decl := reflect.ValueOf(decl); decl.Kind() {
 			case reflect.String:
 				s := decl.String()