clan/clan-core
12
4
Fork 19
Code Issues 108 Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

update flake lock #838

Merged
clan-bot merged 2 commits from Qubasa-main into main 2024-02-12 12:03:30 +00:00
Conversation 0 Commits 2 Files Changed 4 +37 -22
4 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
checks/borgbackup/default.nix
View File

@ -1,4 +1,4 @@
(import ../lib/container-test.nix) ({ ... }: { (import ../lib/test-base.nix) ({ ... }: {
name = "borgbackup"; name = "borgbackup";
nodes.machine = { self, ... }: { nodes.machine = { self, ... }: {
@ -18,11 +18,20 @@
clanCore.clanDir = ./.; clanCore.clanDir = ./.;
clanCore.state.testState.folders = [ "/etc/state" ]; clanCore.state.testState.folders = [ "/etc/state" ];
environment.etc.state.text = "hello world"; environment.etc.state.text = "hello world";
systemd.tmpfiles.settings = {
"ssh-key"."/root/.ssh/id_ed25519" = {
C.argument = "${../lib/ssh/privkey}";
z = {
mode = "0400";
user = "root";
};
};
};
clan.borgbackup = { clan.borgbackup = {
enable = true; enable = true;
destinations.test = { destinations.test = {
repo = "borg@localhost:."; repo = "borg@localhost:.";
rsh = "ssh -i ${../lib/ssh/privkey} -o StrictHostKeyChecking=no"; rsh = "ssh -i /root/.ssh/id_ed25519 -o StrictHostKeyChecking=no";
}; };
}; };
} }

30
flake.lock
View File

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1706491084, "lastModified": 1707524024,
"narHash": "sha256-eaEv+orTmr2arXpoE4aFZQMVPOYXCBEbLgK22kOtkhs=", "narHash": "sha256-HmumZ8FuWAAYZrWUKm3N4G4h8nmZ5VUVX+vXLmCJNKM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "f67ba6552845ea5d7f596a24d57c33a8a9dc8de9", "rev": "d07de570ba05cec2807d058daaa044f6955720c7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -63,11 +63,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1706085261, "lastModified": 1707405218,
"narHash": "sha256-7PgpHRHyShINcqgevPP1fJ6N8kM5ZSOJnk3QZBrOCQ0=", "narHash": "sha256-ZQ366Oo8WJbCqXAZET7N0Sz6RQ3G2IbqVtxQRSa3SXc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "896f6589db5b25023b812bbb6c1f5d3a499b1132", "rev": "843e2f04c716092797ffa4ce14c446adce2f09ef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -78,11 +78,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1707028810, "lastModified": 1707639604,
"narHash": "sha256-/WuTsaljhG9VpXRYnxbxkoxhXy6lotbey99CiBuP2GY=", "narHash": "sha256-J5ipSdfkbYcYaH3Js2dUf3Of94BWStapdmxpW5wwH1U=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5d75993fa5feaa333f3eadd83e0a08fc34432acc", "rev": "bdc57436da855500d44e9c1ce7450c0772e1cfa1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -110,11 +110,11 @@
"nixpkgs-stable": [] "nixpkgs-stable": []
}, },
"locked": { "locked": {
"lastModified": 1707015547, "lastModified": 1707620614,
"narHash": "sha256-YZr0OrqWPdbwBhxpBu69D32ngJZw8AMgZtJeaJn0e94=", "narHash": "sha256-gfAoB9dGzBu62NoAoM945aok7+6M+LFu+nvnGwAsTp4=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "23f61b897c00b66855074db471ba016e0cda20dd", "rev": "2eb7c4ba3aa75e2660fd217eb1ab64d5b793608e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -130,11 +130,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1706462057, "lastModified": 1707300477,
"narHash": "sha256-7dG1D4iqqt0bEbBqUWk6lZiSqqwwAO0Hd1L5opVyhNM=", "narHash": "sha256-qQF0fEkHlnxHcrKIMRzOETnRBksUK048MXkX0SOmxvA=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "c6153c2a3ff4c38d231e3ae99af29b87f1df5901", "rev": "ac599dab59a66304eb511af07b3883114f061b9d",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
pkgs/clan-cli/clan_cli/machines/machines.py
View File

@ -41,7 +41,7 @@ class Machine:
self.qmp_socket: Path = state_dir / "qmp.sock" self.qmp_socket: Path = state_dir / "qmp.sock"
self.qga_socket: Path = state_dir / "qga.sock" self.qga_socket: Path = state_dir / "qga.sock"
print(f"qmp_socket: {self.qmp_socket}") log.debug(f"qmp_socket: {self.qmp_socket}")
self._qmp = QEMUMonitorProtocol(path.realpath(self.qmp_socket)) self._qmp = QEMUMonitorProtocol(path.realpath(self.qmp_socket))
self._qmp_connected = False self._qmp_connected = False

14
pkgs/clan-vm-manager/shell.nix
View File

@ -1,10 +1,14 @@
{ clan-vm-manager, libadwaita, clan-cli, mkShell, ruff, desktop-file-utils, xdg-utils, mypy, python3Packages }: { lib, stdenv, clan-vm-manager, libadwaita, clan-cli, mkShell, ruff, desktop-file-utils, xdg-utils, mypy, python3Packages }:
mkShell { mkShell {
inherit (clan-vm-manager) propagatedBuildInputs buildInputs; inherit (clan-vm-manager) propagatedBuildInputs buildInputs;
linuxOnlyPackages = lib.optionals stdenv.isLinux [
xdg-utils
];
nativeBuildInputs = [ nativeBuildInputs = [
ruff ruff
desktop-file-utils desktop-file-utils
xdg-utils
mypy mypy
python3Packages.ipdb python3Packages.ipdb
libadwaita.devdoc # has the demo called 'adwaita-1-demo' libadwaita.devdoc # has the demo called 'adwaita-1-demo'
@ -18,14 +22,16 @@ mkShell {
# prepend clan-cli for development # prepend clan-cli for development
export PYTHONPATH=../clan-cli:$PYTHONPATH export PYTHONPATH=../clan-cli:$PYTHONPATH
ln -snf ${clan-vm-manager} result
if ! command -v xdg-mime &> /dev/null; then
echo "Warning: 'xdg-mime' is not available. The desktop file cannot be installed."
fi
# install desktop file # install desktop file
set -eou pipefail set -eou pipefail
DESKTOP_FILE_NAME=lol.clan.vm.manager.desktop DESKTOP_FILE_NAME=lol.clan.vm.manager.desktop
DESKTOP_DST=~/.local/share/applications/$DESKTOP_FILE_NAME DESKTOP_DST=~/.local/share/applications/$DESKTOP_FILE_NAME
DESKTOP_SRC=${clan-vm-manager}/share/applications/$DESKTOP_FILE_NAME DESKTOP_SRC=${clan-vm-manager}/share/applications/$DESKTOP_FILE_NAME
# UI_BIN="env GTK_DEBUG=interactive ${clan-vm-manager}/bin/clan-vm-manager"
UI_BIN="${clan-vm-manager}/bin/clan-vm-manager" UI_BIN="${clan-vm-manager}/bin/clan-vm-manager"
cp -f $DESKTOP_SRC $DESKTOP_DST cp -f $DESKTOP_SRC $DESKTOP_DST