X-Git-Url: http://git.scottworley.com/pinch/blobdiff_plain/736c25ebc1f9814c84429ed9dd16cd23104576f5..17906b2786e4c5e57a66874fd78c9cf70e074677:/pinch.py?ds=sidebyside

diff --git a/pinch.py b/pinch.py
index 5bb4e95..b147100 100644
--- a/pinch.py
+++ b/pinch.py
@@ -7,8 +7,10 @@ import hashlib
 import operator
 import os
 import os.path
+import shlex
 import shutil
 import subprocess
+import sys
 import tempfile
 import types
 import urllib.parse
@@ -36,6 +38,7 @@ class ChannelTableEntry(types.SimpleNamespace):
 
 
 class Channel(types.SimpleNamespace):
+    alias_of: str
     channel_html: bytes
     channel_url: str
     forwarded_url: str
@@ -57,7 +60,7 @@ class Verification:
         self.line_length = 0
 
     def status(self, s: str) -> None:
-        print(s, end=' ', flush=True)
+        print(s, end=' ', file=sys.stderr, flush=True)
         self.line_length += 1 + len(s)  # Unicode??
 
     @staticmethod
@@ -69,7 +72,7 @@ class Verification:
         length = len(message)
         cols = shutil.get_terminal_size().columns
         pad = (cols - (self.line_length + length)) % cols
-        print(' ' * pad + self._color(message, color))
+        print(' ' * pad + self._color(message, color), file=sys.stderr)
         self.line_length = 0
         if not r:
             raise VerificationError()
@@ -215,7 +218,7 @@ def fetch_resources(v: Verification, channel: Channel) -> None:
 def git_cachedir(git_repo: str) -> str:
     # TODO: Consider using pyxdg to find this path.
     return os.path.expanduser(
-        '~/.cache/nix-pin-channel/git/%s' %
+        '~/.cache/pinch/git/%s' %
         digest_string(
             git_repo.encode()))
 
@@ -458,8 +461,15 @@ def pin(args: argparse.Namespace) -> None:
     config = configparser.ConfigParser()
     config.read_file(open(args.channels_file), args.channels_file)
     for section in config.sections():
+        if args.channels and section not in args.channels:
+            continue
 
         channel = Channel(**dict(config[section].items()))
+
+        if hasattr(channel, 'alias_of'):
+            assert not hasattr(channel, 'git_repo')
+            continue
+
         if hasattr(channel, 'git_revision'):
             channel.old_git_revision = channel.git_revision
             del channel.git_revision
@@ -482,8 +492,13 @@ def update(args: argparse.Namespace) -> None:
     v = Verification()
     config = configparser.ConfigParser()
     config.read_file(open(args.channels_file), args.channels_file)
-    exprs = []
+    exprs = {}
     for section in config.sections():
+
+        if 'alias_of' in config[section]:
+            assert 'git_repo' not in config[section]
+            continue
+
         if 'channel_url' in config[section]:
             tarball = fetch_with_nix_prefetch_url(
                 v, config[section]['tarball_url'], Digest16(
@@ -492,23 +507,31 @@ def update(args: argparse.Namespace) -> None:
             channel = Channel(**dict(config[section].items()))
             ensure_git_rev_available(v, channel)
             tarball = git_get_tarball(v, channel)
-        exprs.append(
-            'f: f { name = "%s"; channelName = "%s"; src = builtins.storePath "%s"; }' %
-            (config[section]['release_name'], section, tarball))
-    v.status('Installing channels with nix-env')
-    process = subprocess.run(
-        [
-            'nix-env',
-            '--profile',
-            '/nix/var/nix/profiles/per-user/%s/channels' %
-            getpass.getuser(),
-            '--show-trace',
-            '--file',
-            '<nix/unpack-channel.nix>',
-            '--install',
-            '--from-expression'] +
-        exprs)
-    v.result(process.returncode == 0)
+
+        exprs[section] = (
+            'f: f { name = "%s"; channelName = "%%s"; src = builtins.storePath "%s"; }' %
+            (config[section]['release_name'], tarball))
+
+    for section in config.sections():
+        if 'alias_of' in config[section]:
+            exprs[section] = exprs[str(config[section]['alias_of'])]
+
+    command = [
+        'nix-env',
+        '--profile',
+        '/nix/var/nix/profiles/per-user/%s/channels' %
+        getpass.getuser(),
+        '--show-trace',
+        '--file',
+        '<nix/unpack-channel.nix>',
+        '--install',
+        '--from-expression'] + [exprs[name] % name for name in sorted(exprs.keys())]
+    if args.dry_run:
+        print(' '.join(map(shlex.quote, command)))
+    else:
+        v.status('Installing channels with nix-env')
+        process = subprocess.run(command)
+        v.result(process.returncode == 0)
 
 
 def main() -> None:
@@ -516,8 +539,10 @@ def main() -> None:
     subparsers = parser.add_subparsers(dest='mode', required=True)
     parser_pin = subparsers.add_parser('pin')
     parser_pin.add_argument('channels_file', type=str)
+    parser_pin.add_argument('channels', type=str, nargs='*')
     parser_pin.set_defaults(func=pin)
     parser_update = subparsers.add_parser('update')
+    parser_update.add_argument('--dry-run', action='store_true')
     parser_update.add_argument('channels_file', type=str)
     parser_update.set_defaults(func=update)
     args = parser.parse_args()