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

Commits on Nov 23, 2018

  1. matrix-synapse: prepare for python3 switch 

    With this commit, we *can* swap python2 for python3 to run synapse using python3
instead.

The reason for not making the switch is that a number of CLI tools provided with
synapse do not yet work under py3 despite synapse running fine.

So this doesn't actually do anything on its own except to prepare for the
upcoming py3 switch.

(cherry picked from commit dc74c44)
    @peterhoeg @fpletz
    peterhoeg authored and fpletz committed Nov 23, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    247fea9 View commit details

  2. matrix-synapse: 0.33.8 -> 0.33.9 

    (cherry picked from commit 2bf16cb)
    @fpletz
    fpletz committed Nov 23, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    96550b3 View commit details

Commits on Nov 24, 2018

  1. browserpass: 2.0.18 -> 2.0.22 

    (cherry picked from commit 5ea22c4)
    @fpletz
    fpletz committed Nov 24, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b2030e8 View commit details
Showing with 34 additions and 27 deletions.
  1. +32 −25 pkgs/servers/matrix-synapse/default.nix
  2. +2 −2 pkgs/tools/security/browserpass/default.nix
57 changes: 32 additions & 25 deletions pkgs/servers/matrix-synapse/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,47 +1,54 @@
{ lib, stdenv, python2Packages, fetchurl, fetchFromGitHub
{ lib, stdenv, python2
, enableSystemd ? true
}:

with python2.pkgs;

let
matrix-angular-sdk = python2Packages.buildPythonPackage rec {
name = "matrix-angular-sdk-${version}";
matrix-angular-sdk = buildPythonPackage rec {
pname = "matrix-angular-sdk";
version = "0.6.8";

src = fetchurl {
url = "mirror://pypi/m/matrix-angular-sdk/matrix-angular-sdk-${version}.tar.gz";
src = fetchPypi {
inherit pname version;
sha256 = "0gmx4y5kqqphnq3m7xk2vpzb0w2a4palicw7wfdr1q2schl9fhz2";
};

# no checks from Pypi but as this is abandonware, there will be no
# new version anyway
doCheck = false;
};
matrix-synapse-ldap3 = python2Packages.buildPythonPackage rec {

matrix-synapse-ldap3 = buildPythonPackage rec {
pname = "matrix-synapse-ldap3";
version = "0.1.3";

src = fetchFromGitHub {
owner = "matrix-org";
repo = "matrix-synapse-ldap3";
rev = "v${version}";
sha256 = "0ss7ld3bpmqm8wcs64q1kb7vxlpmwk9lsgq0mh21a9izyfc7jb2l";
src = fetchPypi {
inherit pname version;
sha256 = "0a0d1y9yi0abdkv6chbmxr3vk36gynnqzrjhbg26q4zg06lh9kgn";
};

propagatedBuildInputs = with python2Packages; [ service-identity ldap3 twisted ];
propagatedBuildInputs = [ service-identity ldap3 twisted ];

checkInputs = with python2Packages; [ ldaptor mock ];
# ldaptor is not ready for py3 yet
doCheck = !isPy3k;
checkInputs = [ ldaptor mock ];
};
in python2Packages.buildPythonApplication rec {
name = "matrix-synapse-${version}";
version = "0.33.8";

src = fetchFromGitHub {
owner = "matrix-org";
repo = "synapse";
rev = "v${version}";
sha256 = "122ba09xkc1x35qaajcynkjikg342259rgy81m8abz0l8mcg4mkm";
in buildPythonApplication rec {
pname = "matrix-synapse";
version = "0.33.9";

src = fetchPypi {
inherit pname version;
sha256 = "1wdpywqi1xd6dy3hxnnjnh2amlmhljf8s0bff9v55jyh42bj1vpn";
};

patches = [
./matrix-synapse.patch
];

propagatedBuildInputs = with python2Packages; [
propagatedBuildInputs = [
bcrypt
bleach
canonicaljson
@@ -75,12 +82,12 @@ in python2Packages.buildPythonApplication rec {
unpaddedbase64
] ++ lib.optional enableSystemd systemd;

# tests fail under py3 for now, but version 0.34.0 will use py3 by default
# https://github.com/matrix-org/synapse/issues/4036
doCheck = true;
checkPhase = "python -m twisted.trial test";

buildInputs = with python2Packages; [
mock setuptoolsTrial
];
checkInputs = [ mock setuptoolsTrial ];

meta = with stdenv.lib; {
homepage = https://matrix.org;
4 changes: 2 additions & 2 deletions pkgs/tools/security/browserpass/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@

buildGoPackage rec {
name = "browserpass-${version}";
version = "2.0.18";
version = "2.0.22";

goPackagePath = "github.com/dannyvankooten/browserpass";

@@ -13,7 +13,7 @@ buildGoPackage rec {
repo = "browserpass";
owner = "dannyvankooten";
rev = version;
sha256 = "0wszjpxfa0krr2zdx7a33vl1r86k74dpy5c940r6ww1zbgqzcibg";
sha256 = "05cacrx08k99c5zra7ksdik9xxn3vih3x6in7536zs5gm55mkbfx";
};

postPatch = ''