From 04113fb8647c526101cb8685f9adedd79dec154c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Fri, 13 Apr 2018 13:47:53 +0200 Subject: [PATCH 1/5] praw: 5.2.0 -> 5.4.0 --- pkgs/development/python-modules/praw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index c0be1009b06..de7e4e3ee12 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "praw"; - version = "5.2.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "praw-dev"; repo = "praw"; rev = "v${version}"; - sha256 = "0nwfadczxa1fyq65zc3sfv8g2r4w3xrx3bdi5fv9xpn97wh2ifgw"; + sha256 = "13vbh2r952ai2m6sc79psfwaj5fc8cssdg2pqpizg2mwd0l1s6lb"; }; propagatedBuildInputs = [ From 4c383cd41d7505cb62bf5125326bb66ee4874d16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 17 Apr 2018 16:03:29 +0200 Subject: [PATCH 2/5] python.pkgs.praw: drop upper bound of prawcore requirement --- pkgs/development/python-modules/praw/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index de7e4e3ee12..8f43cbfb4a8 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -14,6 +14,11 @@ buildPythonPackage rec { sha256 = "13vbh2r952ai2m6sc79psfwaj5fc8cssdg2pqpizg2mwd0l1s6lb"; }; + postPatch = '' + # drop upper bound of prawcore requirement + sed -ri "s/'(prawcore >=.+), <.+'/'\1'/" setup.py + ''; + propagatedBuildInputs = [ requests decorator From c3cbff3a8a4f761e828e21dad912e3ce4fdd946f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Wed, 11 Apr 2018 09:42:26 +0200 Subject: [PATCH 3/5] i3pystatus: 3.35 -> unstable --- .../applications/window-managers/i3/pystatus.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix index 68e77a54b5a..abf25e738a8 100644 --- a/pkgs/applications/window-managers/i3/pystatus.nix +++ b/pkgs/applications/window-managers/i3/pystatus.nix @@ -1,14 +1,18 @@ -{ stdenv, fetchurl, libpulseaudio, python3Packages, extraLibs ? [] }: +{ stdenv, fetchFromGitHub, libpulseaudio, python3Packages, extraLibs ? [] }: python3Packages.buildPythonApplication rec { - name = "${pname}-${version}"; - version = "3.35"; + # i3pystatus moved to rolling release: + # https://github.com/enkore/i3pystatus/issues/584 + version = "unstable-2018-04-11"; pname = "i3pystatus"; disabled = !python3Packages.isPy3k; - src = fetchurl { - url = "mirror://pypi/i/${pname}/${name}.tar.gz"; - sha256 = "0g5m05rbqvq1qrspm6fyzky9xfhaz5pvc4hfzgdxrzijn8nfc860"; + src = fetchFromGitHub + { + owner = "enkore"; + repo = "i3pystatus"; + rev = "3efbd56bb7a851f16173ec6f0eef472b6e96c7cc"; + sha256 = "0r4mc23chxlaym7jcjnflw7mn5nbw3q8q4ix0nim7lh98yfndd3b"; }; propagatedBuildInputs = with python3Packages; [ keyring colour netifaces praw psutil basiciw ] ++ From b6567229a2a43e20ff2de0189382e20135b53dd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Fri, 13 Apr 2018 13:51:01 +0200 Subject: [PATCH 4/5] keyring: disable testing ref: #38483 --- pkgs/development/python-modules/keyring/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 2029eabba02..ce5bb315581 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -17,7 +17,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ entrypoints ] ++ stdenv.lib.optional stdenv.isLinux secretstorage; - doCheck = !stdenv.isDarwin; + # all tests with flake8 are broken right now + # https://github.com/tholo/pytest-flake8/issues/45 + doCheck = false; checkPhase = '' py.test From 493ef304a059ea3239797eb47fb312d5bca44a0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 14 Apr 2018 11:12:30 +0100 Subject: [PATCH 5/5] i3pystatus: set LC_TIME by default --- pkgs/applications/window-managers/i3/pystatus.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix index abf25e738a8..1fed92764c1 100644 --- a/pkgs/applications/window-managers/i3/pystatus.nix +++ b/pkgs/applications/window-managers/i3/pystatus.nix @@ -20,7 +20,8 @@ python3Packages.buildPythonApplication rec { libpulseaudioPath = stdenv.lib.makeLibraryPath [ libpulseaudio ]; ldWrapperSuffix = "--suffix LD_LIBRARY_PATH : \"${libpulseaudioPath}\""; - makeWrapperArgs = [ ldWrapperSuffix ]; # libpulseaudio.so is loaded manually + # LC_TIME != C results in locale.Error: unsupported locale setting + makeWrapperArgs = [ "--set LC_TIME C" ldWrapperSuffix ]; # libpulseaudio.so is loaded manually postInstall = '' makeWrapper ${python3Packages.python.interpreter} $out/bin/${pname}-python-interpreter \