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: 52d3cc443853
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a823dee9d9cd
Choose a head ref
  • 11 commits
  • 12 files changed
  • 1 contributor

Commits on Nov 18, 2020

  1. python3Packages.csvw: 1.8.0 -> 1.8.1

    @mweinelt
    mweinelt authored and Jonathan Ringer committed Nov 18, 2020
    Copy the full SHA
    832add5 View commit details

  2. python3Packages.mocket: 3.9.2 -> 3.9.3

    @mweinelt
    mweinelt authored and Jonathan Ringer committed Nov 18, 2020
    Copy the full SHA
    ed6d6eb View commit details

  3. python3Packages.async_stagger: 0.3.0 -> 0.3.1

    @mweinelt
    mweinelt authored and Jonathan Ringer committed Nov 18, 2020
    Copy the full SHA
    5c4a4a5 View commit details

  4. python3Packages.async-upnp-client: 0.14.14 -> 0.14.15

    @mweinelt
    mweinelt authored and Jonathan Ringer committed Nov 18, 2020
    Copy the full SHA
    46463b7 View commit details

  5. python3Packages.brother: 0.1.17 -> 0.1.18

    @mweinelt
    mweinelt authored and Jonathan Ringer committed Nov 18, 2020
    Copy the full SHA
    77e9b46 View commit details

  6. python3Packages.clldutils: 3.5.2 -> 3.5.4

    @mweinelt
    mweinelt authored and Jonathan Ringer committed Nov 18, 2020
    Copy the full SHA
    204501b View commit details

  7. python3Packages.ircrobots: 0.3.3 -> 0.3.5

    @mweinelt
    mweinelt authored and Jonathan Ringer committed Nov 18, 2020
    Copy the full SHA
    cfef6dd View commit details

  8. python3Packages.ircstates: 0.11.3 -> 0.11.5

    @mweinelt
    mweinelt authored and Jonathan Ringer committed Nov 18, 2020
    Copy the full SHA
    c63c4f7 View commit details

  9. python3Packages.ntc-templates: 1.5.0 -> 1.6.0

    @mweinelt
    mweinelt authored and Jonathan Ringer committed Nov 18, 2020
    Copy the full SHA
    492c60c View commit details

  10. python3Packages.PyRMVtransport: 0.2.9 -> 0.2.10 

    Disables the test, because they require pytest-httpx, which has not been
packaged yet.
    @mweinelt
    mweinelt authored and Jonathan Ringer committed Nov 18, 2020
    Copy the full SHA
    f106443 View commit details

  11. python3Packages.python-didl-lite: 1.2.4 -> 1.2.5

    @mweinelt
    mweinelt authored and Jonathan Ringer committed Nov 18, 2020
    Copy the full SHA
    a823dee View commit details
15 changes: 9 additions & 6 deletions pkgs/development/python-modules/PyRMVtransport/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,41 @@
{ lib, buildPythonPackage, fetchFromGitHub
, flit
, lxml, aiohttp
, pytest, pytestcov, pytest-asyncio, pytest-mock, pytest-aiohttp, aresponses
, lxml, httpx
, pytest, pytestcov, pytest-asyncio, pytest-mock, aresponses
, pythonOlder
}:

buildPythonPackage rec {
pname = "PyRMVtransport";
version = "0.2.9";
version = "0.2.10";
format = "pyproject";
disabled = pythonOlder "3.6";

src = fetchFromGitHub {
owner = "cgtobi";
repo = pname;
rev = "v${version}";
sha256 = "1h3d0yxzrfi47zil5gr086v0780q768z8v5psvcikqw852f93vxb";
sha256 = "03qrylidb1d6zw6a22d1drdf73cvfxqcqaa8qi8x4pli1axcfh5w";
};

nativeBuildInputs = [
flit
];

propagatedBuildInputs = [
aiohttp
httpx
lxml
];

# requires pytest-httpx
doCheck = false;

checkInputs = [
pytest
pytestcov
pytest-asyncio
pytest-mock
pytest-aiohttp
# pytest-httpx is missing
aresponses
];
checkPhase = ''
8 changes: 4 additions & 4 deletions pkgs/development/python-modules/async-upnp-client/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
, voluptuous, aiohttp, async-timeout, python-didl-lite, defusedxml
, pytest, pytest-asyncio }:
, pytest_6, pytest-asyncio }:

