yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'fix nixpkgs command with latest nix version' (#2267) from nixpkgs-fix into main

Browse Source 
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/2267
This commit is contained in:
Mic92
2024-10-22 10:58:33 +00:00
parent 78bf5b9147 56cbee45cd
commit b21550eb40
4 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
checks/lib/container-driver/test_driver/logger.py
View File

@@ -241,7 +241,7 @@ class TerminalLogger(AbstractLogger):
class XMLLogger(AbstractLogger): class XMLLogger(AbstractLogger):
def __init__(self, outfile: str) -> None: 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.xml = XMLGenerator(self.logfile_handle, encoding="utf-8")
self.queue: Queue[dict[str, str]] = Queue() self.queue: Queue[dict[str, str]] = Queue()

6
flake.lock generated
View File

@@ -78,11 +78,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1728538411, "lastModified": 1729265718,
"narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221", "rev": "ccc0c2126893dd20963580b6478d1a10a4512185",
"type": "github" "type": "github"
}, },
"original": { "original": {

42
pkgs/clan-cli/default.nix
View File

@@ -16,6 +16,7 @@
runCommand, runCommand,
setuptools, setuptools,
stdenv, stdenv,
nixVersions,
# custom args # custom args
clan-core-path, clan-core-path,
@@ -67,24 +68,33 @@ let
''; '';
# Create a custom nixpkgs for use within the project # 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' =
nixpkgs.url = "path://${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: { }; inputs = {
} nixpkgs.url = "path://${nixpkgs}";
EOF };
ln -sf ${nixpkgs} $out/path
nix flake update $out \ outputs = _inputs: { };
--store ./. \ }
--extra-experimental-features 'nix-command flakes' EOF
''; ln -sf ${nixpkgs} $out/path
HOME=$TMPDIR nix flake update --flake $out \
--store ./. \
--extra-experimental-features 'nix-command flakes'
'';
in in
python3.pkgs.buildPythonApplication { python3.pkgs.buildPythonApplication {
name = "clan-cli"; name = "clan-cli";

4
pkgs/clan-vm-manager/clan_vm_manager/components/trayicon.py
View File

@@ -531,12 +531,12 @@ class StatusNotifierImplementation(BaseImplementation):
): ):
self.add_method(method_name, in_args, out_args, callback) self.add_method(method_name, in_args, out_args, callback)
for signal_name, value in ( for signal_name, signal_value in (
("NewIcon", ()), ("NewIcon", ()),
("NewIconThemePath", ("s",)), ("NewIconThemePath", ("s",)),
("NewStatus", ("s",)), ("NewStatus", ("s",)),
): ):
self.add_signal(signal_name, value) self.add_signal(signal_name, signal_value)
def register(self): def register(self):
self.menu.register() self.menu.register()