test ubuntu

abathur · Sep 20, 2023 · d9932c5 · d9932c5
1 parent 90becc1
commit d9932c5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 25 deletions.
diff --git a/nixpkgs/test.nix b/nixpkgs/test.nix
@@ -25,11 +25,12 @@
 , rlwrap
 , gnutar
 , bc
+, flatpak
 }:
 
 let
   default_packages = [ bash file findutils gettext ];
-  parsed_packages = [ coreutils sqlite unixtools.script gnused gawk findutils rlwrap gnutar bc ];
+  parsed_packages = [ coreutils sqlite unixtools.script gnused gawk findutils rlwrap gnutar bc ] ++ lib.optionals stdenv.hostPlatform.isLinux [ flatpak ];
 in
 rec {
   module1 = resholve.mkDerivation {

diff --git a/resholve b/resholve
@@ -1395,9 +1395,9 @@ class CommandParser(theirparse.ArgumentParser):
       - version, variant, description of how they differ, platform
     """
 
-    def __init__(self, name, variant="generic"):
+    def __init__(self, name, variant="generic"):  # , **kwargs):
         theirparse.ArgumentParser.__init__(
-            self, prog="{:} ({:})".format(name, variant), add_help=False
+            self, prog="{:} ({:})".format(name, variant), add_help=False  # , **kwargs
         )
         self.register("action", "invocations", InvocationsAction)
         # self.register("action", "invocation", InvocationAction)
@@ -2404,33 +2404,27 @@ class ExternalCommandParsers(object):
 
         # flatpak --help
         generic.add_argument(
-            "-h", "--help",
+            "-h",
+            "--help",
             "--version",
             "--default-arch",
             "--supported-arches",
             "--gl-drivers",
             "--installations",
             "--print-updated-env",
             "--print-system-only",
-            "-v", "--verbose",
+            "-v",
+            "--verbose",
             "--ostree-verbose",
-            action="store_true"
+            action="store_true",
         )
         subparsers = generic.add_subparsers()
         # flatpak update --help
         update = subparsers.add_parser("update")
         update.add_argument(
-            "-h", "--help",
-            "-u", "--user",
-            "--system",
-            action="store_true"
-        )
-        update.add_argument(
-            "--installation",
-            "--arch",
-            "--commit",
-            nargs=1
+            "-h", "--help", "-u", "--user", "--system", action="store_true"
         )
+        update.add_argument("--installation", "--arch", "--commit", nargs=1)
         update.add_argument(
             "--force-remove",
             "--no-pull",
@@ -2441,19 +2435,16 @@ class ExternalCommandParsers(object):
             "--runtime",
             "--app",
             "--appstream",
-            action="store_true"
+            action="store_true",
         )
         update.add_argument("--subpath", nargs=1)
         update.add_argument(
-            "-y", "--assumeyes",
+            "-y",
+            "--assumeyes",
             "--noninteractive",
         )
         update.add_argument("--sideload-repo", nargs=1)
-        update.add_argument(
-            "-v", "--verbose",
-            "--ostree-verbose",
-            action="store_true"
-        )
+        update.add_argument("-v", "--verbose", "--ostree-verbose", action="store_true")
 
         return (generic,)
 
@@ -3899,8 +3890,8 @@ class RecordCommandlike(object):
         return True
 
     def handle_external_generic(self, parsed, invocation):
-        if not hasattr(parsed, "commands"):
-            return True
+        # if not hasattr(parsed, "commands"):
+        #     return True
 
         # TODO: shimming shells in here may be a bigger crime than
         #       duplicating the logic in two functions would be?