From 9fe2447dec6c079f26117144129582ed36cb7cd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 12 Feb 2019 23:07:02 +0100 Subject: [PATCH 1/4] python.pkgs.dateparser: 0.7.0 -> 0.7.1 fixes #52766 --- pkgs/development/python-modules/dateparser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index f6af0855b9f..22787df8bb6 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 ]; From a9bf4cea4bb2c4268af18a65ec2a405d2d170862 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 12 Feb 2019 23:08:53 +0100 Subject: [PATCH 2/4] Revert "home-assistant-cli: use python36" This reverts commit c3b01eed801ff4eb74a8c2637866d16ee26db2c7. --- pkgs/servers/home-assistant/cli.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/home-assistant/cli.nix b/pkgs/servers/home-assistant/cli.nix index a8cbc66f30b..baed66bb4bd 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 ]; From 6c53ffa50293fdbf4eacb085e90101f966191de1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 12 Feb 2019 23:09:48 +0100 Subject: [PATCH 3/4] Revert "buku-4.1: pinned python to python36 due to #52766" This reverts commit 5ddd094ce06cf40adf7b822a47d5e0b075ed1a7e. --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2df5884d610..050bde614eb 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 {}; From 943c8909b5d52f1239ab73c5706bd817e768227b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 12 Feb 2019 23:10:44 +0100 Subject: [PATCH 4/4] Revert "papis: use python36" This reverts commit 07664bcbe49b84c67cdaec079fe70ab41d3d8829. --- pkgs/tools/misc/papis/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/papis/default.nix b/pkgs/tools/misc/papis/default.nix index 8bccfccfeab..282d64befb7 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