[remove nixpkgs] Naming: update Package methods to InputAddressedPath and ContentAddressedPath, and s/BinaryStore/BinaryCache

[savil]

Summary

This PR is a follow up to this request from @gcurtis:
#1256 (review)

BUT having NixStorePath and ContentAddressedPath seemed odd since content-addressed paths
are also nix store paths. So, in this PR, I'm explicit about NixStorePath being
InputAddressedPath.

Also - changed BinaryStore to BinaryCache.

RFC:
I didn't change the lock.SystemInfo struct, I've left it as:

type SystemInfo struct {
	// StorePath is the input-addressed path for the nix package in /nix/store
	// It is the cache key in the Binary Cache Store (cache.nixos.org)
	// It is of the form <hash>-<name>-<version>
	// <name> may be different from the canonicalName so we store the full store path.
	StorePath string `json:"store_path,omitempty"`
	// CAStorePath is the content-addressed path for the nix package in /nix/store
	// It is of the form <hash>-<name>-<version>
	CAStorePath string `json:"ca_store_path,omitempty"`
}

I think this could be okay, because the default store_path for nix is input-addressed, for now at least.

If you'd like I can change StorePath to be explicitly:

InputAddrStorePath string `json:"input_addr_path, omitempty"
ContentAddrStorePath string `json:"content_addr_path, omitempty"

Let me know!

How was it tested?

compiles

[savil]

Current dependencies on/for this PR:

• main
  • PR [remove nixpkgs] Naming: update Package methods to InputAddressedPath and ContentAddressedPath, and s/BinaryStore/BinaryCache #1257 👈

This comment was auto-generated by Graphite.

[LucilleH]

oh this is much clearer!

[gcurtis]

Thanks! This made things a lot easier to understand.

[savil]

will revert this line