diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-28 00:01:24 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-28 00:01:24 +0000 |
commit | ef4ddefb6e17a76dfbc5d214d5000651687c7860 (patch) | |
tree | 1011dbe0a931be18d4130b60576d7b7fc0d96413 /pkgs/development | |
parent | 1965bbf76acf84e8335146b10792320b1076ee28 (diff) | |
parent | 0efb458bc1d1c5d4f36e55ae3c513d5dec615d46 (diff) | |
download | nixpkgs-ef4ddefb6e17a76dfbc5d214d5000651687c7860.tar nixpkgs-ef4ddefb6e17a76dfbc5d214d5000651687c7860.tar.gz nixpkgs-ef4ddefb6e17a76dfbc5d214d5000651687c7860.tar.bz2 nixpkgs-ef4ddefb6e17a76dfbc5d214d5000651687c7860.tar.lz nixpkgs-ef4ddefb6e17a76dfbc5d214d5000651687c7860.tar.xz nixpkgs-ef4ddefb6e17a76dfbc5d214d5000651687c7860.tar.zst nixpkgs-ef4ddefb6e17a76dfbc5d214d5000651687c7860.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development')
4 files changed, 28 insertions, 13 deletions
diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index a0c02e26db0..08f0ee22714 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { pname = "yosys"; - version = "0.9+4052"; + version = "0.9+4221"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "687f381b6985d9dda7e11535628e2fafff267af5"; - sha256 = "15lcj798ckh9zwvdqb5gnvicilsxjyxv01gcviijg310hq62n7vf"; + rev = "9600f20be887b707f6d5d3f74dec58b336e2464e"; + sha256 = "0xbvbnhc6qvcq1c8zxfyf4ws959c824z660nrghfxyzkrjl8wi1h"; }; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/aiorpcx/default.nix b/pkgs/development/python-modules/aiorpcx/default.nix index 8e2078f5212..eae5b4a537c 100644 --- a/pkgs/development/python-modules/aiorpcx/default.nix +++ b/pkgs/development/python-modules/aiorpcx/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "aiorpcx"; - version = "0.18.7"; + version = "0.22.1"; src = fetchPypi { inherit version; pname = "aiorpcX"; - sha256 = "808a9ec9172df11677a0f7b459b69d1a6cf8b19c19da55541fa31fb1afce5ce7"; + sha256 = "0lx54bcinp44fmr8q4bbffsqbkg8kdcwykf9i5jj0bj3sfzgf9k0"; }; propagatedBuildInputs = [ attrs ]; diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/pkgs/development/python-modules/matrix-client/default.nix index 354eace5047..6605009b8fd 100644 --- a/pkgs/development/python-modules/matrix-client/default.nix +++ b/pkgs/development/python-modules/matrix-client/default.nix @@ -1,25 +1,40 @@ { lib , buildPythonPackage , fetchPypi +, pytestCheckHook , requests -, pytest, pytest-runner, responses +, responses +, urllib3 }: buildPythonPackage rec { pname = "matrix_client"; - version = "0.3.2"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "1mgjd0ymf9mvqjkvgx3xjhxap7rzdmpa21wfy0cxbw2xcswcrqyw"; + sha256 = "0mii7ib3bah5ppqs7i8sjv5l0zbl57011908m4l0jbyby90ayy06"; }; - checkInputs = [ pytest pytest-runner responses ]; + propagatedBuildInputs = [ + requests + urllib3 + ]; - propagatedBuildInputs = [ requests ]; + checkInputs = [ + pytestCheckHook + responses + ]; + + postPatch = '' + substituteInPlace setup.py --replace \ + "pytest-runner~=5.1" "" + ''; + + pythonImportsCheck = [ "matrix_client" ]; meta = with lib; { - description = "Matrix Client-Server SDK"; + description = "Python Matrix Client-Server SDK"; homepage = "https://github.com/matrix-org/matrix-python-sdk"; license = licenses.asl20; maintainers = with maintainers; [ olejorgenb ]; diff --git a/pkgs/development/python-modules/nexia/default.nix b/pkgs/development/python-modules/nexia/default.nix index b9553765fb4..22dbea2cd51 100644 --- a/pkgs/development/python-modules/nexia/default.nix +++ b/pkgs/development/python-modules/nexia/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "nexia"; - version = "0.9.10"; + version = "0.9.11"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "bdraco"; repo = pname; rev = version; - sha256 = "0k97i243ap1sap5smvfmpsjqzkx5adjvi14awv82pcp52ckzkbi9"; + sha256 = "0ql08nfvh6rjhjdh78gzih7az95m0fc9wxc22yqmlc9grifnp9i5"; }; propagatedBuildInputs = [ |