aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Garrelou <simon.garrelou@airbus.com>2023-12-13 11:27:18 +0100
committerSimon Garrelou <simon.garrelou@airbus.com>2023-12-13 11:27:18 +0100
commite129c672c831140d76368305d83aba91dac8c09f (patch)
treef7d35552e0e46dfc809e54c0dc44ef899bf3ca58
parentc2b150d01f8beb4f42df3b73922643302861af69 (diff)
downloadnix-tools-e129c672c831140d76368305d83aba91dac8c09f.tar.gz
nix-tools-e129c672c831140d76368305d83aba91dac8c09f.zip
rename nix_search to nix
-rw-r--r--cmd/nix-search/cache.go4
-rw-r--r--cmd/nix-search/main.go4
-rw-r--r--cmd/nixos-search/options.go4
-rw-r--r--nix/eval.go2
-rw-r--r--nix/eval_test.go2
-rw-r--r--nix/pkgs.go2
6 files changed, 9 insertions, 9 deletions
diff --git a/cmd/nix-search/cache.go b/cmd/nix-search/cache.go
index 770a976..67cc790 100644
--- a/cmd/nix-search/cache.go
+++ b/cmd/nix-search/cache.go
@@ -9,7 +9,7 @@ import (
9 "os/exec" 9 "os/exec"
10 "strings" 10 "strings"
11 11
12 nix_search "git.sixfoisneuf.fr/nix-tools/nix" 12 nix "git.sixfoisneuf.fr/nix-tools/nix"
13) 13)
14 14
15type Cache struct { 15type Cache struct {
@@ -29,7 +29,7 @@ type nixenvResult struct {
29 Version string `json:"version"` 29 Version string `json:"version"`
30} 30}
31 31
32func generateCache(pkgs nix_search.Nixpkgs, output string) error { 32func generateCache(pkgs nix.Nixpkgs, output string) error {
33 33
34 version, err := pkgs.EvalString("pkgs.lib.version") 34 version, err := pkgs.EvalString("pkgs.lib.version")
35 if err != nil { 35 if err != nil {
diff --git a/cmd/nix-search/main.go b/cmd/nix-search/main.go
index 8736c3a..7a91888 100644
--- a/cmd/nix-search/main.go
+++ b/cmd/nix-search/main.go
@@ -6,7 +6,7 @@ import (
6 "log" 6 "log"
7 "os" 7 "os"
8 8
9 nix_search "git.sixfoisneuf.fr/nix-tools/nix" 9 nix "git.sixfoisneuf.fr/nix-tools/nix"
10) 10)
11 11
12var CACHE_FILE = os.ExpandEnv("$HOME/.cache/nix_search.gz") 12var CACHE_FILE = os.ExpandEnv("$HOME/.cache/nix_search.gz")
@@ -30,7 +30,7 @@ func main() {
30 flag.Usage = usage 30 flag.Usage = usage
31 flag.Parse() 31 flag.Parse()
32 32
33 pkgs, err := nix_search.LoadNixpkgs(*pkgsSource) 33 pkgs, err := nix.LoadNixpkgs(*pkgsSource)
34 if err != nil { 34 if err != nil {
35 log.Fatalf("Could not load %s: %v", *pkgsSource, err) 35 log.Fatalf("Could not load %s: %v", *pkgsSource, err)
36 } 36 }
diff --git a/cmd/nixos-search/options.go b/cmd/nixos-search/options.go
index 57b6e13..a03c585 100644
--- a/cmd/nixos-search/options.go
+++ b/cmd/nixos-search/options.go
@@ -5,7 +5,7 @@ import (
5 "fmt" 5 "fmt"
6 "strings" 6 "strings"
7 7
8 nix_search "git.sixfoisneuf.fr/nix-tools/nix" 8 nix "git.sixfoisneuf.fr/nix-tools/nix"
9) 9)
10 10
11type Option struct { 11type Option struct {
@@ -38,7 +38,7 @@ optionsDoc
38` 38`
39 39
40func LoadOptions(nixpkgs string) ([]Option, error) { 40func LoadOptions(nixpkgs string) ([]Option, error) {
41 pkgs, err := nix_search.LoadNixpkgs(nixpkgs) 41 pkgs, err := nix.LoadNixpkgs(nixpkgs)
42 if err != nil { 42 if err != nil {
43 return nil, fmt.Errorf("loading '%s': %v", nixpkgs, err) 43 return nil, fmt.Errorf("loading '%s': %v", nixpkgs, err)
44 } 44 }
diff --git a/nix/eval.go b/nix/eval.go
index d41532a..ae19fde 100644
--- a/nix/eval.go
+++ b/nix/eval.go
@@ -1,4 +1,4 @@
1package nix_search 1package nix
2 2
3import ( 3import (
4 "bytes" 4 "bytes"
diff --git a/nix/eval_test.go b/nix/eval_test.go
index 007fc00..5f0abb6 100644
--- a/nix/eval_test.go
+++ b/nix/eval_test.go
@@ -1,4 +1,4 @@
1package nix_search 1package nix
2 2
3import "testing" 3import "testing"
4 4
diff --git a/nix/pkgs.go b/nix/pkgs.go
index 0bf5316..c667132 100644
--- a/nix/pkgs.go
+++ b/nix/pkgs.go
@@ -1,4 +1,4 @@
1package nix_search 1package nix
2 2
3import ( 3import (
4 "fmt" 4 "fmt"