Merge pull request #38738 from mguentner/i3pystatus_unstable
i3pystatus: 3.35 -> unstable
This commit is contained in:
commit
6090c946f9
|
@ -1,14 +1,18 @@
|
||||||
{ stdenv, fetchurl, libpulseaudio, python3Packages, extraLibs ? [] }:
|
{ stdenv, fetchFromGitHub, libpulseaudio, python3Packages, extraLibs ? [] }:
|
||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
name = "${pname}-${version}";
|
# i3pystatus moved to rolling release:
|
||||||
version = "3.35";
|
# https://github.com/enkore/i3pystatus/issues/584
|
||||||
|
version = "unstable-2018-04-11";
|
||||||
pname = "i3pystatus";
|
pname = "i3pystatus";
|
||||||
disabled = !python3Packages.isPy3k;
|
disabled = !python3Packages.isPy3k;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchFromGitHub
|
||||||
url = "mirror://pypi/i/${pname}/${name}.tar.gz";
|
{
|
||||||
sha256 = "0g5m05rbqvq1qrspm6fyzky9xfhaz5pvc4hfzgdxrzijn8nfc860";
|
owner = "enkore";
|
||||||
|
repo = "i3pystatus";
|
||||||
|
rev = "3efbd56bb7a851f16173ec6f0eef472b6e96c7cc";
|
||||||
|
sha256 = "0r4mc23chxlaym7jcjnflw7mn5nbw3q8q4ix0nim7lh98yfndd3b";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = with python3Packages; [ keyring colour netifaces praw psutil basiciw ] ++
|
propagatedBuildInputs = with python3Packages; [ keyring colour netifaces praw psutil basiciw ] ++
|
||||||
|
@ -16,7 +20,8 @@ python3Packages.buildPythonApplication rec {
|
||||||
|
|
||||||
libpulseaudioPath = stdenv.lib.makeLibraryPath [ libpulseaudio ];
|
libpulseaudioPath = stdenv.lib.makeLibraryPath [ libpulseaudio ];
|
||||||
ldWrapperSuffix = "--suffix LD_LIBRARY_PATH : \"${libpulseaudioPath}\"";
|
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 = ''
|
postInstall = ''
|
||||||
makeWrapper ${python3Packages.python.interpreter} $out/bin/${pname}-python-interpreter \
|
makeWrapper ${python3Packages.python.interpreter} $out/bin/${pname}-python-interpreter \
|
||||||
|
|
|
@ -17,7 +17,9 @@ buildPythonPackage rec {
|
||||||
|
|
||||||
propagatedBuildInputs = [ entrypoints ] ++ stdenv.lib.optional stdenv.isLinux secretstorage;
|
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 = ''
|
checkPhase = ''
|
||||||
py.test
|
py.test
|
||||||
|
|
|
@ -5,15 +5,20 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "praw";
|
pname = "praw";
|
||||||
version = "5.2.0";
|
version = "5.4.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "praw-dev";
|
owner = "praw-dev";
|
||||||
repo = "praw";
|
repo = "praw";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0nwfadczxa1fyq65zc3sfv8g2r4w3xrx3bdi5fv9xpn97wh2ifgw";
|
sha256 = "13vbh2r952ai2m6sc79psfwaj5fc8cssdg2pqpizg2mwd0l1s6lb";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
# drop upper bound of prawcore requirement
|
||||||
|
sed -ri "s/'(prawcore >=.+), <.+'/'\1'/" setup.py
|
||||||
|
'';
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
requests
|
requests
|
||||||
decorator
|
decorator
|
||||||
|
|
Loading…
Reference in a new issue