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: b33513d237b9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4a5d203f2923
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 1, 2019

  1. pythonPackages.mautrix-appservice: 0.3.8 -> 0.3.10.dev1

    @nyanloutre
    nyanloutre committed Jun 1, 2019
    Copy the full SHA
    dacad98 View commit details

  2. mautrix-telegram: 0.5.1 -> 0.5.2

    @nyanloutre
    nyanloutre committed Jun 1, 2019
    Copy the full SHA
    024c1c3 View commit details

  3. Merge pull request #62405 from nyanloutre/mautrix_update_0_5_2 

    mautrix-telegram: 0.5.1 -> 0.5.2
    @fpletz
    fpletz authored Jun 1, 2019
    Copy the full SHA
    4a5d203 View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/development/python-modules/mautrix-appservice/default.nix
  2. +2 −2 pkgs/servers/mautrix-telegram/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/mautrix-appservice/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

buildPythonPackage rec {
pname = "mautrix-appservice";
version = "0.3.8";
version = "0.3.10.dev1";

src = fetchPypi {
inherit pname version;
sha256 = "b5752c6d84bf952698aec500b16542f6d2aacea37efd5be59087b5d9ea38c98f";
sha256 = "ed827ff2a50b43f8125268145991d51b4a32ea4fbdd95b589ea15019b72a0bc3";
};

propagatedBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/servers/mautrix-telegram/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@ with python3.pkgs;

buildPythonPackage rec {
pname = "mautrix-telegram";
version = "0.5.1";
version = "0.5.2";

src = fetchPypi {
inherit pname version;
sha256 = "51951845e52c4ca5410e0f4a51d99014dd6df2fcedfca8b7241e045359cbf112";
sha256 = "03dbd389e05aa08c52ef36ca362fcc9aa103f6c6173bb093ed03a96e05e8d43d";
};

postPatch = ''