diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-02-13 12:10:35 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-13 12:10:35 +0100 |
commit | b0e2f24050216ac7da6681cdabc41bd6e8e7d866 (patch) | |
tree | 77d78ae4563cf097c72f601f088038682a9e7f09 | |
parent | b081e92562bb1e97f1dd0422d96ea376d0cfbdce (diff) | |
parent | 943c8909b5d52f1239ab73c5706bd817e768227b (diff) | |
download | nixlib-b0e2f24050216ac7da6681cdabc41bd6e8e7d866.tar nixlib-b0e2f24050216ac7da6681cdabc41bd6e8e7d866.tar.gz nixlib-b0e2f24050216ac7da6681cdabc41bd6e8e7d866.tar.bz2 nixlib-b0e2f24050216ac7da6681cdabc41bd6e8e7d866.tar.lz nixlib-b0e2f24050216ac7da6681cdabc41bd6e8e7d866.tar.xz nixlib-b0e2f24050216ac7da6681cdabc41bd6e8e7d866.tar.zst nixlib-b0e2f24050216ac7da6681cdabc41bd6e8e7d866.zip |
Merge pull request #55670 from dotlambda/dateparser-0.7.1
python.pkgs.dateparser: 0.7.0 -> 0.7.1
-rw-r--r-- | pkgs/development/python-modules/dateparser/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/home-assistant/cli.nix | 11 | ||||
-rw-r--r-- | pkgs/tools/misc/papis/default.nix | 8 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
4 files changed, 12 insertions, 15 deletions
diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index f6af0855b9f5..22787df8bb64 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "dateparser"; - version = "0.7.0"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "940828183c937bcec530753211b70f673c0a9aab831e43273489b310538dff86"; + sha256 = "42d51be54e74a8e80a4d76d1fa6e4edd997098fce24ad2d94a2eab5ef247193e"; }; checkInputs = [ nose mock parameterized six glibcLocales ]; diff --git a/pkgs/servers/home-assistant/cli.nix b/pkgs/servers/home-assistant/cli.nix index a8cbc66f30b9..baed66bb4bdb 100644 --- a/pkgs/servers/home-assistant/cli.nix +++ b/pkgs/servers/home-assistant/cli.nix @@ -1,11 +1,10 @@ -# dateparser tests fail on pyton37: https://github.com/NixOS/nixpkgs/issues/52766 -{ lib, python36, glibcLocales }: +{ lib, python3, glibcLocales }: -python36.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "homeassistant-cli"; version = "0.5.0"; - src = python36.pkgs.fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; sha256 = "4ad137d336508ab74840a34b3cc488ad884cc75285f5d7842544df1c3adacf8d"; }; @@ -19,7 +18,7 @@ python36.pkgs.buildPythonApplication rec { glibcLocales ]; - propagatedBuildInputs = with python36.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ requests netdisco click click-log tabulate jsonpath_rw jinja2 dateparser regex ruamel_yaml aiohttp ]; @@ -31,7 +30,7 @@ python36.pkgs.buildPythonApplication rec { $out/bin/hass-cli completion zsh > "$out/share/zsh/site-functions/_hass-cli" ''; - checkInputs = with python36.pkgs; [ + checkInputs = with python3.pkgs; [ pytest requests-mock ]; diff --git a/pkgs/tools/misc/papis/default.nix b/pkgs/tools/misc/papis/default.nix index 8bccfccfeabf..282d64befb7f 100644 --- a/pkgs/tools/misc/papis/default.nix +++ b/pkgs/tools/misc/papis/default.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitHub, fetchpatch -, python36, xdg_utils +, python3, xdg_utils }: -python36.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "papis"; version = "0.7.5"; @@ -20,7 +20,7 @@ python36.pkgs.buildPythonApplication rec { sha256 = "0cmagfdaaml1pxhnxggifpb47z5g1p231qywnvnqpd3dm93382w1"; }; - propagatedBuildInputs = with python36.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ click requests filetype pyparsing configparser arxiv2bib pyyaml chardet beautifulsoup4 prompt_toolkit bibtexparser python-slugify pyparser pylibgen @@ -33,7 +33,7 @@ python36.pkgs.buildPythonApplication rec { install -Dt "$out/etc/bash_completion.d" scripts/shell_completion/build/bash/papis ''; - checkInputs = (with python36.pkgs; [ + checkInputs = (with python3.pkgs; [ pytest ]) ++ [ xdg_utils diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54adc5a498db..821f9c7cb139 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1791,9 +1791,7 @@ in burp = callPackage ../tools/backup/burp { }; - buku = callPackage ../applications/misc/buku { - python3 = python36; # due to #52766 - }; + buku = callPackage ../applications/misc/buku { }; byzanz = callPackage ../applications/video/byzanz {}; |