Skip to content

i3pystatus: 3.35 -> unstable #38738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mic92 merged 5 commits into from
Apr 17, 2018
Merged

i3pystatus: 3.35 -> unstable #38738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
04113fb
praw: 5.2.0 -> 5.4.0
mguentner Apr 13, 2018
4c383cd
python.pkgs.praw: drop upper bound of prawcore requirement
Apr 17, 2018
c3cbff3
i3pystatus: 3.35 -> unstable
mguentner Apr 11, 2018
b656722
keyring: disable testing
mguentner Apr 13, 2018
493ef30
i3pystatus: set LC_TIME by default
Mic92 Apr 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions pkgs/applications/window-managers/i3/pystatus.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,27 @@
{ 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 ] ++
[ libpulseaudio ] ++ extraLibs;

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
Copy link
Copy Markdown
Member

@Mic92 Mic92 Apr 14, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

at least now it should work for everyone.


postInstall = ''
makeWrapper ${python3Packages.python.interpreter} $out/bin/${pname}-python-interpreter \
Expand Down
4 changes: 3 additions & 1 deletion pkgs/development/python-modules/keyring/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 7 additions & 2 deletions pkgs/development/python-modules/praw/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,20 @@

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";
};

postPatch = ''
# drop upper bound of prawcore requirement
sed -ri "s/'(prawcore >=.+), <.+'/'\1'/" setup.py
'';

propagatedBuildInputs = [
requests
decorator
Expand Down