diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-04-12 02:33:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-12 02:33:32 +0200 |
| commit | 4c8794641f9e73176bd8a9bd194c65fb05184c1b (patch) | |
| tree | a6da6cc430941f0388acff2588b463b164e3ef32 /pkgs | |
| parent | 36d6015eedd00948416cacf057b049a6ba20f848 (diff) | |
| parent | 0b897f7cd5ef898d889d77acc20b3d4da02cdea3 (diff) | |
| download | nixpkgs-4c8794641f9e73176bd8a9bd194c65fb05184c1b.tar nixpkgs-4c8794641f9e73176bd8a9bd194c65fb05184c1b.tar.gz nixpkgs-4c8794641f9e73176bd8a9bd194c65fb05184c1b.tar.bz2 nixpkgs-4c8794641f9e73176bd8a9bd194c65fb05184c1b.tar.lz nixpkgs-4c8794641f9e73176bd8a9bd194c65fb05184c1b.tar.xz nixpkgs-4c8794641f9e73176bd8a9bd194c65fb05184c1b.tar.zst nixpkgs-4c8794641f9e73176bd8a9bd194c65fb05184c1b.zip | |
Merge pull request #119113 from fabaff/bump-discordpy
python3Packages.discordpy: 1.7.0 -> 1.7.1
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/discordpy/default.nix | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index 94181def867..d4f742d97f5 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -1,35 +1,40 @@ { lib -, fetchFromGitHub +, aiohttp , buildPythonPackage +, fetchFromGitHub +, libopus +, pynacl , pythonOlder -, withVoice ? true, libopus -, aiohttp , websockets +, withVoice ? true }: buildPythonPackage rec { pname = "discord.py"; - version = "1.7.0"; - disabled = pythonOlder "3.5.3"; + version = "1.7.1"; + disabled = pythonOlder "3.8"; - # only distributes wheels on pypi now src = fetchFromGitHub { owner = "Rapptz"; repo = pname; rev = "v${version}"; - sha256 = "1i5k2qb894rjksn21pk9shash1y7v4138rkk8mqr1a1yvgnr5ibg"; + sha256 = "sha256-dpASIqe6rJEyiWJyPbQhq9M54lX1ilfp4UuGnbJcFLo="; }; - propagatedBuildInputs = [ aiohttp websockets ]; + propagatedBuildInputs = [ + aiohttp + websockets + ] ++ lib.optionalString withVoice [ + libopus + pynacl + ]; + patchPhase = '' - substituteInPlace "requirements.txt" \ - --replace "websockets>=6.0,!=7.0,!=8.0,!=8.0.1,<9.0" "websockets" - '' + lib.optionalString withVoice '' substituteInPlace "discord/opus.py" \ --replace "ctypes.util.find_library('opus')" "'${libopus}/lib/libopus.so.0'" ''; - # only have integration tests with discord + # Only have integration tests with discord doCheck = false; pythonImportsCheck = [ @@ -44,7 +49,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A python wrapper for the Discord API"; + description = "Python wrapper for the Discord API"; homepage = "https://discordpy.rtfd.org/"; maintainers = [ maintainers.ivar ]; license = licenses.mit; |