From 45e64b3e6d24b6fa5a9b0a442793ff3e5a75c6f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Wed, 6 Aug 2025 11:27:38 +0200 Subject: nixos,pkgs: packages update --- flake.lock | 66 +++++++++++++++-------------------------- flake.nix | 6 ++-- nixos/configurations/errol.nix | 40 ++++++++++++++++++++++++- nixos/configurations/lipwig.nix | 11 ++++--- nixos/modules/desktop.nix | 1 - pkgs/default.nix | 19 +++--------- pkgs/dodo/default.nix | 6 ++-- 7 files changed, 78 insertions(+), 71 deletions(-) diff --git a/flake.lock b/flake.lock index f1e6fde..1f2eb70 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1750173260, - "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=", + "lastModified": 1754337839, + "narHash": "sha256-fEc2/4YsJwtnLU7HCFMRckb0u9UNnDZmwGhXT5U5NTw=", "owner": "ryantm", "repo": "agenix", - "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf", + "rev": "856df6f6922845abd4fd958ce21febc07ca2fa45", "type": "github" }, "original": { @@ -44,23 +44,6 @@ } }, "flake-utils": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "id": "flake-utils", - "type": "indirect" - } - }, - "flake-utils_2": { "locked": { "lastModified": 1678901627, "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", @@ -74,7 +57,7 @@ "type": "indirect" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { "systems": "systems_5" }, @@ -94,7 +77,7 @@ "flakepy": { "inputs": { "nixpkgs": "nixpkgs_6", - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1751271815, @@ -113,7 +96,7 @@ "flakepy_2": { "inputs": { "nixpkgs": "nixpkgs_8", - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1751271815, @@ -152,11 +135,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1753122741, - "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=", + "lastModified": 1754316476, + "narHash": "sha256-Ry1gd1BQrNVJJfT11cpVP0FY8XFMx4DJV2IDp01CH9w=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22", + "rev": "9368056b73efb46eb14fd4667b99e0f81b805f28", "type": "github" }, "original": { @@ -184,16 +167,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745391562, - "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", + "lastModified": 1754028485, + "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", + "rev": "59e69648d345d6e8fef86158c555730fa12af9de", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -228,11 +211,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1753694789, - "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", + "lastModified": 1754214453, + "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", + "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", "type": "github" }, "original": { @@ -399,7 +382,6 @@ "root": { "inputs": { "agenix": "agenix", - "flake-utils": "flake-utils", "nixos-hardware": "nixos-hardware", "nixosdeploy": "nixosdeploy", "nixpkgs": "nixpkgs_3", @@ -408,13 +390,14 @@ "shellrc": "shellrc", "shvcli": "shvcli", "shvcli-ell": "shvcli-ell", + "systems": "systems_4", "usbkey": "usbkey", "vpsadminos": "vpsadminos" } }, "shellrc": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_5" }, "locked": { @@ -510,9 +493,8 @@ "type": "github" }, "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" + "id": "systems", + "type": "indirect" } }, "systems_3": { @@ -560,7 +542,7 @@ }, "usbkey": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs_10" }, "locked": { @@ -579,11 +561,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1753881559, - "narHash": "sha256-1GBdBzn7UXDXVhxjdoNsajd2tYGVq0x4f1FRxhaiOSA=", + "lastModified": 1754243274, + "narHash": "sha256-gVTM1eIYzHx/Z/2WVhhf3Eov3JuARF5fuIrWjvc73wo=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "f0580af94a38240ed88da3de980ac3332612b255", + "rev": "483e04c5556e7a42a0dcd176caab7ad450244515", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e4401f0..43721fe 100644 --- a/flake.nix +++ b/flake.nix @@ -82,9 +82,9 @@ packages = forSystems ( system: {inherit (nixosdeploy.packages.${system}) default;} - // (osFilterMap "toplevel") - // (osFilterMap "tarball") - // (osFilterMap "firmware") + // (osFilterMap system "toplevel") + // (osFilterMap system "tarball") + // (osFilterMap system "firmware") ); devShells = withPkgs (import ./devShells); diff --git a/nixos/configurations/errol.nix b/nixos/configurations/errol.nix index defacf3..f986631 100644 --- a/nixos/configurations/errol.nix +++ b/nixos/configurations/errol.nix @@ -1,4 +1,11 @@ -{pkgs, ...}: { +{ + config, + lib, + pkgs, + ... +}: let + inherit (lib) mkDefault; +in { system.stateVersion = "24.05"; nixpkgs.hostPlatform.system = "x86_64-linux"; deploy.enable = true; @@ -89,5 +96,36 @@ enable = true; dataDir = "/home/cynerd"; }; + + home-assistant = { + enable = true; + openFirewall = true; + configDir = "/var/lib/hass"; + config = { + homeassistant = { + name = "SPT"; + latitude = "!secret latitude"; + longitude = "!secret longitude"; + elevation = "!secret elevation"; + time_zone = "Europe/Prague"; + country = "CZ"; + }; + http.server_port = 8808; + mqtt = { + sensor = import ../home-assistant/sensors.nix; + light = import ../home-assistant/light.nix; + }; + default_config = {}; + automation = "!include automations.yaml"; + }; + extraComponents = ["met"]; + package = pkgs.home-assistant.override { + extraPackages = pkgs: + with pkgs; [ + securetar + pyipp + ]; + }; + }; }; } diff --git a/nixos/configurations/lipwig.nix b/nixos/configurations/lipwig.nix index 2f5e242..b841722 100644 --- a/nixos/configurations/lipwig.nix +++ b/nixos/configurations/lipwig.nix @@ -107,6 +107,10 @@ forceSSL = true; useACMEHost = "cynerd.cz"; }; + "office.cynerd.cz" = { + forceSSL = true; + useACMEHost = "cynerd.cz"; + }; "grafana.cynerd.cz" = { forceSSL = true; useACMEHost = "cynerd.cz"; @@ -252,11 +256,6 @@ ; # Additional modules can be fetched with: # NEXTCLOUD_VERSIONS=31 nix run nixpkgs#nc4nix -- -apps "passwords,money,integration_github,integration_gitlab" - fileslibreofficeedit = pkgs.fetchNextcloudApp { - url = "https://github.com/allotropia/nextcloud_files_libreoffice_edit/releases/download/v2.0.1/fileslibreofficeedit.tar.gz"; - hash = "sha256-Xqx5snQWintYJG3Q1Crw22TkNw18DdADXkurMQqt3X8="; - license = "agpl3Plus"; - }; integration_github = pkgs.fetchNextcloudApp { url = "https://github.com/nextcloud-releases/integration_github/releases/download/v3.2.1/integration_github-v3.2.1.tar.gz"; hash = "sha256-iBWphFaXmQHNxgoi9qkfV7vCTChwtk6yg0aVr9Lhn4c="; @@ -361,7 +360,7 @@ } ]; }; - configureUwsgi = true; + runInUwsgi = true; uwsgiConfig = { socket = "/run/searx/searx.sock"; chmod-socket = "660"; diff --git a/nixos/modules/desktop.nix b/nixos/modules/desktop.nix index 92e5b42..05a7b7b 100644 --- a/nixos/modules/desktop.nix +++ b/nixos/modules/desktop.nix @@ -69,7 +69,6 @@ in { isync msmtp notmuch - astroid dodo taskwarrior3 gnupg diff --git a/pkgs/default.nix b/pkgs/default.nix index be1ab6b..01dee26 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -21,18 +21,6 @@ final: prev: { bigclown-leds = final.callPackage ./bigclown-leds {}; dodo = final.callPackage ./dodo {}; - astroid = prev.astroid.overrideAttrs (oldAttrs: { - version = "240629"; - src = final.fetchFromGitHub { - owner = "astroidmail"; - repo = "astroid"; - rev = "65acc24048a57039753cf2326dbfca6b608b91d1"; - hash = "sha256-PXFVOaCgBHNUg0aCJD1TL/ulzjz9v70/jW5ManUPcHw="; - }; - patches = []; - buildInputs = oldAttrs.buildInputs ++ [final.webkitgtk_4_1]; - meta = oldAttrs.meta // {broken = false;}; - }); # OpenWrt One armTrustedFirmwareMT7981 = final.callPackage ./mtk-arm-trusted-firmware rec { @@ -63,9 +51,6 @@ final: prev: { }); # nixpkgs patches - zigbee2mqtt = prev.zigbee2mqtt.overrideAttrs { - npmInstallFlags = ["--no-optional"]; # Fix cross build - }; ubootRaspberryPi3_btrfs = prev.buildUBoot { defconfig = "rpi_3_defconfig"; extraConfig = '' @@ -82,6 +67,10 @@ final: prev: { hash = "sha256-rWBfpI6tdpKvQA/XdazBvU5hzyai5PtKRBpM4iplZDU="; }; }); + bind = prev.bind.overrideAttrs (oldAttrs: { + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [final.buildPackages.protobufc]; + strictDeps = true; + }); # Older version of packages flac134 = prev.flac.overrideAttrs { diff --git a/pkgs/dodo/default.nix b/pkgs/dodo/default.nix index 2984de3..242f4a4 100644 --- a/pkgs/dodo/default.nix +++ b/pkgs/dodo/default.nix @@ -6,14 +6,14 @@ }: python3Packages.buildPythonApplication { pname = "dodo"; - version = "250313"; + version = "250806"; pyproject = true; src = fetchFromGitHub { owner = "akissinger"; repo = "dodo"; - rev = "c108dd93aa637ef757fa8d86cf210d37093f03ec"; - hash = "sha256-tRLaPOh2y87zcBKTtZazfsNzJnLUXRaAEMEMND7XnNY="; + rev = "bcb0db840f6eb0223f99e9ddefe147d84f50dc98"; + hash = "sha256-ScMzSz6HzSUHE5jOrXvcMaokQILaXJV58k87SXujaXg="; }; build-system = with python3Packages; [ -- cgit v1.2.3