summary refs log tree commit diff
diff options
context:
space:
mode:
authorSumner Evans <me@sumnerevans.com>2023-06-10 13:20:45 -0600
committerSumner Evans <me@sumnerevans.com>2023-06-10 13:20:45 -0600
commitc83276f1e62ed919cbd01def21fa36eb05163bdb (patch)
treecc11131a5088bb9541a29f9a15cda1272cc6e539
parentaef6306c67bef7ab6a898784fac944bfa44519f9 (diff)
downloadnixpkgs-c83276f1e62ed919cbd01def21fa36eb05163bdb.tar
nixpkgs-c83276f1e62ed919cbd01def21fa36eb05163bdb.tar.gz
nixpkgs-c83276f1e62ed919cbd01def21fa36eb05163bdb.tar.bz2
nixpkgs-c83276f1e62ed919cbd01def21fa36eb05163bdb.tar.lz
nixpkgs-c83276f1e62ed919cbd01def21fa36eb05163bdb.tar.xz
nixpkgs-c83276f1e62ed919cbd01def21fa36eb05163bdb.tar.zst
nixpkgs-c83276f1e62ed919cbd01def21fa36eb05163bdb.zip
sublime-music: 0.11.16 -> 0.12.0
Signed-off-by: Sumner Evans <me@sumnerevans.com>
-rw-r--r--pkgs/applications/audio/sublime-music/default.nix30
1 files changed, 8 insertions, 22 deletions
diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix
index e6dcb86eb94..7004842f5df 100644
--- a/pkgs/applications/audio/sublime-music/default.nix
+++ b/pkgs/applications/audio/sublime-music/default.nix
@@ -1,5 +1,4 @@
 { lib
-, fetchFromGitLab
 , fetchFromGitHub
 , python3
 , gobject-introspection
@@ -33,37 +32,24 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "sublime-music";
-  version = "0.11.16";
-  format = "pyproject";
+  version = "0.12.0";
+  format = "flit";
 
-  src = fetchFromGitLab {
+  src = fetchFromGitHub {
     owner = "sublime-music";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-n77mTgElwwFaX3WQL8tZzbkPwnsyQ08OW9imSOjpBlg=";
+    hash = "sha256-FPzeFqDOcaiariz7qJwz6P3Wd+ZDxNP57uj+ptMtEyM=";
   };
 
   nativeBuildInputs = [
     gobject-introspection
     wrapGAppsHook
-  ] ++ (with python.pkgs; [
-    poetry-core
-    pythonRelaxDepsHook
-  ]);
-
-  # Can be removed in later versions (probably > 0.11.16)
-  pythonRelaxDeps = [
-    "deepdiff"
-    "python-mpv"
   ];
 
   postPatch = ''
     sed -i "/--cov/d" setup.cfg
     sed -i "/--no-cov-on-fail/d" setup.cfg
-    # https://github.com/sublime-music/sublime-music/pull/370
-    # Can be removed in later versions (probably > 0.11.16)
-    substituteInPlace pyproject.toml \
-      --replace 'python-Levenshtein = "^0.12.0"' 'Levenshtein = ">0.12.0"'
   '';
 
   buildInputs = [
@@ -76,20 +62,20 @@ python.pkgs.buildPythonApplication rec {
 
   propagatedBuildInputs = with python.pkgs; [
     bleach
+    bottle
     dataclasses-json
     deepdiff
-    fuzzywuzzy
+    levenshtein
     mpv
     peewee
+    pychromecast
     pygobject3
-    levenshtein
     python-dateutil
     requests
     semver
+    thefuzz
   ]
-  ++ lib.optional chromecastSupport pychromecast
   ++ lib.optional keyringSupport keyring
-  ++ lib.optional serverSupport bottle
   ;
 
   nativeCheckInputs = with python.pkgs; [