From 53bea54a651c9a7c3f3a21af08779f806cd8735a Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Fri, 20 Apr 2018 16:42:27 +0200 Subject: [PATCH 1/6] matrix-synapse: 0.27.2 -> 0.27.4 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 3cf460539699..4c82f5cfdde8 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -26,13 +26,13 @@ let }; in pythonPackages.buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.27.2"; + version = "0.27.4"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "00hcjs5hbayamckcsfd92s7f3da9jv5nm5ygvwinyc7ml7gn66i3"; + sha256 = "051bwr4vz8mwglh1m9rqlljbn8g3alvd52f09ff887nsi6z3jc17"; }; patches = [ From 3d974552f35c450d6f6f74e18932e1d55d06e541 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Fri, 20 Apr 2018 17:24:19 +0200 Subject: [PATCH 2/6] canonicaljson: 1.0.0 -> 1.1.3 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 93e821fb719d..c2465a8e2f22 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16640,16 +16640,16 @@ EOF canonicaljson = buildPythonPackage rec { name = "canonicaljson-${version}"; - version = "1.0.0"; + version = "1.1.3"; src = pkgs.fetchgit { url = "https://github.com/matrix-org/python-canonicaljson.git"; rev = "refs/tags/v${version}"; - sha256 = "0r82zlip93y169ijkn8xpbp0yr22mf92pni6dw420vb53l27sprq"; + sha256 = "11j0xmbw2hbl789pyfga02w8aa3s8rkc8pk6501r1sfy8xljd8zy"; }; propagatedBuildInputs = with self; [ - frozendict simplejson + frozendict simplejson six ]; }; From 63901546df7b0b473459ad076c9dd190b5a0aba7 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Sat, 21 Apr 2018 18:46:44 +0200 Subject: [PATCH 3/6] canonicaljson: separating from pythonPackages --- .../python-modules/canonicaljson/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 15 +----------- 2 files changed, 24 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/python-modules/canonicaljson/default.nix diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix new file mode 100644 index 000000000000..b7fd01472aab --- /dev/null +++ b/pkgs/development/python-modules/canonicaljson/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi +, frozendict, simplejson, six +}: + +buildPythonPackage rec { + pname = "canonicaljson"; + version = "1.1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1q50zk9a0r7kd56rdf9cgyxxj7vy54j96sgh8vc8jhmsvdv8dzh6"; + }; + + propagatedBuildInputs = [ + frozendict simplejson six + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/matrix-org/python-canonicaljson; + description = "Encodes objects and arrays as RFC 7159 JSON."; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c2465a8e2f22..878292cb2025 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16638,20 +16638,7 @@ EOF }; }; - canonicaljson = buildPythonPackage rec { - name = "canonicaljson-${version}"; - version = "1.1.3"; - - src = pkgs.fetchgit { - url = "https://github.com/matrix-org/python-canonicaljson.git"; - rev = "refs/tags/v${version}"; - sha256 = "11j0xmbw2hbl789pyfga02w8aa3s8rkc8pk6501r1sfy8xljd8zy"; - }; - - propagatedBuildInputs = with self; [ - frozendict simplejson six - ]; - }; + canonicaljson = callPackage ../development/python-modules/canonicaljson { }; daemonize = buildPythonPackage rec { name = "daemonize-${version}"; From ce3961cc70d506838084834c22e29983899c5011 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Fri, 20 Apr 2018 22:37:06 +0200 Subject: [PATCH 4/6] python-frozendict: 0.5 -> 1.2 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 878292cb2025..1de6d8bafa3f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2558,11 +2558,11 @@ in { fritzconnection = callPackage ../development/python-modules/fritzconnection { }; frozendict = buildPythonPackage rec { - name = "frozendict-0.5"; + name = "frozendict-1.2"; src = pkgs.fetchurl { url = "mirror://pypi/f/frozendict/${name}.tar.gz"; - sha256 = "0m4kg6hbadvf99if78nx01q7qnbyhdw3x4znl5dasgciyi54432n"; + sha256 = "0ibf1wipidz57giy53dh7mh68f2hz38x8f4wdq88mvxj5pr7jhbp"; }; meta = { From 2749531e0f1a76c7e611ce8a7f553de337c1f8e9 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Sat, 21 Apr 2018 18:48:10 +0200 Subject: [PATCH 5/6] frozendict: move to separate module --- .../python-modules/frozendict/default.nix | 17 +++++++++++++++++ pkgs/top-level/python-packages.nix | 15 +-------------- 2 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/python-modules/frozendict/default.nix diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix new file mode 100644 index 000000000000..4ec8eff70c6d --- /dev/null +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "frozendict"; + version = "1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ibf1wipidz57giy53dh7mh68f2hz38x8f4wdq88mvxj5pr7jhbp"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/slezica/python-frozendict; + description = "An immutable dictionary"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1de6d8bafa3f..b4028e01a4e0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2557,20 +2557,7 @@ in { fritzconnection = callPackage ../development/python-modules/fritzconnection { }; - frozendict = buildPythonPackage rec { - name = "frozendict-1.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/f/frozendict/${name}.tar.gz"; - sha256 = "0ibf1wipidz57giy53dh7mh68f2hz38x8f4wdq88mvxj5pr7jhbp"; - }; - - meta = { - homepage = https://github.com/slezica/python-frozendict; - description = "An immutable dictionary"; - license = stdenv.lib.licenses.mit; - }; - }; + frozendict = callPackage ../development/python-modules/frozendict { }; ftputil = callPackage ../development/python-modules/ftputil { }; From 9c194b1b63ffc92f289a783398f71ce6dfb70d18 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Mon, 23 Apr 2018 15:29:50 +0200 Subject: [PATCH 6/6] frozendict: disable checks as there are none --- pkgs/development/python-modules/frozendict/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix index 4ec8eff70c6d..94d42206d63d 100644 --- a/pkgs/development/python-modules/frozendict/default.nix +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -9,6 +9,9 @@ buildPythonPackage rec { sha256 = "0ibf1wipidz57giy53dh7mh68f2hz38x8f4wdq88mvxj5pr7jhbp"; }; + # frozendict does not come with tests + doCheck = false; + meta = with stdenv.lib; { homepage = https://github.com/slezica/python-frozendict; description = "An immutable dictionary";