From d15ba6a7ee5b8cd0859de8bb574cda2a4319fe20 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 29 Jun 2018 21:04:42 +0200 Subject: python/soco: init at 0.15 This is required for one of the plugins (sonosupdate) of Beets version 1.4.7. I do not have a Sonos speaker, so I can't really test whether the library works nor properly maintain this package (so I didn't add myself as a maintainer). I ran the build (including tests) against Python 2.x and Python 3.x. Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/top-level/python-packages.nix') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6b4cd429a007..57289008c605 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12860,6 +12860,8 @@ in { shapely = callPackage ../development/python-modules/shapely { }; + soco = callPackage ../development/python-modules/soco { }; + sopel = buildPythonPackage rec { name = "sopel-6.3.1"; -- cgit 1.4.1 From 95cb828b2797ab06437d07fabd827128e87199e7 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 29 Jun 2018 21:37:45 +0200 Subject: python-openid: remove, only keep python3-openid see discussion on https://github.com/NixOS/nixpkgs/commit/2e41891e6d595b9acf484d7d349b17a7b35b6923 --- .../python-modules/django-allauth/default.nix | 4 ++-- .../python-modules/python-openid/default.nix | 19 ------------------- .../python-modules/python3-openid/default.nix | 4 +++- pkgs/top-level/python-packages.nix | 4 +--- 4 files changed, 6 insertions(+), 25 deletions(-) delete mode 100644 pkgs/development/python-modules/python-openid/default.nix (limited to 'pkgs/top-level/python-packages.nix') diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix index e49d8c6ff84c..775660b8304c 100644 --- a/pkgs/development/python-modules/django-allauth/default.nix +++ b/pkgs/development/python-modules/django-allauth/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchFromGitHub, requests, requests_oauthlib -, django, python-openid, mock, coverage }: +, django, python3-openid, mock, coverage }: buildPythonPackage rec { pname = "django-allauth"; @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1c863cmd521j6cwpyd50jxz5y62fdschrhm15jfqihicyr9imjan"; }; - propagatedBuildInputs = [ requests requests_oauthlib django python-openid ]; + propagatedBuildInputs = [ requests requests_oauthlib django python3-openid ]; checkInputs = [ coverage mock ]; diff --git a/pkgs/development/python-modules/python-openid/default.nix b/pkgs/development/python-modules/python-openid/default.nix deleted file mode 100644 index b70d9a1f082f..000000000000 --- a/pkgs/development/python-modules/python-openid/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi }: - -buildPythonPackage rec { - pname = "python-openid"; - version = "2.2.5"; - - src = fetchPypi { - inherit pname version; - sha256 = "1vvhxlghjan01snfdc4k7ykd80vkyjgizwgg9bncnin8rqz1ricj"; - }; - - doCheck = false; - - meta = with stdenv.lib; { - description = "OpenID support for modern servers and consumers"; - homepage = https://github.com/openid/python-openid; - license = licenses.asl20; - }; -} diff --git a/pkgs/development/python-modules/python3-openid/default.nix b/pkgs/development/python-modules/python3-openid/default.nix index 77181fa4ae54..238c416bc98a 100644 --- a/pkgs/development/python-modules/python3-openid/default.nix +++ b/pkgs/development/python-modules/python3-openid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, defusedxml }: +{ stdenv, isPy3k, buildPythonPackage, fetchPypi, defusedxml }: buildPythonPackage rec { pname = "python3-openid"; @@ -13,6 +13,8 @@ buildPythonPackage rec { doCheck = false; + disabled = !isPy3k; + meta = with stdenv.lib; { description = "OpenID support for modern servers and consumers"; homepage = http://github.com/necaris/python3-openid; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 57289008c605..fe12c039676a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -434,9 +434,7 @@ in { python-hosts = callPackage ../development/python-modules/python-hosts { }; - python-openid = callPackage (if isPy3k - then ../development/python-modules/python3-openid - else ../development/python-modules/python-openid) { }; + python3-openid = callPackage ../development/python-modules/python3-openid { }; python-periphery = callPackage ../development/python-modules/python-periphery { }; -- cgit 1.4.1 From 97e30243764f8b6acc762a89d26af9bf97bf291a Mon Sep 17 00:00:00 2001 From: Michishige Kaito Date: Thu, 28 Jun 2018 15:08:48 +0100 Subject: python-fido2: init at 0.3.0 --- pkgs/development/python-modules/fido2/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/fido2/default.nix (limited to 'pkgs/top-level/python-packages.nix') diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix new file mode 100644 index 000000000000..3642d4e55b90 --- /dev/null +++ b/pkgs/development/python-modules/fido2/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, six, cryptography }: + +buildPythonPackage rec { + pname = "fido2"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ddbhg4nsabi9w66l8vkr0i5r80jqihlic5yrdl3v1aqahvxph1j"; + }; + + # The pypi package does not include tests + # Check https://github.com/Yubico/python-fido2/pull/8 + doCheck = false; + + propagatedBuildInputs = [ six cryptography ]; + + meta = with lib; { + description = "Provides library functionality for FIDO 2.0, including communication with a device over USB."; + homepage = https://github.com/Yubico/python-fido2; + license = licenses.mpl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 80ca395a0265..9a12bd629d8d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -266,6 +266,8 @@ in { diff-match-patch = callPackage ../development/python-modules/diff-match-patch { }; + fido2 = callPackage ../development/python-modules/fido2 { }; + globus-sdk = callPackage ../development/python-modules/globus-sdk { }; goocalendar = callPackage ../development/python-modules/goocalendar { }; -- cgit 1.4.1 From bae87d504224d853c5548d2aa244b596569fc7f3 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 30 Jun 2018 13:01:07 +0000 Subject: python.pkgs.pybrowserid: move expression and 0.9.2 -> 0.14.0 (#42814) --- .../python-modules/pybrowserid/default.nix | 24 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +-------------------- 2 files changed, 25 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/pybrowserid/default.nix (limited to 'pkgs/top-level/python-packages.nix') diff --git a/pkgs/development/python-modules/pybrowserid/default.nix b/pkgs/development/python-modules/pybrowserid/default.nix new file mode 100644 index 000000000000..946fb1a054fe --- /dev/null +++ b/pkgs/development/python-modules/pybrowserid/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, requests, mock }: + +buildPythonPackage rec { + pname = "PyBrowserID"; + version = "0.14.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1qvi79kfb8x9kxkm5lw2mp42hm82cpps1xknmsb5ghkwx1lpc8kc"; + }; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ mock ]; + + meta = with stdenv.lib; { + description = "Python library for the BrowserID Protocol"; + homepage = https://github.com/mozilla/PyBrowserID; + license = licenses.mpl20; + maintainers = with maintainers; [ worldofpeace ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ba024c1f88ed..1563176c39a0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15509,28 +15509,7 @@ EOF libarcus = callPackage ../development/python-modules/libarcus { }; - pybrowserid = buildPythonPackage rec { - name = "PyBrowserID-${version}"; - version = "0.9.2"; - disabled = isPy3k; # Errors in the test suite. - - src = pkgs.fetchgit { - url = https://github.com/mozilla/PyBrowserID.git; - rev = "refs/tags/${version}"; - sha256 = "0zsljr45gm8a4c0lxh6mgfc60a5fijhs4pwijb9fdkq16zw0pmf0"; - }; - - doCheck = false; # some tests use networking - - buildInputs = with self; [ mock unittest2 ]; - propagatedBuildInputs = with self; [ requests ]; - - meta = { - description = "Python library for the BrowserID Protocol"; - homepage = "https://github.com/mozilla/PyBrowserID"; - license = licenses.mpl20; - }; - }; + pybrowserid = callPackage ../development/python-modules/pybrowserid { }; pyzmq = callPackage ../development/python-modules/pyzmq { }; -- cgit 1.4.1