summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorJonathan Ringer <jonringer117@gmail.com>2020-04-02 00:26:24 -0700
committerJon <jonringer@users.noreply.github.com>2020-04-02 10:04:28 -0700
commitaa1fea9f97aea1f3530b9fef6673d0dba612cfe9 (patch)
tree0d88c619f8c68652367252da4ff1228f2a0cd4e6 /pkgs/tools
parentf329b29cb8a7856169b91a08a4b7ff8639d3793a (diff)
downloadnixpkgs-aa1fea9f97aea1f3530b9fef6673d0dba612cfe9.tar
nixpkgs-aa1fea9f97aea1f3530b9fef6673d0dba612cfe9.tar.gz
nixpkgs-aa1fea9f97aea1f3530b9fef6673d0dba612cfe9.tar.bz2
nixpkgs-aa1fea9f97aea1f3530b9fef6673d0dba612cfe9.tar.lz
nixpkgs-aa1fea9f97aea1f3530b9fef6673d0dba612cfe9.tar.xz
nixpkgs-aa1fea9f97aea1f3530b9fef6673d0dba612cfe9.tar.zst
nixpkgs-aa1fea9f97aea1f3530b9fef6673d0dba612cfe9.zip
google-music-scripts: 4.0.1 -> 4.3.0
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/audio/google-music-scripts/default.nix23
-rw-r--r--pkgs/tools/audio/google-music-scripts/loguru.patch22
2 files changed, 15 insertions, 30 deletions
diff --git a/pkgs/tools/audio/google-music-scripts/default.nix b/pkgs/tools/audio/google-music-scripts/default.nix
index f7e96971ab1..f95dcc8bb6d 100644
--- a/pkgs/tools/audio/google-music-scripts/default.nix
+++ b/pkgs/tools/audio/google-music-scripts/default.nix
@@ -1,17 +1,22 @@
 { lib, python3 }:
 
-python3.pkgs.buildPythonApplication rec {
+with python3.pkgs;
+
+buildPythonApplication rec {
   pname = "google-music-scripts";
-  version = "4.0.1";
+  version = "4.3.0";
 
-  src = python3.pkgs.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
-    sha256 = "5b2e9fdde8781a6d226984f0b61add2415a3804123ceeecb20fcc8527de9389d";
+    sha256 = "0dykjhqklbpqr1lvls0bgf6xkwvslj37lx4q8522hjbs150pwjmq";
   };
 
-  patches = [ ./loguru.patch ];
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "audio-metadata>=0.8,<0.9" "audio-metadata"
+  '';
 
-  propagatedBuildInputs = with python3.pkgs; [
+  propagatedBuildInputs = [
     appdirs
     audio-metadata
     google-music
@@ -24,10 +29,12 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   # No tests
-  doCheck = false;
+  checkPhase = ''
+    $out/bin/gms --help >/dev/null
+  '';
 
   meta = with lib; {
-    homepage = https://github.com/thebigmunch/google-music-scripts;
+    homepage = "https://github.com/thebigmunch/google-music-scripts";
     description = "A CLI utility for interacting with Google Music";
     license = licenses.mit;
     maintainers = with maintainers; [ jakewaksbaum ];
diff --git a/pkgs/tools/audio/google-music-scripts/loguru.patch b/pkgs/tools/audio/google-music-scripts/loguru.patch
deleted file mode 100644
index 141ce044c43..00000000000
--- a/pkgs/tools/audio/google-music-scripts/loguru.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -24,7 +24,7 @@ audio-metadata = "^0.4"
- google-music = "^3.0"
- google-music-proto = "^2.4"
- google-music-utils = "^2.1"
--loguru = "^0.2"
-+loguru = "^0.3"
- pendulum = "^2.0"
- natsort = ">=5.0,<7.0"
- tomlkit = "^0.5"
---- a/setup.py
-+++ b/setup.py
-@@ -16,7 +16,7 @@ install_requires = \
-  'google-music-proto>=2.4,<3.0',
-  'google-music-utils>=2.1,<3.0',
-  'google-music>=3.0,<4.0',
-- 'loguru>=0.2,<0.3',
-+ 'loguru>=0.3,<0.4',
-  'natsort>=5.0,<7.0',
-  'pendulum>=2.0,<3.0',
-  'tomlkit>=0.5,<0.6']