From ce8c8c3bc6869256eced022f60c1c88b911b3d53 Mon Sep 17 00:00:00 2001 From: sstent Date: Tue, 3 Sep 2024 18:33:41 +0000 Subject: [PATCH] sync --- dotfiles/sstent/justfile | 2 +- home-manager/users/sstent/python-packages.nix | 1 + modules/home-manager/beets/default.nix | 6 +++ pkgs/beets-bpmanalyser/default copy.nix | 37 +++++++++++++ pkgs/beets-bpmanalyser/default.nix | 39 ++++++++++++++ pkgs/cryberdrop-dl/default.nix | 53 +++++++++++++++++++ pkgs/default.nix | 1 + 7 files changed, 138 insertions(+), 1 deletion(-) create mode 100644 pkgs/beets-bpmanalyser/default copy.nix create mode 100644 pkgs/beets-bpmanalyser/default.nix create mode 100644 pkgs/cryberdrop-dl/default.nix diff --git a/dotfiles/sstent/justfile b/dotfiles/sstent/justfile index da9409d..9e2c7e9 100644 --- a/dotfiles/sstent/justfile +++ b/dotfiles/sstent/justfile @@ -56,5 +56,5 @@ nomad_exec_sh SERVICE: run_nicotine: mullvad connect - nix-shell -p nicotine-plus --command nicotine-plus + -nix-shell -p nicotine-plus --command nicotine-plus mullvad disconnect diff --git a/home-manager/users/sstent/python-packages.nix b/home-manager/users/sstent/python-packages.nix index 096a117..1449f44 100644 --- a/home-manager/users/sstent/python-packages.nix +++ b/home-manager/users/sstent/python-packages.nix @@ -5,4 +5,5 @@ pkgs.python3.withPackages (p: setuptools # setup.py paramiko # ssh library prometheus-api-client + pydub ]) diff --git a/modules/home-manager/beets/default.nix b/modules/home-manager/beets/default.nix index 0893377..e231778 100644 --- a/modules/home-manager/beets/default.nix +++ b/modules/home-manager/beets/default.nix @@ -18,6 +18,7 @@ in { config = mkIf cfg.enable { home.packages = [ pkgs.ffmpeg # for replaygain + pkgs.beets-bpmanalyser #BPManayser ]; sops = { @@ -34,6 +35,10 @@ in { enable = true; propagatedBuildInputs = [pkgs.beets-originquery]; }; + bpmanalyser = { + enable = true; + propagatedBuildInputs = [pkgs.beets-bpmanalyser]; + }; }; }; settings = { @@ -177,6 +182,7 @@ in { "info" "mbsync" "originquery" + "bpmanalyser" ]; replaygain = { backend = "ffmpeg"; diff --git a/pkgs/beets-bpmanalyser/default copy.nix b/pkgs/beets-bpmanalyser/default copy.nix new file mode 100644 index 0000000..e8006bf --- /dev/null +++ b/pkgs/beets-bpmanalyser/default copy.nix @@ -0,0 +1,37 @@ +{ + python3Packages, + fetchurl, + lib, + pkgs, +}: + +python3Packages.buildPythonPackage rec { + pname = "beets-bpmanalyser"; + version = "1.5.9"; + + # Source can be downloaded directly from PyPI or a specific URL + src = pkgs.fetchPypi { + # inherit pname version; + inherit version; + pname = "beets_bpmanalyser"; + sha256 = "sha256-iWXSELGRHI4ak1MTWCSdRiyPz618fyBSzKw/FeJigZ4="; # Replace with actual hash + }; + + propagatedBuildInputs = with pkgs.python3Packages; [ + numpy + aubio + pydub + ]; + + nativeBuildInputs = [ + pkgs.ffmpeg + ]; + # There's no test + doCheck = false; + meta = with pkgs.lib; { + description = "A BPM analyzer plugin for Beets music library manager"; + homepage = "https://github.com/sampsyo/beets"; + license = licenses.mit; + maintainers = with maintainers; [ yourGitHubHandle ]; + }; +} diff --git a/pkgs/beets-bpmanalyser/default.nix b/pkgs/beets-bpmanalyser/default.nix new file mode 100644 index 0000000..517c97a --- /dev/null +++ b/pkgs/beets-bpmanalyser/default.nix @@ -0,0 +1,39 @@ +{ + python3Packages, + fetchFromGitHub, + beets, + lib, +}: +with python3Packages; + buildPythonPackage rec { + pname = "beets-bpmanalyser"; + version = "1.5.9"; + + src = fetchFromGitHub { + owner = "sstent"; + repo = "BeetsPluginBpmAnalyser"; + rev = "2232c69dcc8cf56a00695b7c8a7be76e670d642e"; + hash = "sha256-VQOgS6+G5GCL9dFSze/58OdU7CWT+2BSQFP2N+TlWLc="; + }; + + + nativeBuildInputs = [ + beets + setuptools-scm + numpy + aubio + pydub + ]; + + propagatedBuildInputs = [pydub aubio]; + + # There's no test + doCheck = false; + + # pythonImportsCheck = ["beetsplug.bpmanalyser" "pydub" "numpy" "aubio"]; + + meta = { + description = "A BPM analyzer plugin for Beets music library manager"; + homepage = "https://github.com/sampsyo/beets"; + }; + } \ No newline at end of file diff --git a/pkgs/cryberdrop-dl/default.nix b/pkgs/cryberdrop-dl/default.nix new file mode 100644 index 0000000..11a1101 --- /dev/null +++ b/pkgs/cryberdrop-dl/default.nix @@ -0,0 +1,53 @@ +{ + lib, + python3, + fetchFromGitHub, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "cyberdrop-dl"; + version = "5.3.41-unstable-2024-07-17"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jbsparrow"; + repo = "cyberdropdownloader"; + rev = "e42a11637abfe14bfe2c2ae467284f1b113ea041"; + hash = "sha256-VnKLbU4JEr6ctBBfagvrtpbZn+8u4H75xucU3TumIN4="; + }; + + patches = [ ./unpin-dependencies.patch ]; + + nativeBuildInputs = [ python3.pkgs.poetry-core ]; + + propagatedBuildInputs = with python3.pkgs; [ + aiofiles + aiohttp + aiolimiter + aiosqlite + asyncpraw + beautifulsoup4 + browser-cookie3 + certifi + filedate + get-video-properties + inquirerpy + mediafire + mutagen + myjdapi + pillow + platformdirs + pyyaml + rich + ]; + + pythonImportsCheck = [ "cyberdrop_dl" ]; + + meta = with lib; { + description = "Bulk Gallery Downloader for Cyberdrop.me and Other Sites"; + homepage = "https://github.com/jbsparrow/cyberdropdownloader"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ ]; + mainProgram = "cyberdrop-dl"; + }; +} \ No newline at end of file diff --git a/pkgs/default.nix b/pkgs/default.nix index c410fee..f30d9fe 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -4,5 +4,6 @@ # example = pkgs.callPackage ./example { }; npiperelay = pkgs.callPackage ./npiperelay {}; beets-originquery = pkgs.callPackage ./beets-originquery {}; + beets-bpmanalyser = pkgs.callPackage ./beets-bpmanalyser {}; prometheus-api-client = pkgs.callPackage ./prometheus-api-client {}; }