From 2c76ca94254380d3836fe44fbaf3f32357df9da9 Mon Sep 17 00:00:00 2001 From: chn Date: Sun, 1 Jun 2025 10:00:10 +0800 Subject: [PATCH] modules.packages: remove unused python packages --- modules/packages/desktop.nix | 2 +- modules/packages/minimal.nix | 7 ------- modules/packages/molecule.nix | 11 +++++++++-- modules/system/nixpkgs/buildNixpkgsConfig.nix | 10 +++++----- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/modules/packages/desktop.nix b/modules/packages/desktop.nix index 5826627c..ee8f2ce8 100644 --- a/modules/packages/desktop.nix +++ b/modules/packages/desktop.nix @@ -66,7 +66,7 @@ inputs: ]; _pythonPackages = [(pythonPackages: with pythonPackages; [ - phonopy scipy scikit-learn jupyterlab autograd inputs.pkgs.localPackages.phono3py numpy + scipy scikit-learn jupyterlab autograd numpy ])]; }; user.sharedModules = diff --git a/modules/packages/minimal.nix b/modules/packages/minimal.nix index 94e01ee0..cd406d9d 100644 --- a/modules/packages/minimal.nix +++ b/modules/packages/minimal.nix @@ -42,13 +42,6 @@ inputs: pdfgrep ffmpeg-full hdf5 ] ++ (with inputs.config.boot.kernelPackages; [ cpupower usbip ]); - _pythonPackages = [(pythonPackages: with pythonPackages; - [ - openai python-telegram-bot fastapi-cli pypdf2 pandas matplotlib plotly gunicorn redis jinja2 - certifi charset-normalizer idna orjson psycopg2 inquirerpy requests tqdm pydbus odfpy - # for vasp plot-workfunc.py - ase - ])]; }; programs = { diff --git a/modules/packages/molecule.nix b/modules/packages/molecule.nix index cd29bfb3..06c46021 100644 --- a/modules/packages/molecule.nix +++ b/modules/packages/molecule.nix @@ -7,7 +7,14 @@ inputs: }; config = let inherit (inputs.config.nixos.packages) molecule; in inputs.lib.mkIf (molecule != null) { - nixos.packages.packages._packages = with inputs.pkgs; - [ ovito localPackages.vesta localPackages.v-sim localPackages.ufo inputs.pkgs.pkgs-2311.hdfview ]; + nixos.packages.packages = + { + _packages = with inputs.pkgs; + [ ovito localPackages.vesta localPackages.v-sim localPackages.ufo inputs.pkgs.pkgs-2311.hdfview ]; + _pythonPackages = [(pythonPackages: with pythonPackages; + [ + phonopy inputs.pkgs.localPackages.phono3py + ])]; + }; }; } diff --git a/modules/system/nixpkgs/buildNixpkgsConfig.nix b/modules/system/nixpkgs/buildNixpkgsConfig.nix index c58d9c49..6a2734fe 100644 --- a/modules/system/nixpkgs/buildNixpkgsConfig.nix +++ b/modules/system/nixpkgs/buildNixpkgsConfig.nix @@ -154,11 +154,11 @@ in platformConfig // { disabledTests = prev.disabledTests or [] ++ [ "test_brokenpipeerror" ]; }); # paperwork-backend = prev.paperwork-backend.overrideAttrs (prev: { doCheck = false; }); } - // (inputs.lib.optionalAttrs (nixpkgs.march != null && !prev.stdenv.hostPlatform.avx2Support) - { - numcodecs = prev.numcodecs.overridePythonAttrs (prev: - { disabledTests = prev.disabledTests or [] ++ [ "test_encode_decode" "test_partial_decode" ]; }); - }) + # // (inputs.lib.optionalAttrs (nixpkgs.march != null && !prev.stdenv.hostPlatform.avx2Support) + # { + # numcodecs = prev.numcodecs.overridePythonAttrs (prev: + # { disabledTests = prev.disabledTests or [] ++ [ "test_encode_decode" "test_partial_decode" ]; }); + # }) ))]; inherit (final.pkgs-2411) intelPackages_2023; })