From d1309a4e463d448cdfc07974d2aa96a39d4a366e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Wed, 11 Sep 2024 12:41:12 +0200 Subject: System update --- pkgs/default.nix | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) (limited to 'pkgs') diff --git a/pkgs/default.nix b/pkgs/default.nix index ad2236d..eca6db6 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -30,37 +30,15 @@ in { bigclown-leds = final.callPackage ./bigclown-leds {}; # nixpkgs patches - zigbee2mqtt = prev.zigbee2mqtt.overrideAttrs (oldAttrs: { + zigbee2mqtt = prev.zigbee2mqtt.overrideAttrs { npmInstallFlags = ["--no-optional"]; # Fix cross build - }); + }; nodejs_18 = callPackageNodejs (prev.path + "/pkgs/development/web/nodejs/v18.nix") {}; nodejs-slim_18 = callPackageNodejs (prev.path + "/pkgs/development/web/nodejs/v18.nix") {enableNpm = false;}; nodejs_20 = callPackageNodejs (prev.path + "/pkgs/development/web/nodejs/v20.nix") {}; nodejs-slim_20 = callPackageNodejs (prev.path + "/pkgs/development/web/nodejs/v20.nix") {enableNpm = false;}; nodejs_22 = callPackageNodejs (prev.path + "/pkgs/development/web/nodejs/v22.nix") {}; nodejs-slim_22 = callPackageNodejs (prev.path + "/pkgs/development/web/nodejs/v22.nix") {enableNpm = false;}; - pythonPackagesExtensions = - prev.pythonPackagesExtensions - ++ [ - ( - pyfinal: pyprev: { - bcg = pyprev.bcg.overrideAttrs { - patches = - pyprev.bcg.patches - ++ [ - (final.fetchpatch2 { - name = "bcg-fix-import-with-Python-3.12.patch"; - url = "https://github.com/cynerd/bch-gateway/commit/1314c892992d8914802b6c42602c39f6a1418fca.patch"; - hash = "sha256-+vmkqnnkf81umjesTIFgh0mMh2fCCn/yFyQl6ENP9Cc="; - }) - ]; - propagatedBuildInputs = - pyprev.bcg.propagatedBuildInputs - ++ [pyfinal.looseversion]; - }; - } - ) - ]; # Older version of packages flac1_3 = prev.flac.overrideAttrs { -- cgit v1.2.3