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

Commits on Jun 7, 2019

  1. python3Packages.py-vapid: init at 1.5.0

    @peterhoeg
    peterhoeg committed Jun 7, 2019
    Copy the full SHA
    b6c3bad View commit details

  2. python3Packages.http-ece: init at 1.1.0

    @peterhoeg
    peterhoeg committed Jun 7, 2019
    Copy the full SHA
    0b90dd7 View commit details

  3. python3Packages.pywebpush: init at 1.9.4

    @peterhoeg
    peterhoeg committed Jun 7, 2019
    Copy the full SHA
    938f138 View commit details

  4. home-assistant: add support for html5 notifications

    @peterhoeg
    peterhoeg committed Jun 7, 2019
    Copy the full SHA
    1d88f42 View commit details

Commits on Jun 12, 2019

  1. Merge pull request #62801 from peterhoeg/p/pywebpush 

    python3Packages.pywebpush: init at 1.9.4
    @FRidh
    FRidh authored Jun 12, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    869f90b View commit details
24 changes: 24 additions & 0 deletions pkgs/development/python-modules/http-ece/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{ lib, fetchPypi, buildPythonPackage
, coverage, flake8, mock, nose
, cryptography }:

buildPythonPackage rec {
pname = "http_ece";
version = "1.1.0";

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

propagatedBuildInputs = [ cryptography ];

checkInputs = [ coverage flake8 mock nose ];

meta = with lib; {
description = "Encipher HTTP Messages";
homepage = https://github.com/martinthomson/encrypted-content-encoding;
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];
};
}
24 changes: 24 additions & 0 deletions pkgs/development/python-modules/py-vapid/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{ lib, buildPythonPackage, fetchPypi
, flake8, mock, nose, pytest
, cryptography
}:

buildPythonPackage rec {
pname = "py-vapid";
version = "1.5.0";

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

propagatedBuildInputs = [ cryptography ];

checkInputs = [ flake8 mock nose pytest ];

meta = with lib; {
description = "VAPID is a voluntary standard for WebPush subscription providers";
homepage = https://github.com/mozilla-services/vapid;
license = licenses.mpl20;
};
}
28 changes: 28 additions & 0 deletions pkgs/development/python-modules/pywebpush/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{ lib, fetchPypi, buildPythonPackage
, coverage, flake8, mock, nose
, http-ece, py-vapid, requests }:

buildPythonPackage rec {
pname = "pywebpush";
version = "1.9.4";

src = fetchPypi {
inherit pname version;
sha256 = "03qkijz56fx7p8405sknw2wji4pfj5knajk2lmj9y58mjxydbpp3";
};

propagatedBuildInputs = [
http-ece py-vapid requests
];

checkInputs = [
coverage flake8 mock nose
];

meta = with lib; {
description = "Webpush Data encryption library for Python";
homepage = https://github.com/web-push-libs/pywebpush;
license = licenses.mpl20;
maintainers = with maintainers; [ peterhoeg ];
};
}
2 changes: 1 addition & 1 deletion pkgs/servers/home-assistant/component-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -302,7 +302,7 @@
"hook" = ps: with ps; [ ];
"horizon" = ps: with ps; [ ];
"hp_ilo" = ps: with ps; [ ];
"html5" = ps: with ps; [ aiohttp-cors ];
"html5" = ps: with ps; [ aiohttp-cors pywebpush ];
"http" = ps: with ps; [ aiohttp-cors ];
"htu21d" = ps: with ps; [ ];
"huawei_lte" = ps: with ps; [ ];
6 changes: 6 additions & 0 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -492,6 +492,8 @@ in {

hopcroftkarp = callPackage ../development/python-modules/hopcroftkarp { };

http-ece = callPackage ../development/python-modules/http-ece { };

httpsig = callPackage ../development/python-modules/httpsig { };

httptools = callPackage ../development/python-modules/httptools { };
@@ -877,8 +879,12 @@ in {

pytricia = callPackage ../development/python-modules/pytricia { };

py-vapid = callPackage ../development/python-modules/py-vapid { };

PyWebDAV = callPackage ../development/python-modules/pywebdav { };

pywebpush = callPackage ../development/python-modules/pywebpush { };

pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml{ });

pyvcd = callPackage ../development/python-modules/pyvcd { };