Adapt to nixpkgs' nativeCheckInputs change

[nix-pin-deps] / nix_pin_deps.py

diff --git a/nix_pin_deps.py b/nix_pin_deps.py
index 20988f58289b8a002c40f6c1a16d9c242a6357aa..297f7c17822f5e57e64f23876a77ad78ecc3889d 100644 (file)
--- a/nix_pin_deps.py
+++ b/nix_pin_deps.py
@@ -1,3 +1,10 @@
+# nix-pin-deps: gc-pin dependencies of a partially-built derivation
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, version 3.
+
+

 from contextlib import contextmanager
 import json
 import os
 from contextlib import contextmanager
 import json
 import os


@@ -6,9 +13,11 @@ import sys
 import xml.sax
 import xml.sax.handler
 
 import xml.sax
 import xml.sax.handler
 

+from typing import Any, Dict, Iterator, List, Set
+

 
 @contextmanager
 
 @contextmanager

-def log(msg):
+def log(msg: str) -> Iterator[None]:

     print(msg, file=sys.stderr, end='', flush=True)
     try:
         yield
     print(msg, file=sys.stderr, end='', flush=True)
     try:
         yield


@@ -17,12 +26,13 @@ def log(msg):
 
 
 class ParseNixStoreQueryGraphML(xml.sax.handler.ContentHandler):
 
 
 class ParseNixStoreQueryGraphML(xml.sax.handler.ContentHandler):

-    def __init__(self):
-        self.roots = set()
-        self.non_roots = set()
-        self.deps = {}
+    def __init__(self) -> None:
+        super().__init__()
+        self.roots: Set[str] = set()
+        self.non_roots: Set[str] = set()
+        self.deps: Dict[str, List[str]] = {}

 
 

-    def startElement(self, name, attrs):
+    def startElement(self, name: str, attrs: Any) -> None:

         if name == "edge":
             source = attrs.getValue("source")
             target = attrs.getValue("target")
         if name == "edge":
             source = attrs.getValue("source")
             target = attrs.getValue("target")


@@ -34,30 +44,30 @@ class ParseNixStoreQueryGraphML(xml.sax.handler.ContentHandler):
                 self.roots.add(source)
 
 
                 self.roots.add(source)
 
 

-def getDeps(drv):
+def getDeps(drv: str) -> ParseNixStoreQueryGraphML:

     with log("Loading dependency tree..."):
     with log("Loading dependency tree..."):

-        process = subprocess.Popen(
-            ["nix-store", "--query", "--graphml", drv], stdout=subprocess.PIPE)
-        parser = ParseNixStoreQueryGraphML()
-        xml.sax.parse(process.stdout, parser)
-        assert process.wait() == 0
+        with subprocess.Popen(
+                ["nix-store", "--query", "--graphml", drv], stdout=subprocess.PIPE) as process:
+            parser = ParseNixStoreQueryGraphML()
+            assert process.stdout
+            xml.sax.parse(process.stdout, parser)
+            assert process.wait() == 0

         return parser
 
 
         return parser
 
 

-def getDrvInfo(drv):
-    with log("Loading %s..." % drv):
-        process = subprocess.Popen(["nix",
-                                    "--experimental-features",
-                                    "nix-command",
-                                    "show-derivation",
-                                    "/nix/store/" + drv],
-                                   stdout=subprocess.PIPE)
-        info = json.load(process.stdout)
-        assert process.wait() == 0
+def getDrvInfo(drv: str) -> Any:
+    with log(f"Loading {drv}..."):
+        with subprocess.Popen(
+                ["nix", "--experimental-features", "nix-command",
+                    "show-derivation", "/nix/store/" + drv],
+                stdout=subprocess.PIPE) as process:
+            assert process.stdout
+            info = json.load(process.stdout)
+            assert process.wait() == 0

         return info
 
 
         return info
 
 

-def allBuilt(drv):
+def allBuilt(drv: str) -> bool:

     # TODO: How to pin outputs one at a time?
     # Currently, we only pin when all outputs are available.
     # It would be better to pin the outputs we've got.
     # TODO: How to pin outputs one at a time?
     # Currently, we only pin when all outputs are available.
     # It would be better to pin the outputs we've got.


@@ -65,26 +75,24 @@ def allBuilt(drv):
         drv).values() for o in d['outputs'].values())
 
 
         drv).values() for o in d['outputs'].values())
 
 

-def isDrv(thing):
+def isDrv(thing: str) -> bool:

     return thing.endswith(".drv")
 
 
     return thing.endswith(".drv")
 
 

-def removesuffix(s, suf):
+def removesuffix(s: str, suf: str) -> str:

     return s[:-len(suf)] if s.endswith(suf) else s
 
 
     return s[:-len(suf)] if s.endswith(suf) else s
 
 

-def pin(drv):
+def pin(drv: str) -> None:

     outPath = os.path.join(sys.argv[2], removesuffix(drv, ".drv"))
     if not os.path.exists(outPath):
     outPath = os.path.join(sys.argv[2], removesuffix(drv, ".drv"))
     if not os.path.exists(outPath):

-        process = subprocess.run(["nix-store",
-                                  "--realise",
-                                  "--add-root",
-                                  outPath,
-                                  "/nix/store/" + drv],
-                                 check=True)
+        subprocess.run(["nix-store", "--realise", "--add-root",
+                       outPath, "/nix/store/" + drv], check=True)

 
 
 
 

-def pinBuiltThings(thing, done, deps):
+def pinBuiltThings(thing: str,
+                   done: Set[str],
+                   deps: Dict[str, List[str]]) -> None:

     if thing in done:
         return
     done.add(thing)
     if thing in done:
         return
     done.add(thing)


@@ -95,6 +103,11 @@ def pinBuiltThings(thing, done, deps):
         pinBuiltThings(dep, done, deps)
 
 
         pinBuiltThings(dep, done, deps)
 
 

-dep_graph = getDeps(sys.argv[1])
-for root in dep_graph.roots:
-    pinBuiltThings(root, set(), dep_graph.deps)
+def main() -> None:
+    dep_graph = getDeps(sys.argv[1])
+    for root in dep_graph.roots:
+        pinBuiltThings(root, set(), dep_graph.deps)
+
+
+if __name__ == '__main__':
+    main()