diff --git a/checks/lib/container-driver/test_driver/logger.py b/checks/lib/container-driver/test_driver/logger.py index 309801b84..920333149 100644 --- a/checks/lib/container-driver/test_driver/logger.py +++ b/checks/lib/container-driver/test_driver/logger.py @@ -241,7 +241,7 @@ class TerminalLogger(AbstractLogger): class XMLLogger(AbstractLogger): def __init__(self, outfile: str) -> None: - self.logfile_handle = codecs.open(outfile, "wb") + self.logfile_handle = codecs.open(outfile, "wb") # noqa: SIM115 self.xml = XMLGenerator(self.logfile_handle, encoding="utf-8") self.queue: Queue[dict[str, str]] = Queue() diff --git a/flake.lock b/flake.lock index 6b7202b31..7fca7a00d 100644 --- a/flake.lock +++ b/flake.lock @@ -78,11 +78,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728538411, - "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", + "lastModified": 1729265718, + "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221", + "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", "type": "github" }, "original": { diff --git a/pkgs/clan-cli/default.nix b/pkgs/clan-cli/default.nix index 913cb5693..3357f98a1 100644 --- a/pkgs/clan-cli/default.nix +++ b/pkgs/clan-cli/default.nix @@ -16,6 +16,7 @@ runCommand, setuptools, stdenv, + nixVersions, # custom args clan-core-path, @@ -67,24 +68,33 @@ let ''; # Create a custom nixpkgs for use within the project - nixpkgs' = runCommand "nixpkgs" { nativeBuildInputs = [ nix ]; } '' - mkdir $out - cat > $out/flake.nix << EOF - { - description = "dependencies for the clan-cli"; - inputs = { - nixpkgs.url = "path://${nixpkgs}"; - }; + nixpkgs' = + runCommand "nixpkgs" + { + nativeBuildInputs = [ + # old nix version doesn't support --flake flag + (if lib.versionAtLeast nix.version "2.24" then nix else nixVersions.latest) + ]; + } + '' + mkdir $out + cat > $out/flake.nix << EOF + { + description = "dependencies for the clan-cli"; - outputs = _inputs: { }; - } - EOF - ln -sf ${nixpkgs} $out/path - nix flake update $out \ - --store ./. \ - --extra-experimental-features 'nix-command flakes' - ''; + inputs = { + nixpkgs.url = "path://${nixpkgs}"; + }; + + outputs = _inputs: { }; + } + EOF + ln -sf ${nixpkgs} $out/path + HOME=$TMPDIR nix flake update --flake $out \ + --store ./. \ + --extra-experimental-features 'nix-command flakes' + ''; in python3.pkgs.buildPythonApplication { name = "clan-cli"; diff --git a/pkgs/clan-vm-manager/clan_vm_manager/components/trayicon.py b/pkgs/clan-vm-manager/clan_vm_manager/components/trayicon.py index ccdbee6e8..e126faf73 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/components/trayicon.py +++ b/pkgs/clan-vm-manager/clan_vm_manager/components/trayicon.py @@ -531,12 +531,12 @@ class StatusNotifierImplementation(BaseImplementation): ): self.add_method(method_name, in_args, out_args, callback) - for signal_name, value in ( + for signal_name, signal_value in ( ("NewIcon", ()), ("NewIconThemePath", ("s",)), ("NewStatus", ("s",)), ): - self.add_signal(signal_name, value) + self.add_signal(signal_name, signal_value) def register(self): self.menu.register()