From 61e5a63fe1afcca76c05d9eedaea9fb3c8919101 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 5 Oct 2023 18:26:30 +0300 Subject: chore(tvix/nar-bridge): bump go-nix dependency 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 Tested-by: BuildkiteCI Reviewed-by: Connor Brewster --- tvix/nar-bridge/pkg/pathinfosvc/server.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tvix/nar-bridge/pkg/pathinfosvc/server.go') diff --git a/tvix/nar-bridge/pkg/pathinfosvc/server.go b/tvix/nar-bridge/pkg/pathinfosvc/server.go index 545966b204..116d06e6b6 100644 --- a/tvix/nar-bridge/pkg/pathinfosvc/server.go +++ b/tvix/nar-bridge/pkg/pathinfosvc/server.go @@ -16,7 +16,7 @@ import ( mh "github.com/multiformats/go-multihash/core" "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" "github.com/ulikunitz/xz" "google.golang.org/grpc/codes" @@ -246,7 +246,7 @@ func (p *PathInfoServiceServer) Get(ctx context.Context, getPathInfoRequest *sto // set the root node name to the basename of the output path in the narInfo. // currently the root node has no name yet. - outPath, err := nixpath.FromString(narInfo.StorePath) + outPath, err := storepath.FromAbsolutePath(narInfo.StorePath) if err != nil { // unreachable due to nixpath.Check() panic(err) -- cgit 1.4.1