From c6b35d83a3d193655e0f1a837b4546440131771c Mon Sep 17 00:00:00 2001 From: Enno Richter Date: Thu, 31 Oct 2024 05:02:26 +0100 Subject: [PATCH] cleanup unused overlays/pkgs --- modules/flake/overlays.nix | 41 ----------------------------------- modules/flake/packages.nix | 2 +- modules/home/packages.nix | 4 ---- packages/edge-tts/default.nix | 38 -------------------------------- 4 files changed, 1 insertion(+), 84 deletions(-) delete mode 100644 packages/edge-tts/default.nix diff --git a/modules/flake/overlays.nix b/modules/flake/overlays.nix index 331abb6b..3d4f5c4d 100644 --- a/modules/flake/overlays.nix +++ b/modules/flake/overlays.nix @@ -10,9 +10,6 @@ "E501" ]; } ../../scripts/borg2prom.py; - # fritzbox-exporter = final.callPackage ./fritzbox-exporter { }; - # go-sqlcmd = final.callPackage ./go-sqlcmd { }; - # gomumblesoundboard = final.callPackage ./gomumblesoundboard { }; hashPassword = final.callPackage ../../packages/hashPassword { }; hl = final.callPackage ../../packages/hl { }; httpserve = final.writers.writePython3Bin "httpserve" { @@ -21,17 +18,10 @@ "E501" ]; } ../../scripts/httpserve.py; - # linux-megi = final.callPackage ./linux-megi { }; logseq-query = final.callPackage ../../packages/logseq-query { }; macos-fix-filefoldernames = final.writers.writePython3Bin "macos-fix-filefoldernames" { flakeIgnore = [ "E265" ]; } ../../scripts/macos-fix-filefoldernames.py; - # nwfonts = final.callPackage ./nwfonts { }; - # pdfconcat = final.writers.writePython3Bin "pdfconcat" { flakeIgnore = [ "E203" "E501" "W503" ]; } (final.substituteAll { src = ../4scripts/pdfconcat.py; inherit (final) pdftk; }); - # pdfduplex = final.callPackage ./pdfduplex { }; - # pinephone-keyboard = final.callPackage ./pinephone-keyboard { }; - # ptsd-octoprintPlugins = import ./octoprint-plugins; - # quotes-exporter = final.callPackage ./quotes-exporter { }; shrinkpdf = final.callPackage ../../packages/shrinkpdf { }; syncthing-device-id = final.writers.writePython3Bin "syncthing-device-id" { flakeIgnore = [ @@ -41,11 +31,6 @@ ]; } ../../scripts/syncthing-device-id.py; win10fonts = final.callPackage ../../packages/win10fonts { }; - edge-tts = final.callPackage ../../packages/edge-tts { }; - # wkhtmltopdf-qt4 = final.callPackage ./wkhtmltopdf-qt4 { }; - # xorgxrdp = final.callPackage ./xrdp/xorgxrdp.nix { }; - # xrdp = final.callPackage ./xrdp { }; - # ptsd-nnn = (final.nnn.overrideAttrs (old: { makeFlags = old.makeFlags ++ [ "O_GITSTATUS=1" ]; @@ -57,33 +42,7 @@ })).override { withNerdIcons = true; }; prom-checktlsa = final.callPackage ../../packages/prom-checktlsa { }; - ptsd-node-packages = final.callPackage ../../packages/node-packages { }; - - zathura-darwin = - let - bundler = final.makeDarwinBundle { - name = "zathura"; - exec = "zathura"; - }; - # see https://github.com/NixOS/nixpkgs/pull/334542 - zathura-mupdf = final.zathura.override { - plugins = with final.zathuraPkgs; [ - zathura_djvu - zathura_ps - zathura_cb - zathura_pdf_mupdf - ]; - }; - in - final.symlinkJoin { - name = "zathura-darwin"; - paths = [ zathura-mupdf ]; - postBuild = '' - source ${bundler} - makeDarwinBundlePhase - ''; - }; }; }; diff --git a/modules/flake/packages.nix b/modules/flake/packages.nix index 44acf9ce..6b796519 100644 --- a/modules/flake/packages.nix +++ b/modules/flake/packages.nix @@ -3,7 +3,7 @@ _: { { pkgs, ... }: { packages = { - inherit (pkgs) edge-tts prom-checktlsa zathura-darwin; + inherit (pkgs) prom-checktlsa; inherit (pkgs.ptsd-node-packages) readability-cli; }; diff --git a/modules/home/packages.nix b/modules/home/packages.nix index 42f297ef..b71383ac 100644 --- a/modules/home/packages.nix +++ b/modules/home/packages.nix @@ -2,8 +2,6 @@ p@{ config, lib, pkgs, - pkgsUnstable, - pkgsMaster, ... }: @@ -74,7 +72,6 @@ in pkgsUnstable.tig djlint dust - edge-tts nbqa entr eternal-terminal @@ -254,7 +251,6 @@ in # qemu rar # subler-bin - # zathura-darwin ] ++ lib.optionals diff --git a/packages/edge-tts/default.nix b/packages/edge-tts/default.nix deleted file mode 100644 index e98bfaf4..00000000 --- a/packages/edge-tts/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - lib, - python3, - fetchFromGitHub, -}: - -python3.pkgs.buildPythonApplication rec { - pname = "edge-tts"; - version = "6.1.12"; - pyproject = true; - - src = fetchFromGitHub { - owner = "rany2"; - repo = "edge-tts"; - rev = "dfd4cab849a988d9587684cf3f9f9536c92b8f4d"; - hash = "sha256-/ECNgsVtR2S5METj5ck7cM9jS9igiBH4GUxMvhWRINU="; - }; - - nativeBuildInputs = [ - python3.pkgs.setuptools - python3.pkgs.wheel - ]; - - propagatedBuildInputs = [ - python3.pkgs.certifi - python3.pkgs.aiohttp - ]; - - pythonImportsCheck = [ "edge_tts" ]; - - meta = with lib; { - description = "Use Microsoft Edge's online text-to-speech service from Python WITHOUT needing Microsoft Edge or Windows or an API key"; - homepage = "https://github.com/rany2/edge-tts"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ ]; - mainProgram = "edge-tts"; - }; -}