Merge pull request #28976 from NeQuissimus/i3_4_14

i3: 4.13 -> 4.14
This commit is contained in:
Jörg Thalheim 2017-09-05 16:40:43 +01:00 committed by GitHub
commit 69a9e8707a
2 changed files with 5 additions and 4 deletions

View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "i3-${version}"; name = "i3-${version}";
version = "4.13"; version = "4.14";
src = fetchurl { src = fetchurl {
url = "http://i3wm.org/downloads/${name}.tar.bz2"; url = "http://i3wm.org/downloads/${name}.tar.bz2";
sha256 = "12ngz32swh9n85xy0cz1lq16aqi9ys5hq19v589q9a97wn1k3hcl"; sha256 = "1mm5jazwv4dz3k8vl1lfrcw86agpws5k9lmav1ly51qvmzivsfmf";
}; };
nativeBuildInputs = [ which pkgconfig makeWrapper ]; nativeBuildInputs = [ which pkgconfig makeWrapper ];

View File

@ -8356,14 +8356,15 @@ in {
}; };
py3status = buildPythonPackage rec { py3status = buildPythonPackage rec {
version = "3.0"; version = "3.6";
name = "py3status-${version}"; name = "py3status-${version}";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "ultrabug"; owner = "ultrabug";
repo = "py3status"; repo = "py3status";
rev = version; rev = version;
sha256 = "1mnl0rfbnimcpp7q9hva0x9jfa58j4nc27r9kvaii8869kzssw48"; sha256 = "01qvrwgkphb0lr7g9dm0hncbxcds05kg4qgbsrvnc7d5j2vhfdkr";
}; };
doCheck = false;
propagatedBuildInputs = with self; [ requests ]; propagatedBuildInputs = with self; [ requests ];
prePatch = '' prePatch = ''
sed -i -e "s|\[\"acpi\"|\[\"${pkgs.acpi}/bin/acpi\"|" py3status/modules/battery_level.py sed -i -e "s|\[\"acpi\"|\[\"${pkgs.acpi}/bin/acpi\"|" py3status/modules/battery_level.py