Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4acf0beba1b7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d7cdc485022f
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 24, 2020

  1. python-telegram-bot: fix vendored urllib patches

    @pingiun
    pingiun authored and Jon committed Jan 24, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    cab404 Cabia Rangris
    GPG key ID: 6BA7C26C3FDF7BB3
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7680df1 View commit details

  2. python-telegram-bot: add pingiun as maintainer

    @pingiun
    pingiun authored and Jon committed Jan 24, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    cab404 Cabia Rangris
    GPG key ID: 6BA7C26C3FDF7BB3
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d7cdc48 View commit details
Showing with 3 additions and 2 deletions.
  1. +3 −2 pkgs/development/python-modules/python-telegram-bot/default.nix
5 changes: 3 additions & 2 deletions pkgs/development/python-modules/python-telegram-bot/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,8 @@ buildPythonPackage rec {
--replace "import telegram.vendor.ptb_urllib3.urllib3 as urllib3" "import urllib3 as urllib3" \
--replace "import telegram.vendor.ptb_urllib3.urllib3.contrib.appengine as appengine" "import urllib3.contrib.appengine as appengine" \
--replace "from telegram.vendor.ptb_urllib3.urllib3.connection import HTTPConnection" "from urllib3.connection import HTTPConnection" \
--replace "from telegram.vendor.ptb_urllib3.urllib3.util.timeout import Timeout" "from urllib3.util.timeout import Timeout"
--replace "from telegram.vendor.ptb_urllib3.urllib3.util.timeout import Timeout" "from urllib3.util.timeout import Timeout" \
--replace "from telegram.vendor.ptb_urllib3.urllib3.fields import RequestField" "from urllib3.fields import RequestField"
touch LICENSE.dual
'';
@@ -38,6 +39,6 @@ buildPythonPackage rec {
description = "This library provides a pure Python interface for the Telegram Bot API.";
homepage = https://python-telegram-bot.org;
license = licenses.lgpl3;
maintainers = with maintainers; [ veprbl ];
maintainers = with maintainers; [ veprbl pingiun ];
};
}