From 5b3c59bf26ff8b9c38f3ca78451b42ad0014a585 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 7 Nov 2022 22:43:26 +0100 Subject: ... --- flake.lock | 48 ++++----- hosts/surtr/http/webdav/default.nix | 54 +++++----- hosts/vidhar/default.nix | 16 +-- overlays/matrix-synapse/1.70.1/default.nix | 111 --------------------- overlays/matrix-synapse/1.70.1/plugins/default.nix | 8 -- overlays/matrix-synapse/1.70.1/plugins/ldap3.nix | 17 ---- .../1.70.1/plugins/mjolnir-antispam.nix | 32 ------ overlays/matrix-synapse/1.70.1/plugins/pam.nix | 15 --- .../1.70.1/plugins/shared-secret-auth.nix | 26 ----- overlays/matrix-synapse/1.70.1/tools/default.nix | 6 -- .../1.70.1/tools/rust-synapse-compress-state.nix | 30 ------ overlays/matrix-synapse/1.70.1/tools/synadm.nix | 47 --------- overlays/matrix-synapse/default.nix | 3 - overlays/postfix-mta-sts-resolver.nix | 24 +++-- 14 files changed, 73 insertions(+), 364 deletions(-) delete mode 100644 overlays/matrix-synapse/1.70.1/default.nix delete mode 100644 overlays/matrix-synapse/1.70.1/plugins/default.nix delete mode 100644 overlays/matrix-synapse/1.70.1/plugins/ldap3.nix delete mode 100644 overlays/matrix-synapse/1.70.1/plugins/mjolnir-antispam.nix delete mode 100644 overlays/matrix-synapse/1.70.1/plugins/pam.nix delete mode 100644 overlays/matrix-synapse/1.70.1/plugins/shared-secret-auth.nix delete mode 100644 overlays/matrix-synapse/1.70.1/tools/default.nix delete mode 100644 overlays/matrix-synapse/1.70.1/tools/rust-synapse-compress-state.nix delete mode 100644 overlays/matrix-synapse/1.70.1/tools/synadm.nix delete mode 100644 overlays/matrix-synapse/default.nix diff --git a/flake.lock b/flake.lock index 54334c39..07386f82 100644 --- a/flake.lock +++ b/flake.lock @@ -59,11 +59,11 @@ }, "flake-utils_2": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667077288, + "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817", "type": "github" }, "original": { @@ -80,11 +80,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1666253070, - "narHash": "sha256-MtaNgghmfp+ywh5mv9FcspFT4ACaYINSN+D98PCkrP0=", + "lastModified": 1667830176, + "narHash": "sha256-TNm8W88Jf9qELqKI8rGMr0sZWlTV9WKIlqN4dzvuKUA=", "owner": "nix-community", "repo": "home-manager", - "rev": "c485669ca529e01c1505429fa9017c9a93f15559", + "rev": "886675991b643b701a33f533443db165c70692d1", "type": "github" }, "original": { @@ -133,11 +133,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1666459110, - "narHash": "sha256-T/+pypla/R/RHOOnNvn9kEBvXKtFzYPAh06S8Tzx9sk=", + "lastModified": 1667853482, + "narHash": "sha256-TcbNo/dT9aS4RpAL/o96m2+3QPabiaKxmR1ILy8jXyY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4752722090be8e7fd4ecceb12bee492851837d3d", + "rev": "65f397babb8e11100bd63e3aaca715da278dae58", "type": "github" }, "original": { @@ -149,11 +149,11 @@ }, "nixpkgs-22_05": { "locked": { - "lastModified": 1665870850, - "narHash": "sha256-EkC/Kkc9cr2orI868OHnh6F8/aqS4TZy38ie+KnhfS8=", + "lastModified": 1667091951, + "narHash": "sha256-62sz0fn06Nq8OaeBYrYSR3Y6hUcp8/PC4dJ7HeGaOhU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "945a85cb7ee31f5f8c49432d77b610b777662d4f", + "rev": "6440d13df2327d2db13d3b17e419784020b71d22", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1664550666, - "narHash": "sha256-eXfMRd9uItEp3PsYI31FSVGPG9dVC6yF++65ZrGwW8A=", + "lastModified": 1667620329, + "narHash": "sha256-v1Zk7rtEbAGpevBGPZvZBKpwbmw4I+uVwxvd+pBlp3o=", "owner": "berberman", "repo": "nvfetcher", - "rev": "9763ad40d59a044e90726653d9253efaeeb053b2", + "rev": "294826951113dcd3aa9abbcacfb1aa5b95a19116", "type": "github" }, "original": { @@ -191,11 +191,11 @@ "pypi-deps-db": { "flake": false, "locked": { - "lastModified": 1666427261, - "narHash": "sha256-IfzNumTybpMPIVaTAKeWYq6jm7e6co+GUKh1a92cNdk=", + "lastModified": 1667852333, + "narHash": "sha256-2ZYEs3Xpk8/YbyybW5DtZVP6iv2val+jrzhP3A+JbxU=", "owner": "DavHau", "repo": "pypi-deps-db", - "rev": "f3039036e1f993fde9e8ca8020a2d20b89c10b8c", + "rev": "0245e14eb2416bc00a97356700549e824d642602", "type": "github" }, "original": { @@ -225,11 +225,11 @@ "nixpkgs-22_05": "nixpkgs-22_05" }, "locked": { - "lastModified": 1666078616, - "narHash": "sha256-ifW3GhIxuKv5+AidKAPpmtS8M7TY2d7VS6eFnaCFdfU=", + "lastModified": 1667767301, + "narHash": "sha256-+UDtEkw6pZ+sqkC0Um5ocJ9kjvuu0qffSCbl+jAA8K8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8e470d4eac115aa793437e52e84e7f9abdce236b", + "rev": "4407353739ad74a3d9744cf2988ab10f3b83e288", "type": "github" }, "original": { @@ -256,11 +256,11 @@ }, "utils_2": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { diff --git a/hosts/surtr/http/webdav/default.nix b/hosts/surtr/http/webdav/default.nix index 5f2955bc..1da411d3 100644 --- a/hosts/surtr/http/webdav/default.nix +++ b/hosts/surtr/http/webdav/default.nix @@ -26,14 +26,14 @@ in { account sufficient pam_unix.so quiet ''; users.groups."webdav" = {}; - + services.nginx = { - upstreams."py-webdav" = { - servers = { - "unix://${webdavSocket}" = {}; - }; - }; - + # upstreams."py-webdav" = { + # servers = { + # "unix://${webdavSocket}" = {}; + # }; + # }; + virtualHosts."webdav.141.li" = { forceSSL = true; sslCertificate = "/run/credentials/nginx.service/webdav.141.li.pem"; @@ -41,19 +41,19 @@ in { sslTrustedCertificate = "/run/credentials/nginx.service/webdav.141.li.chain.pem"; locations = { "/".extraConfig = '' - root /srv/files/$remote_user; + root /srv/files/$remote_user; auth_pam "WebDAV"; auth_pam_service_name "webdav"; ''; - "/py/".extraConfig = '' - rewrite ^/py(.*) $1 break; + # "/py/".extraConfig = '' + # rewrite ^/py(.*) $1 break; - include ${config.services.nginx.package}/conf/uwsgi_params; - uwsgi_param SCRIPT_NAME /py; - uwsgi_pass py-webdav; - ''; + # include ${config.services.nginx.package}/conf/uwsgi_params; + # uwsgi_param SCRIPT_NAME /py; + # uwsgi_pass py-webdav; + # ''; }; extraConfig = '' dav_methods PUT DELETE MKCOL COPY MOVE; @@ -83,18 +83,18 @@ in { ]; - services.uwsgi.instance.vassals.webdav = { - type = "normal"; - socket = webdavSocket; - listen = 1024; - master = true; - vacuum = true; - chown-socket = "${config.services.nginx.user}:${config.services.uwsgi.group}"; - - plugins = ["python3"]; - pythonPackages = self: [webdavApp]; - module = "webdav"; - callable = "app"; - }; + # services.uwsgi.instance.vassals.webdav = { + # type = "normal"; + # socket = webdavSocket; + # listen = 1024; + # master = true; + # vacuum = true; + # chown-socket = "${config.services.nginx.user}:${config.services.uwsgi.group}"; + + # plugins = ["python3"]; + # pythonPackages = self: [webdavApp]; + # module = "webdav"; + # callable = "app"; + # }; }; } diff --git a/hosts/vidhar/default.nix b/hosts/vidhar/default.nix index e40342df..a5c60419 100644 --- a/hosts/vidhar/default.nix +++ b/hosts/vidhar/default.nix @@ -129,10 +129,10 @@ with lib; client_body_temp_path /run/nginx-client-bodies; ''; upstreams.grafana = { - servers = { "unix:${config.services.grafana.socket}" = {}; }; + servers = { "unix:${config.services.grafana.settings.server.socket}" = {}; }; }; virtualHosts = { - ${config.services.grafana.domain} = { + ${config.services.grafana.settings.server.domain} = { forceSSL = true; sslCertificate = ./selfsigned.crt; sslCertificateKey = "/run/credentials/nginx.service/selfsigned.key"; @@ -146,11 +146,13 @@ with lib; users.users.nginx.extraGroups = ["grafana"]; services.grafana = { enable = true; - analytics.reporting.enable = false; - domain = "grafana.vidhar.yggdrasil"; - security.adminPasswordFile = config.sops.secrets."grafana-admin-password".path; - security.secretKeyFile = config.sops.secrets."grafana-secret-key".path; - protocol = "socket"; + settings = { + analytics.reporting_enabled = false; + server.protocol = "socket"; + server.domain = "grafana.vidhar.yggdrasil"; + security.admin_password = "$__file{${config.sops.secrets."grafana-admin-password".path}}"; + security.secret_key = "$__file{${config.sops.secrets."grafana-secret-key".path}}"; + }; }; sops.secrets."grafana-admin-password" = { format = "binary"; diff --git a/overlays/matrix-synapse/1.70.1/default.nix b/overlays/matrix-synapse/1.70.1/default.nix deleted file mode 100644 index 0c026914..00000000 --- a/overlays/matrix-synapse/1.70.1/default.nix +++ /dev/null @@ -1,111 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, python3, openssl, rustPlatform -, enableSystemd ? stdenv.isLinux, nixosTests -, enableRedis ? true -, callPackage -}: - -let - plugins = python3.pkgs.callPackage ./plugins { }; - tools = callPackage ./tools { }; -in -with python3.pkgs; -buildPythonApplication rec { - pname = "matrix-synapse"; - version = "1.70.1"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "matrix-org"; - repo = "synapse"; - rev = "v${version}"; - hash = "sha256-/clEY3sabaDEOAAowQ896vYOvzf5Teevoa7ZkzWw+fY="; - }; - - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-9wxWxrn+uPcz60710DROhDqNC6FvTtnqzWiWRk8kl6A="; - }; - - postPatch = '' - # Remove setuptools_rust from runtime dependencies - # https://github.com/matrix-org/synapse/blob/v1.69.0/pyproject.toml#L177-L185 - sed -i '/^setuptools_rust =/d' pyproject.toml - ''; - - nativeBuildInputs = [ - poetry-core - rustPlatform.cargoSetupHook - setuptools-rust - ] ++ (with rustPlatform.rust; [ - cargo - rustc - ]); - - buildInputs = [ openssl ]; - - propagatedBuildInputs = [ - authlib - bcrypt - bleach - canonicaljson - daemonize - frozendict - ijson - jinja2 - jsonschema - lxml - matrix-common - msgpack - netaddr - phonenumbers - pillow - prometheus-client - psutil - psycopg2 - pyasn1 - pydantic - pyjwt - pymacaroons - pynacl - pyopenssl - pysaml2 - pyyaml - requests - setuptools - signedjson - sortedcontainers - treq - twisted - typing-extensions - unpaddedbase64 - ] ++ lib.optional enableSystemd systemd - ++ lib.optionals enableRedis [ hiredis txredisapi ]; - - checkInputs = [ mock parameterized openssl ]; - - doCheck = !stdenv.isDarwin; - - checkPhase = '' - runHook preCheck - - # remove src module, so tests use the installed module instead - rm -rf ./synapse - - PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial -j $NIX_BUILD_CORES tests - - runHook postCheck - ''; - - passthru.tests = { inherit (nixosTests) matrix-synapse; }; - passthru.plugins = plugins; - passthru.tools = tools; - passthru.python = python3; - - meta = with lib; { - homepage = "https://matrix.org"; - description = "Matrix reference homeserver"; - license = licenses.asl20; - maintainers = teams.matrix.members; - }; -} diff --git a/overlays/matrix-synapse/1.70.1/plugins/default.nix b/overlays/matrix-synapse/1.70.1/plugins/default.nix deleted file mode 100644 index e67d9075..00000000 --- a/overlays/matrix-synapse/1.70.1/plugins/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ callPackage }: - -{ - matrix-synapse-ldap3 = callPackage ./ldap3.nix { }; - matrix-synapse-mjolnir-antispam = callPackage ./mjolnir-antispam.nix { }; - matrix-synapse-pam = callPackage ./pam.nix { }; - matrix-synapse-shared-secret-auth = callPackage ./shared-secret-auth.nix { }; -} diff --git a/overlays/matrix-synapse/1.70.1/plugins/ldap3.nix b/overlays/matrix-synapse/1.70.1/plugins/ldap3.nix deleted file mode 100644 index 394c0f5e..00000000 --- a/overlays/matrix-synapse/1.70.1/plugins/ldap3.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ isPy3k, buildPythonPackage, fetchPypi, service-identity, ldap3, twisted, ldaptor, mock }: - -buildPythonPackage rec { - pname = "matrix-synapse-ldap3"; - version = "0.1.5"; - - src = fetchPypi { - inherit pname version; - sha256 = "9fdf8df7c8ec756642aa0fea53b31c0b2f1924f70d7f049a2090b523125456fe"; - }; - - propagatedBuildInputs = [ service-identity ldap3 twisted ]; - - # ldaptor is not ready for py3 yet - doCheck = !isPy3k; - checkInputs = [ ldaptor mock ]; -} diff --git a/overlays/matrix-synapse/1.70.1/plugins/mjolnir-antispam.nix b/overlays/matrix-synapse/1.70.1/plugins/mjolnir-antispam.nix deleted file mode 100644 index 7372c2f7..00000000 --- a/overlays/matrix-synapse/1.70.1/plugins/mjolnir-antispam.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, matrix-synapse }: - -buildPythonPackage rec { - pname = "matrix-synapse-mjolnir-antispam"; - version = "1.5.0"; - - src = fetchFromGitHub { - owner = "matrix-org"; - repo = "mjolnir"; - rev = "refs/tags/v${version}"; - sha256 = "sha256-YmP+r9W5e63Aw66lSQeTTbYwSF/vjPyHkoehJxtcRNw="; - }; - - sourceRoot = "./source/synapse_antispam"; - - propagatedBuildInputs = [ matrix-synapse ]; - - doCheck = false; # no tests - pythonImportsCheck = [ "mjolnir" ]; - - meta = with lib; { - description = "AntiSpam / Banlist plugin to be used with mjolnir"; - longDescription = '' - Primarily meant to block invites from undesired homeservers/users, - Mjolnir's Synapse module is a way to interpret ban lists and apply - them to your entire homeserver. - ''; - homepage = "https://github.com/matrix-org/mjolnir#synapse-module"; - license = licenses.asl20; - maintainers = with maintainers; [ jojosch ]; - }; -} diff --git a/overlays/matrix-synapse/1.70.1/plugins/pam.nix b/overlays/matrix-synapse/1.70.1/plugins/pam.nix deleted file mode 100644 index a14fe6d6..00000000 --- a/overlays/matrix-synapse/1.70.1/plugins/pam.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ buildPythonPackage, fetchFromGitHub, twisted, python-pam }: - -buildPythonPackage rec { - pname = "matrix-synapse-pam"; - version = "0.1.3"; - - src = fetchFromGitHub { - owner = "14mRh4X0r"; - repo = "matrix-synapse-pam"; - rev = "v${version}"; - sha256 = "0jgz49cwiyih5cg3hr4byva04zjnq8aj7rima9874la9fc5sd2wf"; - }; - - propagatedBuildInputs = [ twisted python-pam ]; -} diff --git a/overlays/matrix-synapse/1.70.1/plugins/shared-secret-auth.nix b/overlays/matrix-synapse/1.70.1/plugins/shared-secret-auth.nix deleted file mode 100644 index a6e22db3..00000000 --- a/overlays/matrix-synapse/1.70.1/plugins/shared-secret-auth.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, matrix-synapse, twisted }: - -buildPythonPackage rec { - pname = "matrix-synapse-shared-secret-auth"; - version = "2.0.2"; - - src = fetchFromGitHub { - owner = "devture"; - repo = "matrix-synapse-shared-secret-auth"; - rev = version; - sha256 = "sha256-qzXKwTEOMtdvsxoU3Xh3vQyhK+Q18LfkeSts7EyDIXE="; - }; - - doCheck = false; - pythonImportsCheck = [ "shared_secret_authenticator" ]; - - buildInputs = [ matrix-synapse ]; - propagatedBuildInputs = [ twisted ]; - - meta = with lib; { - description = "Shared Secret Authenticator password provider module for Matrix Synapse"; - homepage = "https://github.com/devture/matrix-synapse-shared-secret-auth"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ sumnerevans ]; - }; -} diff --git a/overlays/matrix-synapse/1.70.1/tools/default.nix b/overlays/matrix-synapse/1.70.1/tools/default.nix deleted file mode 100644 index defc35bc..00000000 --- a/overlays/matrix-synapse/1.70.1/tools/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage }: -{ - rust-synapse-compress-state = callPackage ./rust-synapse-compress-state.nix { }; - - synadm = callPackage ./synadm.nix { }; -} diff --git a/overlays/matrix-synapse/1.70.1/tools/rust-synapse-compress-state.nix b/overlays/matrix-synapse/1.70.1/tools/rust-synapse-compress-state.nix deleted file mode 100644 index fcf123d6..00000000 --- a/overlays/matrix-synapse/1.70.1/tools/rust-synapse-compress-state.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, rustPlatform, python3, fetchFromGitHub, pkg-config, openssl }: - -rustPlatform.buildRustPackage rec { - pname = "rust-synapse-compress-state"; - version = "0.1.3"; - - src = fetchFromGitHub { - owner = "matrix-org"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-SSfVtG8kwHarVbB1O7xC2SSbUpPGYMHTMyoxu8mpEk0="; - }; - - cargoSha256 = "sha256-PG+UeovhJMsIlm5dOYdtMxbUxZjwG3V59kAcB9aFP5c="; - - cargoBuildFlags = [ - "--all" - ]; - - nativeBuildInputs = [ python3 pkg-config ]; - - buildInputs = [ openssl ]; - - meta = with lib; { - description = "A tool to compress some state in a Synapse instance's database"; - homepage = "https://github.com/matrix-org/rust-synapse-compress-state"; - license = licenses.asl20; - maintainers = with maintainers; [ hexa maralorn ]; - }; -} diff --git a/overlays/matrix-synapse/1.70.1/tools/synadm.nix b/overlays/matrix-synapse/1.70.1/tools/synadm.nix deleted file mode 100644 index 5075e42e..00000000 --- a/overlays/matrix-synapse/1.70.1/tools/synadm.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, python3Packages -}: - -with python3Packages; buildPythonApplication rec { - pname = "synadm"; - version = "0.36"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-OMXUbfAC927qJw0B5sq1lGJQRkFAUdohIOkCYUbZumI="; - }; - - postPatch = '' - substituteInPlace setup.py \ - --replace "Click>=7.0,<8.0" "Click" - ''; - - propagatedBuildInputs = [ - click - click-option-group - dnspython - tabulate - pyyaml - requests - ]; - - checkPhase = '' - runHook preCheck - export HOME=$TMPDIR - $out/bin/synadm -h > /dev/null - runHook postCheck - ''; - - meta = with lib; { - description = "Command line admin tool for Synapse"; - longDescription = '' - A CLI tool to help admins of Matrix Synapse homeservers - conveniently issue commands available via its admin API's - (matrix-org/synapse@master/docs/admin_api) - ''; - homepage = "https://github.com/JOJ0/synadm"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ hexa ]; - }; -} diff --git a/overlays/matrix-synapse/default.nix b/overlays/matrix-synapse/default.nix deleted file mode 100644 index 9db73e35..00000000 --- a/overlays/matrix-synapse/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ final, prev, ... }: { - matrix-synapse = final.callPackage ./1.70.1/default.nix {}; -} diff --git a/overlays/postfix-mta-sts-resolver.nix b/overlays/postfix-mta-sts-resolver.nix index d8b1ff00..22fc4118 100644 --- a/overlays/postfix-mta-sts-resolver.nix +++ b/overlays/postfix-mta-sts-resolver.nix @@ -2,7 +2,7 @@ { postfix-mta-sts-resolver = flakeInputs.mach-nix.lib.${final.system}.buildPythonPackage { inherit (sources.postfix-mta-sts-resolver) src pname version; - extras = "redis,uvloop"; + # extras = "redis,uvloop"; ignoreDataOutdated = true; requirements = '' @@ -13,17 +13,19 @@ PyYAML>=3.12 ''; - providers._default = "nixpkgs,sdist"; + providers.cffi = "nixpkgs"; - overridesPost = [ - (self: super: { - frozenlist = super.frozenlist.overrideAttrs (oldAttrs: { - nativeBuildInputs = (oldAttrs.nativeBuildInputs or []) ++ [ final.python310Packages.cython ]; - }); - }) - ]; + # providers._default = "nixpkgs,sdist"; - _.pyparsing.buildInputs.add = with final.python310Packages; [ flit-core ]; - _.idna.buildInputs.add = with final.python310Packages; [ flit-core ]; + # overridesPost = [ + # (self: super: { + # frozenlist = super.frozenlist.overrideAttrs (oldAttrs: { + # nativeBuildInputs = (oldAttrs.nativeBuildInputs or []) ++ [ final.python310Packages.cython ]; + # }); + # }) + # ]; + + # _.pyparsing.buildInputs.add = with final.python310Packages; [ flit-core ]; + # _.idna.buildInputs.add = with final.python310Packages; [ flit-core ]; }; } -- cgit v1.2.3