Fix unfree package indexing, show unfree marker

diamondburned · Jul 6, 2024 · b075a39 · b075a39
1 parent 2b5c631
commit b075a39
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/cmd/nix-search/main.go b/cmd/nix-search/main.go
@@ -225,6 +225,9 @@ func mainAction(c *cli.Context) error {
 
 		fmt.Fprint(out, "- ", path)
 		fmt.Fprint(out, " ", styler.dim("("+pkg.Version+")"))
+		if pkg.Unfree {
+			fmt.Fprint(out, styler.dim(" (unfree)"))
+		}
 		if pkg.Broken {
 			fmt.Fprint(out, styler.dim(" (broken)"))
 		}

diff --git a/search/nix/dump_packages.nix b/search/nix/dump_packages.nix
@@ -69,10 +69,10 @@ let
 				if pkg.meta ? "license"
 				then map licenseString (singleton pkg.meta.license)
 				else null;
-			unfree = 
+			unfree =
 				if pkg.meta ? "license"
 				then any
-					(license: if license ? "free" then !license.free else false)
+					(license: license ? "free" && !license.free)
 					(singleton pkg.meta.license)
 				else false;
 			unsupportedPlatform = !meta.availableOn pkgs pkg;

diff --git a/search/package.go b/search/package.go
@@ -26,6 +26,7 @@ type Package struct {
 	Licenses            []string `json:"license,omitempty"` // usually SPDX identifiers
 	MainProgram         string   `json:"mainProgram,omitempty"`
 	Broken              bool     `json:"broken,omitempty"`
+	Unfree              bool     `json:"unfree,omitempty"`
 	UnsupportedPlatform bool     `json:"unsupportedPlatform,omitempty"`
 
 	// Homepages           []string `json:"homepages,omitempty"`

diff --git a/search/searchers/blugesearcher/indexer.go b/search/searchers/blugesearcher/indexer.go
@@ -15,6 +15,7 @@ import (
 var indexVersions = []string{
 	"index",
 	"index-v2",
+	"index-v3",
 }
 
 var lastIndexVersion = indexVersions[len(indexVersions)-1]