Union,
)
+import git_cache
+
# Use xdg module when it's less painful to have as a dependency
git_repo: str
def pin(self, v: Verification, old_pin: Optional[Pin]) -> GitPin:
+ _, new_revision = git_cache.fetch(self.git_repo, self.git_ref)
if old_pin is not None:
assert isinstance(old_pin, GitPin)
- old_revision = old_pin.git_revision if old_pin is not None else None
-
- new_revision = git_fetch(v, self, None, old_revision)
+ verify_git_ancestry(v, self, old_pin.git_revision, new_revision)
return GitPin(release_name=git_revision_name(v, self, new_revision),
git_revision=new_revision)
def fetch(self, v: Verification, pin: Pin) -> str:
assert isinstance(pin, GitPin)
- ensure_git_rev_available(v, self, pin, None)
+ git_cache.ensure_rev_available(
+ self.git_repo, self.git_ref, pin.git_revision)
return git_get_tarball(v, self, pin)
def pin(self, v: Verification, old_pin: Optional[Pin]) -> ChannelPin:
if old_pin is not None:
assert isinstance(old_pin, ChannelPin)
- old_revision = old_pin.git_revision if old_pin is not None else None
channel_html, forwarded_url = fetch_channel(v, self)
table, new_gitpin = parse_channel(v, channel_html)
+ if old_pin is not None and old_pin.git_revision == new_gitpin.git_revision:
+ return old_pin
fetch_resources(v, new_gitpin, forwarded_url, table)
- ensure_git_rev_available(v, self, new_gitpin, old_revision)
+ git_cache.ensure_rev_available(
+ self.git_repo, self.git_ref, new_gitpin.git_revision)
+ if old_pin is not None:
+ verify_git_ancestry(
+ v, self, old_pin.git_revision, new_gitpin.git_revision)
check_channel_contents(v, self, table, new_gitpin)
return ChannelPin(
release_name=new_gitpin.release_name,
def fetch_channel(
v: Verification, channel: ChannelSearchPath) -> Tuple[str, str]:
- v.status('Fetching channel')
+ v.status('Fetching channel from %s' % channel.channel_url)
request = urllib.request.urlopen(channel.channel_url, timeout=10)
channel_html = request.read().decode()
forwarded_url = request.geturl()
return Digest16(hasher.hexdigest())
+@functools.lru_cache
+def _experimental_flag_needed(v: Verification) -> bool:
+ v.status('Checking Nix version')
+ process = subprocess.run(['nix', '--help'], stdout=subprocess.PIPE)
+ v.result(process.returncode == 0)
+ return b'--experimental-features' in process.stdout
+
+
+def _nix_command(v: Verification) -> List[str]:
+ return ['nix', '--experimental-features',
+ 'nix-command'] if _experimental_flag_needed(v) else ['nix']
+
+
def to_Digest16(v: Verification, digest32: Digest32) -> Digest16:
v.status('Converting digest to base16')
- process = subprocess.run(
- ['nix', 'to-base16', '--type', 'sha256', digest32], stdout=subprocess.PIPE)
+ process = subprocess.run(_nix_command(v) + [
+ 'to-base16',
+ '--type',
+ 'sha256',
+ digest32],
+ stdout=subprocess.PIPE)
v.result(process.returncode == 0)
return Digest16(process.stdout.decode().strip())
def to_Digest32(v: Verification, digest16: Digest16) -> Digest32:
v.status('Converting digest to base32')
- process = subprocess.run(
- ['nix', 'to-base32', '--type', 'sha256', digest16], stdout=subprocess.PIPE)
+ process = subprocess.run(_nix_command(v) + [
+ 'to-base32',
+ '--type',
+ 'sha256',
+ digest16],
+ stdout=subprocess.PIPE)
v.result(process.returncode == 0)
return Digest32(process.stdout.decode().strip())
assert empty == ''
v.check("Verifying nix-prefetch-url's digest",
to_Digest16(v, Digest32(prefetch_digest)) == digest)
- v.status("Verifying file digest")
+ v.status("Verifying digest of %s" % path)
file_digest = digest_file(path)
v.result(file_digest == digest)
return path # type: ignore # (for old mypy)
v.result(open(table['git-revision'].file).read(999) == pin.git_revision)
-def git_cachedir(git_repo: str) -> str:
- return os.path.join(
- xdg.XDG_CACHE_HOME,
- 'pinch/git',
- digest_string(git_repo.encode()))
-
-
def tarball_cache_file(channel: TarrableSearchPath, pin: GitPin) -> str:
return os.path.join(
xdg.XDG_CACHE_HOME,
def verify_git_ancestry(
v: Verification,
channel: TarrableSearchPath,
- new_revision: str,
- old_revision: Optional[str]) -> None:
- cachedir = git_cachedir(channel.git_repo)
- v.status('Verifying rev is an ancestor of ref')
+ old_revision: str,
+ new_revision: str) -> None:
+ cachedir = git_cache.git_cachedir(channel.git_repo)
+ v.status('Verifying rev is an ancestor of previous rev %s' % old_revision)
process = subprocess.run(['git',
'-C',
cachedir,
'merge-base',
'--is-ancestor',
- new_revision,
- channel.git_ref])
+ old_revision,
+ new_revision])
v.result(process.returncode == 0)
- if old_revision is not None:
- v.status(
- 'Verifying rev is an ancestor of previous rev %s' %
- old_revision)
- process = subprocess.run(['git',
- '-C',
- cachedir,
- 'merge-base',
- '--is-ancestor',
- old_revision,
- new_revision])
- v.result(process.returncode == 0)
-
-
-def git_fetch(
- v: Verification,
- channel: TarrableSearchPath,
- desired_revision: Optional[str],
- old_revision: Optional[str]) -> str:
- # It would be nice if we could share the nix git cache, but as of the time
- # of writing it is transitioning from gitv2 (deprecated) to gitv3 (not ready
- # yet), and trying to straddle them both is too far into nix implementation
- # details for my comfort. So we re-implement here half of nix.fetchGit.
- # :(
-
- cachedir = git_cachedir(channel.git_repo)
- if not os.path.exists(cachedir):
- v.status("Initializing git repo")
- process = subprocess.run(
- ['git', 'init', '--bare', cachedir])
- v.result(process.returncode == 0)
-
- v.status('Fetching ref "%s" from %s' % (channel.git_ref, channel.git_repo))
- # We don't use --force here because we want to abort and freak out if forced
- # updates are happening.
- process = subprocess.run(['git',
- '-C',
- cachedir,
- 'fetch',
- channel.git_repo,
- '%s:%s' % (channel.git_ref,
- channel.git_ref)])
- v.result(process.returncode == 0)
-
- if desired_revision is not None:
- v.status('Verifying that fetch retrieved this rev')
- process = subprocess.run(
- ['git', '-C', cachedir, 'cat-file', '-e', desired_revision])
- v.result(process.returncode == 0)
-
- new_revision = open(
- os.path.join(
- cachedir,
- 'refs',
- 'heads',
- channel.git_ref)).read(999).strip()
-
- verify_git_ancestry(v, channel, new_revision, old_revision)
-
- return new_revision
-
-
-def ensure_git_rev_available(
- v: Verification,
- channel: TarrableSearchPath,
- pin: GitPin,
- old_revision: Optional[str]) -> None:
- cachedir = git_cachedir(channel.git_repo)
- if os.path.exists(cachedir):
- v.status('Checking if we already have this rev:')
- process = subprocess.run(
- ['git', '-C', cachedir, 'cat-file', '-e', pin.git_revision])
- if process.returncode == 0:
- v.status('yes')
- if process.returncode == 1:
- v.status('no')
- v.result(process.returncode == 0 or process.returncode == 1)
- if process.returncode == 0:
- verify_git_ancestry(v, channel, pin.git_revision, old_revision)
- return
- git_fetch(v, channel, pin.git_revision, old_revision)
-
def compare_tarball_and_git(
v: Verification,
v.status('Checking out corresponding git revision')
git = subprocess.Popen(['git',
'-C',
- git_cachedir(channel.git_repo),
+ git_cache.git_cachedir(channel.git_repo),
'archive',
pin.git_revision],
stdout=subprocess.PIPE)
pin.git_revision)
git = subprocess.Popen(['git',
'-C',
- git_cachedir(channel.git_repo),
+ git_cache.git_cachedir(channel.git_repo),
'archive',
'--prefix=%s/' % pin.release_name,
pin.git_revision],
v.status('Getting commit date')
process = subprocess.run(['git',
'-C',
- git_cachedir(channel.git_repo),
+ git_cache.git_cachedir(channel.git_repo),
'log',
'-n1',
'--format=%ct-%h',
def updateCommand(args: argparse.Namespace) -> None:
v = Verification()
exprs: Dict[str, str] = {}
+ profile_manifest = os.path.join(args.profile, "manifest.nix")
+ search_paths: List[str] = [
+ "-I", "pinch_profile=" + args.profile,
+ "-I", "pinch_profile_manifest=" + os.readlink(profile_manifest)
+ ] if os.path.exists(profile_manifest) else []
config = {
section: read_pinned_config_section(section, conf) for section,
conf in read_config_files(
alias, nonalias = partition_dict(
lambda k, v: isinstance(v[0], AliasSearchPath), config)
- for section, (sp, pin) in nonalias.items():
+ for section, (sp, pin) in sorted(nonalias.items()):
assert not isinstance(sp, AliasSearchPath) # mypy can't see through
assert not isinstance(pin, AliasPin) # partition_dict()
tarball = sp.fetch(v, pin)
+ search_paths.extend(["-I", "pinch_tarball_for_%s=%s" %
+ (pin.release_name, tarball)])
exprs[section] = (
'f: f { name = "%s"; channelName = "%%s"; src = builtins.storePath "%s"; }' %
(pin.release_name, tarball))
command = [
'nix-env',
'--profile',
- '/nix/var/nix/profiles/per-user/%s/channels' %
- getpass.getuser(),
+ args.profile,
'--show-trace',
'--file',
'<nix/unpack-channel.nix>',
'--install',
- '--from-expression'] + [exprs[name] % name for name in sorted(exprs.keys())]
+ ] + search_paths + ['--from-expression'] + [
+ exprs[name] % name for name in sorted(exprs.keys())]
if args.dry_run:
print(' '.join(map(shlex.quote, command)))
else:
parser_pin.set_defaults(func=pinCommand)
parser_update = subparsers.add_parser('update')
parser_update.add_argument('--dry-run', action='store_true')
+ parser_update.add_argument('--profile', default=(
+ '/nix/var/nix/profiles/per-user/%s/channels' % getpass.getuser()))
parser_update.add_argument('channels_file', type=str, nargs='+')
parser_update.set_defaults(func=updateCommand)
args = parser.parse_args()
projects / pinch / blobdiff