diff --git a/pkgs/applications/audio/google-musicmanager/default.nix b/pkgs/applications/audio/google-musicmanager/default.nix deleted file mode 100644 index e10a961a9e64..000000000000 --- a/pkgs/applications/audio/google-musicmanager/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib, stdenv, fetchurl -, flac, expat, libidn, qtbase, qtwebkit, libvorbis }: -assert stdenv.hostPlatform.system == "x86_64-linux"; - -stdenv.mkDerivation rec { - version = "beta_1.0.467.4929-r0"; # friendly to nix-env version sorting algo - product = "google-musicmanager"; - name = "${product}-${version}"; - - # When looking for newer versions, since google doesn't let you list their repo dirs, - # curl http://dl.google.com/linux/musicmanager/deb/dists/stable/Release - # fetch an appropriate packages file such as main/binary-amd64/Packages: - # curl http://dl.google.com/linux/musicmanager/deb/dists/stable/main/binary-amd64/Packages - # which will contain the links to all available *.debs for the arch. - - src = fetchurl { - url = "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/${name}_amd64.deb"; - sha256 = "0yaprpbp44var88kdj1h11fqkhgcklixr69jyia49v9m22529gg2"; - }; - - unpackPhase = '' - ar vx ${src} - tar xvf data.tar.xz - tar xvf control.tar.gz - ''; - - prePatch = '' - sed -i "s@\(Exec=\).*@\1$out/bin/google-musicmanager@" opt/google/musicmanager/google-musicmanager.desktop - ''; - - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/lib - mkdir -p $out/share/applications - - cp -r opt $out - find -name "*.so*" -exec cp "{}" $out/lib \; - ln -s $out/opt/google/musicmanager/google-musicmanager $out/bin - ln -s $out/opt/google/musicmanager/google-musicmanager.desktop $out/share/applications - - for i in 16 32 48 128 - do - iconDirectory=$out/usr/share/icons/hicolor/"$i"x"$i"/apps - - mkdir -p $iconDirectory - ln -s $out/opt/google/musicmanager/product_logo_"$i".png $iconDirectory/google-musicmanager.png - done - ''; - - postFixup = '' - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$(patchelf --print-rpath $out/opt/google/musicmanager/minidump_upload):${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" \ - $out/opt/google/musicmanager/minidump_upload - - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$(patchelf --print-rpath $out/opt/google/musicmanager/MusicManager):$out/lib:${lib.makeLibraryPath [ - flac - expat - libidn - qtbase - qtwebkit - libvorbis - stdenv.cc.cc.lib - ]}" \ - $out/opt/google/musicmanager/MusicManager - ''; - - meta = with lib; { - description = "Uploads music from your computer to Google Play"; - homepage = "https://support.google.com/googleplay/answer/1229970"; - license = licenses.unfree; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix deleted file mode 100644 index f86eed1d34da..000000000000 --- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib, stdenv, alsaLib, atk, at-spi2-atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype -, fetchurl, GConf, gdk-pixbuf, glib, gtk2, gtk3, libpulseaudio, makeWrapper, nspr -, nss, pango, udev, xorg -}: - -let - version = "4.7.1"; - - deps = [ - alsaLib - atk - at-spi2-atk - cairo - cups - dbus - expat - fontconfig - freetype - GConf - gdk-pixbuf - glib - gtk2 - gtk3 - libpulseaudio - nspr - nss - pango - stdenv.cc.cc - udev - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXScrnSaver - xorg.libXtst - ]; - -in - -stdenv.mkDerivation { - pname = "google-play-music-desktop-player"; - inherit version; - - src = fetchurl { - url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb"; - sha256 = "1ljm9c5sv6wa7pa483yq03wq9j1h1jdh8363z5m2imz407yzgm5r"; - }; - - dontBuild = true; - nativeBuildInputs = [ dpkg makeWrapper ]; - - unpackPhase = '' - dpkg -x $src . - ''; - - installPhase = '' - mkdir -p $out - cp -r ./usr/share $out - cp -r ./usr/bin $out - - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - "$out/share/google-play-music-desktop-player/Google Play Music Desktop Player" - - wrapProgram $out/bin/google-play-music-desktop-player \ - --prefix LD_LIBRARY_PATH : "$out/share/google-play-music-desktop-player" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath deps}" - ''; - - meta = { - homepage = "https://www.googleplaymusicdesktopplayer.com/"; - description = "A beautiful cross platform Desktop Player for Google Play Music"; - license = lib.licenses.mit; - platforms = [ "x86_64-linux" ]; - maintainers = [ lib.maintainers.SuprDewd ]; - }; -} diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 2c19afb16a22..44d48fb3783a 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -12,8 +12,6 @@ let mopidy = callPackage ./mopidy.nix { }; - mopidy-gmusic = callPackage ./gmusic.nix { }; - mopidy-iris = callPackage ./iris.nix { }; mopidy-local = callPackage ./local.nix { }; diff --git a/pkgs/applications/audio/mopidy/gmusic.nix b/pkgs/applications/audio/mopidy/gmusic.nix deleted file mode 100644 index 6e76d6af87d3..000000000000 --- a/pkgs/applications/audio/mopidy/gmusic.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, python3Packages, mopidy }: - -python3Packages.buildPythonApplication rec { - pname = "mopidy-gmusic"; - version = "4.0.0"; - - src = python3Packages.fetchPypi { - inherit version; - pname = "Mopidy-GMusic"; - sha256 = "14yswmlfs659rs3k595606m77lw9c6pjykb5pikqw21sb97haxl3"; - }; - - propagatedBuildInputs = [ - mopidy - python3Packages.requests - python3Packages.gmusicapi - python3Packages.cachetools - ]; - - doCheck = false; - - meta = with lib; { - homepage = "https://www.mopidy.com/"; - description = "Mopidy extension for playing music from Google Play Music"; - license = licenses.asl20; - maintainers = [ maintainers.jgillich ]; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix index 63a28eb0f58e..d53bfee9efd2 100644 --- a/pkgs/applications/audio/mopidy/mopidy.nix +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -42,7 +42,7 @@ pythonPackages.buildPythonApplication rec { homepage = "https://www.mopidy.com/"; description = '' An extensible music server that plays music from local disk, Spotify, - SoundCloud, Google Play Music, and more + SoundCloud, and more ''; license = licenses.asl20; maintainers = [ maintainers.fpletz ]; diff --git a/pkgs/applications/audio/tuijam/default.nix b/pkgs/applications/audio/tuijam/default.nix deleted file mode 100644 index d9b9012521cb..000000000000 --- a/pkgs/applications/audio/tuijam/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ buildPythonApplication -, fetchFromGitHub -, lib -, python3Packages -}: - -buildPythonApplication rec { - pname = "tuijam"; - version = "unstable-2020-06-05"; - - src = fetchFromGitHub { - owner = "cfangmeier"; - repo = pname; - rev = "7baec6f6e80ee90da0d0363b430dd7d5695ff03b"; - sha256 = "1l0s88jvj99jkxnczw5nfj78m8vihh29g815n4mg9jblad23mgx5"; - }; - - buildInputs = [ python3Packages.Babel ]; - - # the package has no tests - doCheck = false; - - propagatedBuildInputs = with python3Packages; [ - gmusicapi - google-api-python-client - mpv - pydbus - pygobject3 - pyyaml - requests - rsa - urwid - ]; - - meta = with lib; { - description = "A fancy TUI client for Google Play Music"; - longDescription = '' - TUIJam seeks to make a simple, attractive, terminal-based interface to - listening to music for Google Play Music All-Access subscribers. - ''; - homepage = "https://github.com/cfangmeier/tuijam"; - license = licenses.mit; - maintainers = with maintainers; [ kalbasit ]; - }; -} diff --git a/pkgs/development/python-modules/gmusicapi/default.nix b/pkgs/development/python-modules/gmusicapi/default.nix deleted file mode 100644 index c9fc464f0694..000000000000 --- a/pkgs/development/python-modules/gmusicapi/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, validictory -, decorator -, mutagen -, protobuf -, setuptools -, requests -, dateutil -, proboscis -, mock -, appdirs -, oauth2client -, pyopenssl -, gpsoauth -, MechanicalSoup -, future -}: - -buildPythonPackage rec { - pname = "gmusicapi"; - version = "13.0.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "14dqs64nhy84dykyyrdjmsirc7m169zsvwa8abh4v0xcm658lm5k"; - }; - - propagatedBuildInputs = [ validictory decorator mutagen protobuf setuptools requests dateutil proboscis mock appdirs oauth2client pyopenssl gpsoauth MechanicalSoup future ]; - - doCheck = false; - pythonImportsCheck = [ "gmusicapi" ]; - - meta = with lib; { - description = "An unofficial API for Google Play Music"; - homepage = "https://pypi.python.org/pypi/gmusicapi/"; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/python-modules/google-music-proto/default.nix b/pkgs/development/python-modules/google-music-proto/default.nix deleted file mode 100644 index a883f707bdf1..000000000000 --- a/pkgs/development/python-modules/google-music-proto/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pythonOlder -, attrs -, audio-metadata -, importlib-metadata -, marshmallow -, pendulum -, protobuf -}: - -buildPythonPackage rec { - pname = "google-music-proto"; - version = "2.10.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "91b78c0de4f59b1e5503fd6d49cb3fec029d9199cca0794c87667e643342e987"; - }; - - postPatch = '' - sed -i -e "/audio-metadata/c\'audio-metadata'," -e "/marshmallow/c\'marshmallow'," setup.py - substituteInPlace setup.py \ - --replace "'attrs>=18.2,<19.4'" "'attrs'" - ''; - - propagatedBuildInputs = [ - attrs - audio-metadata - marshmallow - pendulum - protobuf - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata - ]; - - # No tests - doCheck = false; - pythonImportsCheck = [ "google_music_proto" ]; - - meta = with lib; { - homepage = "https://github.com/thebigmunch/google-music-proto"; - description = "Sans-I/O wrapper of Google Music API calls"; - license = licenses.mit; - maintainers = with maintainers; [ jakewaksbaum ]; - }; -} diff --git a/pkgs/development/python-modules/google-music-utils/default.nix b/pkgs/development/python-modules/google-music-utils/default.nix deleted file mode 100644 index 801b4b78a178..000000000000 --- a/pkgs/development/python-modules/google-music-utils/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, audio-metadata -, multidict -, poetry -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "google-music-utils"; - version = "2.5.0"; - - # Pypi tarball doesn't contain tests - src = fetchFromGitHub { - owner = "thebigmunch"; - repo = "google-music-utils"; - rev = version; - sha256 = "0vwbrgakk23fypjspmscz4gllnb3dksv2njy4j4bm8vyr6fwbi5f"; - }; - format = "pyproject"; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'multidict = "^4.0"' 'multidict = ">4.0"' - ''; - - nativeBuildInputs = [ poetry ]; - - propagatedBuildInputs = [ audio-metadata multidict ]; - - checkInputs = [ pytestCheckHook ]; - - meta = with lib; { - homepage = "https://github.com/thebigmunch/google-music-utils"; - description = "A set of utility functionality for google-music and related projects"; - license = licenses.mit; - maintainers = with maintainers; [ jakewaksbaum ]; - }; -} diff --git a/pkgs/development/python-modules/google-music/default.nix b/pkgs/development/python-modules/google-music/default.nix deleted file mode 100644 index 90978ad2cba7..000000000000 --- a/pkgs/development/python-modules/google-music/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, appdirs -, audio-metadata -, google-music-proto -, httpx -, protobuf -, requests_oauthlib -, tenacity -}: - -buildPythonPackage rec { - pname = "google-music"; - version = "3.7.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "0fsp491ifsw0i1r98l8xr41m8d00nw9n5bin8k3laqzq1p65d6dp"; - }; - - propagatedBuildInputs = [ - appdirs - audio-metadata - google-music-proto - httpx - protobuf - requests_oauthlib - tenacity - ]; - - # No tests - doCheck = false; - - meta = with lib; { - homepage = "https://github.com/thebigmunch/google-music"; - description = "A Google Music API wrapper"; - license = licenses.mit; - maintainers = with maintainers; [ jakewaksbaum ]; - }; -} diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 2be0b1bc76f6..5cae647cf8f7 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -16,7 +16,6 @@ , enableDiscogs ? true , enableEmbyupdate ? true , enableFetchart ? true -, enableGmusic ? true , enableKeyfinder ? true, keyfinder-cli , enableKodiupdate ? true , enableLastfm ? true @@ -54,7 +53,6 @@ let discogs = enableDiscogs; embyupdate = enableEmbyupdate; fetchart = enableFetchart; - gmusic = enableGmusic; keyfinder = enableKeyfinder; kodiupdate = enableKodiupdate; lastgenre = enableLastfm; @@ -144,7 +142,6 @@ in pythonPackages.buildPythonApplication rec { ++ lib.optional enableCheck beetsExternalPlugins.check ++ lib.optional enableConvert ffmpeg ++ lib.optional enableDiscogs pythonPackages.discogs_client - ++ lib.optional enableGmusic pythonPackages.gmusicapi ++ lib.optional enableKeyfinder keyfinder-cli ++ lib.optional enableLastfm pythonPackages.pylast ++ lib.optional enableMpd pythonPackages.mpd2 @@ -209,6 +206,9 @@ in pythonPackages.buildPythonApplication rec { echo echo completion tests passed > test/rsrc/test_completion.sh sed -i -e 's/len(mf.images)/0/' test/test_zero.py + + # Google Play Music was discontinued + rm -r beetsplug/gmusic.py ''; postInstall = '' diff --git a/pkgs/tools/audio/beets/plugins/alternatives.nix b/pkgs/tools/audio/beets/plugins/alternatives.nix index 797aab16c1ae..c0b9123d96a5 100644 --- a/pkgs/tools/audio/beets/plugins/alternatives.nix +++ b/pkgs/tools/audio/beets/plugins/alternatives.nix @@ -2,19 +2,26 @@ pythonPackages.buildPythonApplication rec { pname = "beets-alternatives"; - version = "0.9.0"; + version = "0.10.2"; src = fetchFromGitHub { repo = "beets-alternatives"; owner = "geigerzaehler"; - # This is 0.8.2 with fixes against Beets 1.4.6 and Python 3 compatibility. rev = "v${version}"; - sha256 = "19160gwg5j6asy8mc21g2kf87mx4zs9x2gbk8q4r6330z4kpl5pm"; + sha256 = "1dsz94fb29wra1f9580w20bz2f1bgkj4xnsjgwgbv14flbfw4bp0"; }; - nativeBuildInputs = [ beets pythonPackages.nose ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "addopts = --cov --cov-report=term --cov-report=html" "" + ''; - checkPhase = "nosetests"; + nativeBuildInputs = [ beets ]; + + checkInputs = with pythonPackages; [ + pytestCheckHook + mock + ]; meta = { description = "Beets plugin to manage external files"; diff --git a/pkgs/tools/audio/beets/plugins/check.nix b/pkgs/tools/audio/beets/plugins/check.nix index 259b62a23b05..a575836ef388 100644 --- a/pkgs/tools/audio/beets/plugins/check.nix +++ b/pkgs/tools/audio/beets/plugins/check.nix @@ -31,5 +31,6 @@ pythonPackages.buildPythonApplication rec { homepage = "https://github.com/geigerzaehler/beets-check"; license = licenses.mit; maintainers = with maintainers; [ lovesegfault ]; + broken = true; }; } diff --git a/pkgs/tools/audio/google-music-scripts/default.nix b/pkgs/tools/audio/google-music-scripts/default.nix deleted file mode 100644 index 481a7ecb75b3..000000000000 --- a/pkgs/tools/audio/google-music-scripts/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib, python3 }: - -let - py = python3.override { - packageOverrides = self: super: { - loguru = super.loguru.overridePythonAttrs (oldAttrs: rec { - version = "0.4.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0j47cg3gi8in4z6z4w3by6x02mpkkfl78gr85xjn5rg0nxiz7pfm"; - }; - }); - }; - }; - -in - -with py.pkgs; - -buildPythonApplication rec { - pname = "google-music-scripts"; - version = "4.5.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "0apwgj86whrc077dfymvyb4qwj19bawyrx49g4kg364895v0rbbq"; - }; - - # there are already later releases present - postPatch = '' - substituteInPlace setup.py \ - --replace "tomlkit>=0.5,<0.6" "tomlkit" \ - --replace "attrs>=18.2,<19.4" "attrs" - ''; - - propagatedBuildInputs = [ - appdirs - audio-metadata - google-music - google-music-proto - google-music-utils - loguru - pendulum - natsort - tomlkit - ]; - - # No tests - checkPhase = '' - $out/bin/gms --help >/dev/null - ''; - - meta = with lib; { - 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/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2a94e28cfc6b..da00ed76ca87 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -260,6 +260,9 @@ mapAliases ({ goimports = gotools; # added 2018-09-16 gometalinter = throw "gometalinter was abandoned by upstream. Consider switching to golangci-lint instead"; # added 2020-04-23 google-gflags = gflags; # added 2019-07-25 + google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # added 2021-03-07 + google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # added 2021-03-07 + google-play-music-desktop-player = throw "google-play-music-desktop-player has been removed because Google Play Music was discontinued"; # added 2021-03-07 googleAuthenticator = google-authenticator; # added 2016-10-16 grantlee5 = libsForQt5.grantlee; # added 2015-12-19 gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 @@ -384,6 +387,7 @@ mapAliases ({ mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # added 2020-05-23 mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained; try mcomix3 a Python 3 fork"; # added 2019-12-10, modified 2020-11-25 mirage = throw "mirage has been femoved from nixpkgs, as it's unmaintained"; # added 2019-12-10 + mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # added 2021-03-07 mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18 mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18 mysql-client = hiPrio mariadb.client; @@ -731,6 +735,7 @@ mapAliases ({ trilium = throw "trilium has been removed. Please use trilium-desktop instead."; # added 2020-04-29 truecrypt = veracrypt; # added 2018-10-24 tshark = wireshark-cli; # added 2018-04-25 + tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # added 2021-03-07 uberwriter = apostrophe; # added 2020-04-23 ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21 ucsFonts = ucs-fonts; # added 2016-07-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e46dd575db8c..3c8e41f88e39 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -662,8 +662,6 @@ in arc_unpacker = callPackage ../tools/archivers/arc_unpacker { }; - tuijam = callPackage ../applications/audio/tuijam { inherit (python3Packages) buildPythonApplication; }; - opnplug = callPackage ../applications/audio/adlplug { adlplugChip = "-DADLplug_CHIP=OPN2"; pname = "OPNplug"; @@ -4879,8 +4877,6 @@ in google-compute-engine-oslogin = callPackage ../tools/virtualization/google-compute-engine-oslogin { }; - google-music-scripts = callPackage ../tools/audio/google-music-scripts { }; - google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { }; gdown = with python3Packages; toPythonApplication gdown; @@ -22394,17 +22390,6 @@ in inherit (ocamlPackages) google-drive-ocamlfuse; - google-musicmanager = callPackage ../applications/audio/google-musicmanager { - inherit (qt514) qtbase qtwebkit; - # Downgrade to 1.34 to get libidn.so.11 - libidn = (libidn.overrideAttrs (oldAttrs: { - src = fetchurl { - url = "mirror://gnu/libidn/libidn-1.34.tar.gz"; - sha256 = "0g3fzypp0xjcgr90c5cyj57apx1cmy0c6y9lvw2qdcigbyby469p"; - }; - })).out; - }; - googler = callPackage ../applications/misc/googler { python = python3; }; @@ -22857,10 +22842,6 @@ in google-chrome-dev = google-chrome.override { chromium = chromiumDev; channel = "dev"; }; - google-play-music-desktop-player = callPackage ../applications/audio/google-play-music-desktop-player { - inherit (gnome2) GConf; - }; - gosmore = callPackage ../applications/misc/gosmore { }; gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { @@ -23926,7 +23907,6 @@ in inherit (mopidyPackages) mopidy - mopidy-gmusic mopidy-iris mopidy-local mopidy-moped diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 638ad7241751..011c054e295d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2670,8 +2670,6 @@ in { gmpy = callPackage ../development/python-modules/gmpy { }; - gmusicapi = callPackage ../development/python-modules/gmusicapi { }; - gntp = callPackage ../development/python-modules/gntp { }; gnureadline = callPackage ../development/python-modules/gnureadline { }; @@ -2795,12 +2793,6 @@ in { googlemaps = callPackage ../development/python-modules/googlemaps { }; - google-music = callPackage ../development/python-modules/google-music { }; - - google-music-proto = callPackage ../development/python-modules/google-music-proto { }; - - google-music-utils = callPackage ../development/python-modules/google-music-utils { }; - google-pasta = callPackage ../development/python-modules/google-pasta { }; google-resumable-media = callPackage ../development/python-modules/google-resumable-media { };