Merge master into staging

pkgs/development/python-modules/cached-property/default.nix

@@ -7,15 +7,14 @@
 
 buildPythonPackage rec {
   pname = "cached-property";
-  version = "1.4.0";
+  version = "1.4.2";
 
   # conftest.py is missing in PyPI tarball
-  # https://github.com/pydanny/cached-property/pull/87
   src = fetchFromGitHub {
     owner = "pydanny";
     repo = pname;
     rev = version;
-    sha256 = "0w7709grs4yqhfbnn7lva2fgyphvh43xcfqhi95lhh8sjad3xwkw";
+    sha256 = "0gjmgfilhljkx2b60cjikwh55jg2jwxhwi8hgkrzdnzk465ywhrw";
   };
 
   checkInputs = [ pytest freezegun ];

pkgs/development/python-modules/py3status/default.nix

@@ -0,0 +1,48 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, requests
+, pytz
+, tzlocal
+
+, file
+, acpi
+, coreutils
+, alsaUtils
+, i3
+, procps
+, lm_sensors
+, libnotify
+, xorg
+}:
+
+buildPythonPackage rec {
+  pname = "py3status";
+  version = "3.8";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1izjpf9q768m3j95y328vbdh7rycglqlslyd777b12c13i6zs6cb";
+  };
+  doCheck = false;
+  propagatedBuildInputs = [ pytz requests tzlocal ];
+  buildInputs = [ file ];
+  prePatch = ''
+    sed -i -e "s|'file|'${file}/bin/file|" py3status/parse_config.py
+    sed -i -e "s|\[\"acpi\"|\[\"${acpi}/bin/acpi\"|" py3status/modules/battery_level.py
+    sed -i -e "s|notify-send|${libnotify}/bin/notify-send|" py3status/modules/battery_level.py
+    sed -i -e "s|/usr/bin/whoami|${coreutils}/bin/whoami|" py3status/modules/external_script.py
+    sed -i -e "s|'amixer|'${alsaUtils}/bin/amixer|" py3status/modules/volume_status.py
+    sed -i -e "s|'i3-nagbar|'${i3}/bin/i3-nagbar|" py3status/modules/pomodoro.py
+    sed -i -e "s|'free|'${procps}/bin/free|" py3status/modules/sysdata.py
+    sed -i -e "s|'sensors|'${lm_sensors}/bin/sensors|" py3status/modules/sysdata.py
+    sed -i -e "s|'setxkbmap|'${xorg.setxkbmap}/bin/setxkbmap|" py3status/modules/keyboard_layout.py
+    sed -i -e "s|'xset|'${xorg.xset}/bin/xset|" py3status/modules/keyboard_layout.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Extensible i3status wrapper";
+    license = licenses.bsd3;
+    homepage = https://github.com/ultrabug/py3status;
+    maintainers = with maintainers; [ garbas ];
+  };
+}