diff options
| -rwxr-xr-x | Biz/Dragons/main.py | 14 | ||||
| -rwxr-xr-x | Biz/Que/Client.py | 3 | ||||
| -rw-r--r-- | Omni/Bild.nix | 4 | ||||
| -rw-r--r-- | Omni/Bild/Deps.nix | 2 | ||||
| -rw-r--r-- | Omni/Bild/Sources.json | 12 | ||||
| -rw-r--r-- | Omni/Dev/Beryllium/OpenWebui.nix | 2 |
6 files changed, 19 insertions, 18 deletions
diff --git a/Biz/Dragons/main.py b/Biz/Dragons/main.py index 0cb4554..5e7a1c8 100755 --- a/Biz/Dragons/main.py +++ b/Biz/Dragons/main.py @@ -12,6 +12,8 @@ import subprocess import sys import typing +LOG = logging.getLogger(__name__) + def find_user(line: str) -> typing.Any: """ @@ -154,7 +156,7 @@ class Repo: .split() if not any(i in p for i in ignored_paths) ] - logging.debug("collecting stats") + LOG.debug("collecting stats") self.stats = {} for path in self.paths: self.stats[path] = authors_for(path, active_users) @@ -171,9 +173,9 @@ class Repo: self.stale = {} max_staleness = 180 for path in self.stats: - _staleness = staleness(path, now) - if _staleness > max_staleness: - self.stale[path] = _staleness + staleness_ = staleness(path, now) + if staleness_ > max_staleness: + self.stale[path] = staleness_ def print_blackholes(self: "Repo", *, full: bool) -> None: """Print number of blackholes, or list of all blackholes.""" @@ -232,9 +234,9 @@ def main() -> None: if args.test: sys.stdout.write("ok") sys.exit() - logging.basicConfig(stream=sys.stderr, level=args.verbosity.upper()) - logging.debug("starting") + logging.basicConfig(stream=sys.stderr, level=args.verbosity.upper()) + LOG.debug("starting") os.chdir(pathlib.Path(args.repo).resolve()) guard_git(args.repo) diff --git a/Biz/Que/Client.py b/Biz/Que/Client.py index 6248a79..4070cdd 100755 --- a/Biz/Que/Client.py +++ b/Biz/Que/Client.py @@ -23,11 +23,12 @@ DELAY = 3 BACKOFF = 1 LOGLEVEL = logging.ERROR -LOG = logging.basicConfig( +logging.basicConfig( format="%(asctime)s: %(levelname)s: %(message)s", level=LOGLEVEL, datefmt="%Y.%m.%d..%H.%M.%S", ) +LOG = logging.getLogger(__name__) def auth(args: argparse.Namespace) -> str | None: diff --git a/Omni/Bild.nix b/Omni/Bild.nix index 95a7b40..8c1740f 100644 --- a/Omni/Bild.nix +++ b/Omni/Bild.nix @@ -280,14 +280,14 @@ }; # build an operating system. 'cfg' is the NixOS config - os = cfg: (stable.nixos (_args: cfg)).toplevel; + os = cfg: (stable.nixos cfg).toplevel; # build an os image for a digital ocean droplet droplet = cfg: (stable.nixos ({modulesPath, ...}: { imports = [ "${toString modulesPath}/virtualisation/digital-ocean-image.nix" - (_args: cfg) + cfg ]; })) .digitalOceanImage; diff --git a/Omni/Bild/Deps.nix b/Omni/Bild/Deps.nix index 6f5cc5c..b410f3b 100644 --- a/Omni/Bild/Deps.nix +++ b/Omni/Bild/Deps.nix @@ -28,7 +28,5 @@ _self: super: { nostr-rs-relay = super.callPackage ./Deps/nostr-rs-relay.nix {}; - ollama = super.unstable.ollama.override {acceleration = "cuda";}; - radicale = super.radicale.overrideAttrs (_old: {doCheck = false;}); } diff --git a/Omni/Bild/Sources.json b/Omni/Bild/Sources.json index 5f9be22..5d43855 100644 --- a/Omni/Bild/Sources.json +++ b/Omni/Bild/Sources.json @@ -140,10 +140,10 @@ "homepage": "", "owner": "nixos", "repo": "nixpkgs", - "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9", - "sha256": "0zffg0m7rhdpk94df578wln5lw3plamadac86cd7cfjcb1n13xmm", + "rev": "030ba1976b7c0e1a67d9716b17308ccdab5b381e", + "sha256": "14rpk53mia7j0hr4yaf5m3b2d4lzjx8qi2rszxjhqq00pxzzr64w", "type": "tarball", - "url": "https://github.com/nixos/nixpkgs/archive/edf04b75c13c2ac0e54df5ec5c543e300f76f1c9.tar.gz", + "url": "https://github.com/nixos/nixpkgs/archive/030ba1976b7c0e1a67d9716b17308ccdab5b381e.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "nixos-mailserver": { @@ -162,10 +162,10 @@ "homepage": "", "owner": "nixos", "repo": "nixpkgs", - "rev": "ff0654c494b7484c4854ddabecdb91b0b7f7c4d0", - "sha256": "0iq3ygljsf28qzlawdxyipd467ha9chy75sj938wgvxc4qaaipk6", + "rev": "ceaea203f3ae1787b1bd13f021f686391696fc5b", + "sha256": "0dgmjq8sng8dbfkzkkmcigkgk5n4mlv6cljaqahhssppygi177q9", "type": "tarball", - "url": "https://github.com/nixos/nixpkgs/archive/ff0654c494b7484c4854ddabecdb91b0b7f7c4d0.tar.gz", + "url": "https://github.com/nixos/nixpkgs/archive/ceaea203f3ae1787b1bd13f021f686391696fc5b.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "nvidia-patch-nixos": { diff --git a/Omni/Dev/Beryllium/OpenWebui.nix b/Omni/Dev/Beryllium/OpenWebui.nix index 7b95331..dccba8b 100644 --- a/Omni/Dev/Beryllium/OpenWebui.nix +++ b/Omni/Dev/Beryllium/OpenWebui.nix @@ -7,7 +7,7 @@ in { volumes = ["/var/lib/open-webui:/app/backend/data"]; environment = { OLLAMA_BASE_URL = "http://127.0.0.1:${toString ports.ollama}"; - PORT = ports.open-webui; + PORT = toString ports.open-webui; }; extraOptions = ["--network=host"]; }; |