Merge pull request #59424 from florianjacob/journalwatch

journalwatch: fix broken package, general maintenance
This commit is contained in:
Aaron Andersen
2019-04-27 10:58:45 -04:00
committed by GitHub
2 changed files with 38 additions and 24 deletions
+8 -12
View File
@@ -1,15 +1,15 @@
{ stdenv, buildPythonPackage, fetchurl, pythonOlder, systemd, pytest }:
{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, systemd, pytest }:
buildPythonPackage rec {
pname = "journalwatch";
name = "${pname}-${version}";
version = "1.1.0";
disabled = pythonOlder "3.3";
src = fetchurl {
url = "https://github.com/The-Compiler/${pname}/archive/v${version}.tar.gz";
sha512 = "3hvbgx95hjfivz9iv0hbhj720wvm32z86vj4a60lji2zdfpbqgr2b428lvg2cpvf71l2xn6ca5v0hzyz57qylgwqzgfrx7hqhl5g38s";
src = fetchFromGitHub {
owner = "The-Compiler";
repo = pname;
rev = "v${version}";
sha512 = "11g2f1w9lfqw6zxxyg7qrqpb914s6w71j0gnpw7qr7cak2l5jlf2l39dlg30y55rw7jgmf0yg77wwzd0c430mq1n6q1v8w86g1rwkzb";
};
# can be removed post 1.1.0
@@ -20,14 +20,10 @@ buildPythonPackage rec {
doCheck = true;
checkInputs = [ pytest ];
checkPhase = ''
pytest test_journalwatch.py
'';
buildInputs = [
pytest
];
'';
propagatedBuildInputs = [
systemd