buildPythonPackage rec {
pname = "async-upnp-client";
version = "0.14.14";
version = "0.14.15";
disabled = pythonOlder "3.5";

src = fetchFromGitHub {
owner = "StevenLooman";
repo = "async_upnp_client";
rev = version;
sha256 = "1ysj72l4z78h427ar95x7af0jw0xq1cbca0k8b34vqyyhgs8wc6y";
sha256 = "1mr65msdc51wq7326z3q41x79yi9dsmcjrmyzkgj9h9vgpxdk2nw";
};

propagatedBuildInputs = [
@@ -23,7 +23,7 @@ buildPythonPackage rec {
];

checkInputs = [
pytest
pytest_6
pytest-asyncio
];

13 changes: 2 additions & 11 deletions pkgs/development/python-modules/async_stagger/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,23 +10,14 @@

buildPythonPackage rec {
pname = "async_stagger";
version = "0.3.0";
version = "0.3.1";
disabled = pythonOlder "3.6";

src = fetchPypi {
inherit pname version;
sha256 = "007l54fbk2dfzv3vmqz98m1i37mzxkkva5r4fiwq2pg8nb61fy0w";
sha256 = "1mj3daaqxjdavbxcjrdwx5ky9maa2blbv53aa6d7w9zxkrz3b7xa";
};

patches = [
(fetchpatch {
# Fix test failures on Python 3.8
# https://github.com/twisteroidambassador/async_stagger/issues/4
url = "https://github.com/twisteroidambassador/async_stagger/commit/736ab20ff9c172628d911f1e6f72420399ec9631.patch";
sha256 = "1ygqd9n56sj83lvgmv6nrx3m0sp3646s5k7z697qx43xslixj731";
})
];

checkInputs = [
pytestCheckHook
pytest-asyncio
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/brother/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,14 +4,14 @@

buildPythonPackage rec {
pname = "brother";
version = "0.1.17";
version = "0.1.18";
disabled = pythonOlder "3.8";

src = fetchFromGitHub {
owner = "bieniu";
repo = pname;
rev = version;
sha256 = "03gjcpbq8rwnjzplgwhwr8wb7a1zh940dr6iwnq9srklqzzj691m";
sha256 = "14fiwhgcgymgqsl9kcfb0597rcjxvdknhwbakpdf0xp2ph6cj266";
};

propagatedBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/clldutils/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,14 +15,14 @@

buildPythonPackage rec {
pname = "clldutils";
version = "3.5.2";
version = "3.5.4";
disabled = isPy27;

src = fetchFromGitHub {
owner = "clld";
repo = pname;
rev = "v${version}";
sha256 = "0qlqp9yq4lbi9ik2psgw0svxlb7raadqaxdh2dgkn85d7h20y4nd";
sha256 = "0yirww9abp6hffxz57ms7ljyjw0pamw2bhfrf7cshpwwb6sx5ycf";
};

patchPhase = ''
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/csvw/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,14 +14,14 @@

buildPythonPackage rec {
pname = "csvw";
version = "1.8.0";
version = "1.8.1";
disabled = isPy27;

src = fetchFromGitHub {
owner = "cldf";
repo = "csvw";
rev = "v${version}";
sha256 = "0maxrsiv9i9hkg627hwqyq8g6jg3g8iv8gdqaxz4aysjd9xddydd";
sha256 = "1cafwgkspkc299shsa5x8wfzkx1d63p9rvslj9jwr68fipd1830w";
};

patchPhase = ''
12 changes: 7 additions & 5 deletions pkgs/development/python-modules/ircrobots/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,19 +13,21 @@

buildPythonPackage rec {
pname = "ircrobots";
version = "0.3.3";
version = "0.3.5";
disabled = pythonOlder "3.6";

src = fetchFromGitHub {
owner = "jesopo";
repo = pname;
rev = "v${version}";
sha256 = "0ykn6ch7aazv2cx13q2gr94arh6f96d8hwjwnrcjai3i3x4q2pkq";
sha256 = "1w04gif227fhzalrds9rscqmckv5h0x2p8600s876i19w41swi32";
};

patches = [
./relax-dependencies.patch
];
postPatch = ''
# too specific pins https://github.com/jesopo/ircrobots/issues/3
sed -iE 's/==.*//' requirements.txt
sed -iE 's/dataclasses.*/dataclasses; python_version < "3.7"/' requirements.txt
'';

propagatedBuildInputs = [
anyio
14 changes: 0 additions & 14 deletions pkgs/development/python-modules/ircrobots/relax-dependencies.patch
View file

This file was deleted.

12 changes: 2 additions & 10 deletions pkgs/development/python-modules/ircstates/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,24 +10,16 @@

buildPythonPackage rec {
pname = "ircstates";
version = "0.11.3";
version = "0.11.5";
disabled = pythonOlder "3.6"; # f-strings

src = fetchFromGitHub {
owner = "jesopo";
repo = pname;
rev = "v${version}";
sha256 = "1v8r6ma8gzvn5ym3xx9qlb0rc4l67pxr3z8njzk1ffxn1x3mxd3i";
sha256 = "1b1py1q02wbp4fmkjvchvazklfqibqd6pb28gdq7dg1bwwwd7vda";
};

patches = [
(fetchpatch {
name = "relax-pendulum-version.patch";
url = "https://github.com/jesopo/ircstates/commit/f51f1b689e592020d1c91ccab6c03927aadb9f94.patch";
sha256 = "0qbp3b9hlqbbx7b474q1mcgnzzzwcm4g89x26iqgmlgxzmv3y5xp";
})
];

propagatedBuildInputs = [
irctokens
pendulum
9 changes: 4 additions & 5 deletions pkgs/development/python-modules/mocket/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,17 +9,16 @@

buildPythonPackage rec {
pname = "mocket";
version = "3.9.2";
version = "3.9.3";

src = fetchPypi {
inherit pname version;
sha256 = "25aba0b343784b27b1d77e731ed868a728d5209911f9f4728f33088582e491c9";
sha256 = "15npwf0f8g5vmwpmyvmsyi4p9ia1w95z8jips0nkfs978pnjy69g";
};

patchPhase = ''
substituteInPlace requirements.txt \
--replace "python-magic==0.4.18" "python-magic" \
--replace "urllib3==1.25.10" "urllib3"
sed -iE "s,python-magic==.*,python-magic," requirements.txt
sed -iE "s,urllib3==.*,urllib3," requirements.txt
substituteInPlace setup.py --replace 'setup_requires=["pipenv"]' "setup_requires=[]"
'';

6 changes: 3 additions & 3 deletions pkgs/development/python-modules/ntc-templates/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,14 +10,14 @@

buildPythonPackage rec {
pname = "ntc-templates";
version = "1.5.0";
version = "1.6.0";
disabled = isPy27;

src = fetchFromGitHub {
owner = "networktocode";
repo = pname;
rev = "v${version}";
sha256 = "0pvd9n7hcmxl9cr8m1xlqcjmy3k2hga0qmn2k3x9hripjis7pbbi";
rev = "dc27599b0c5f3bb6ff23049e781b5dab2849c2c3"; # not tagged
sha256 = "1vg5y5c51vc9dj3b8qcffh6dz85ri11zb1azxmyvgbq86pcvbx9f";
};

propagatedBuildInputs = [ textfsm ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/python-didl-lite/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,14 +4,14 @@

buildPythonPackage rec {
pname = "python-didl-lite";
version = "1.2.4";
version = "1.2.5";
disabled = pythonOlder "3.5.3";

src = fetchFromGitHub {
owner = "StevenLooman";
repo = pname;
rev = version;
sha256 = "0jf1d5m4r8qd3pn0hh1xqbkblkx9wzrrcmk7qa7q8lzfysp4z217";
sha256 = "0wm831g8k9xahw20y0461cvy6lp45sxppicxah1rg9isdc3vy3nh";
};

propagatedBuildInputs = [