diff options
| author | Florian Klink <flokli@flokli.de> | 2023-10-05T15·26+0300 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2023-10-05T18·47+0000 |
| commit | 61e5a63fe1afcca76c05d9eedaea9fb3c8919101 (patch) | |
| tree | f34bb7fe325090bf71baeca15d5efbbdc160bfa4 /tvix/nar-bridge/pkg/http | |
| parent | 600815c16846de7428f554313657e4f3f934fc0a (diff) | |
chore(tvix/nar-bridge): bump go-nix dependency r/6713
nixpath.FromString -> storepath.FromAbsolutePath. See https://github.com/nix-community/go-nix/pull/113 for details. Closes: https://b.tvl.fyi/issues/314 Change-Id: I25277fb6006cbbb2a323ffb5809a1be500822a97 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9551 Autosubmit: flokli <flokli@flokli.de> Tested-by: BuildkiteCI Reviewed-by: Connor Brewster <cbrewster@hey.com>
Diffstat (limited to 'tvix/nar-bridge/pkg/http')
| -rw-r--r-- | tvix/nar-bridge/pkg/http/narinfo_get.go | 4 | ||||
| -rw-r--r-- | tvix/nar-bridge/pkg/http/narinfo_put.go | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tvix/nar-bridge/pkg/http/narinfo_get.go b/tvix/nar-bridge/pkg/http/narinfo_get.go index a03aff7339fc..93192c03e52e 100644 --- a/tvix/nar-bridge/pkg/http/narinfo_get.go +++ b/tvix/nar-bridge/pkg/http/narinfo_get.go @@ -19,7 +19,7 @@ import ( "github.com/nix-community/go-nix/pkg/narinfo" "github.com/nix-community/go-nix/pkg/narinfo/signature" "github.com/nix-community/go-nix/pkg/nixbase32" - "github.com/nix-community/go-nix/pkg/nixpath" + "github.com/nix-community/go-nix/pkg/storepath" log "github.com/sirupsen/logrus" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" @@ -92,7 +92,7 @@ func renderNarinfo( } narInfo := narinfo.NarInfo{ - StorePath: path.Join(nixpath.StoreDir, string(nodeName)), + StorePath: path.Join(storepath.StoreDir, string(nodeName)), URL: "nar/" + nixbase32.EncodeToString(narHash.Digest()) + ".nar", Compression: "none", // TODO: implement zstd compression NarHash: narHash, diff --git a/tvix/nar-bridge/pkg/http/narinfo_put.go b/tvix/nar-bridge/pkg/http/narinfo_put.go index 831f93fbdf77..6494bca6f20d 100644 --- a/tvix/nar-bridge/pkg/http/narinfo_put.go +++ b/tvix/nar-bridge/pkg/http/narinfo_put.go @@ -9,7 +9,7 @@ import ( "github.com/go-chi/chi/v5" "github.com/nix-community/go-nix/pkg/narinfo" "github.com/nix-community/go-nix/pkg/nixbase32" - "github.com/nix-community/go-nix/pkg/nixpath" + "github.com/nix-community/go-nix/pkg/storepath" "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus" ) @@ -82,7 +82,7 @@ func registerNarinfoPut(s *Server) { // the bytes in pathInfo.References, and the full strings in pathInfo.Narinfo.ReferenceNames. referencesBytes := make([][]byte, 0) for _, reference := range narInfo.References { - np, err := nixpath.FromString(path.Join(nixpath.StoreDir, reference)) + storePath, err := storepath.FromString(reference) if err != nil { log.WithField("reference", reference).WithError(err).Error("unable to parse reference") w.WriteHeader(http.StatusBadRequest) @@ -93,7 +93,7 @@ func registerNarinfoPut(s *Server) { return } - referencesBytes = append(referencesBytes, np.Digest) + referencesBytes = append(referencesBytes, storePath.Digest) } // assemble the []*storev1pb.NARInfo_Signature{} from narinfo.Signatures. |