Name git pins

diff --git a/channels b/channels
index 3f48dcc87c55c0b5093353a1342c1e03f2bc6f20..dc1f75454751822a85518060fbb7a155aad940ee 100644 (file)
--- a/channels
+++ b/channels
@@ -2,3 +2,8 @@
 channel_url = https://channels.nixos.org/nixos-20.03
 git_repo = https://github.com/NixOS/nixpkgs.git
 git_ref = nixos-20.03
 channel_url = https://channels.nixos.org/nixos-20.03
 git_repo = https://github.com/NixOS/nixpkgs.git
 git_ref = nixos-20.03

+
+[nixos-hardware]
+git_repo = https://github.com/NixOS/nixos-hardware.git
+git_ref = master
+

diff --git a/pinch.py b/pinch.py
index 6ad2cdccbd991d596e7974f563d7844218461d96..ae2c7ec14a3e983015e2f3ddb57df6bfb4df899a 100644 (file)
--- a/pinch.py
+++ b/pinch.py
@@ -399,6 +399,22 @@ def pin_channel(v: Verification, channel: Channel) -> None:
     check_channel_contents(v, channel)
 
 
     check_channel_contents(v, channel)
 
 

+def git_revision_name(v: Verification, channel: Channel) -> str:
+    v.status('Getting commit date')
+    process = subprocess.run(['git',
+                              '-C',
+                              channel.git_cachedir,
+                              'lo',
+                              '-n1',
+                              '--format=%ct-%h',
+                              '--abbrev=11',
+                              channel.git_revision],
+                             capture_output=True)
+    v.result(process.returncode == 0 and process.stdout != '')
+    return '%s-%s' % (os.path.basename(channel.git_repo),
+                      process.stdout.decode().strip())
+
+

 def make_channel(conf: configparser.SectionProxy) -> Channel:
     channel = Channel(**dict(conf.items()))
     if hasattr(channel, 'git_revision'):
 def make_channel(conf: configparser.SectionProxy) -> Channel:
     channel = Channel(**dict(conf.items()))
     if hasattr(channel, 'git_revision'):


@@ -420,6 +436,7 @@ def pin(args: argparse.Namespace) -> None:
             config[section]['tarball_sha256'] = channel.table['nixexprs.tar.xz'].digest
         else:
             git_fetch(v, channel)
             config[section]['tarball_sha256'] = channel.table['nixexprs.tar.xz'].digest
         else:
             git_fetch(v, channel)

+            config[section]['name'] = git_revision_name(v, channel)

         config[section]['git_revision'] = channel.git_revision
 
     with open(args.channels_file, 'w') as configfile:
         config[section]['git_revision'] = channel.git_revision
 
     with open(args.channels_file, 'w') as configfile: