Merge pull request #83720 from bhipple/f/py-application

python27Packages.application: 2.7.0 -> 2.8.0 and fix build; python27Packages.python-otr: mark as broken
This commit is contained in:
Jörg Thalheim 2020-03-31 11:36:51 +01:00 committed by GitHub
commit 61cee883a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 8 deletions

View File

@ -1,21 +1,26 @@
{ lib, buildPythonPackage, fetchdarcs, zope_interface, isPy3k }:
{ lib, buildPythonPackage, fetchFromGitHub, zope_interface, isPy3k }:
buildPythonPackage rec {
pname = "python-application";
version = "2.7.0";
version = "2.8.0";
disabled = isPy3k;
src = fetchdarcs {
url = "http://devel.ag-projects.com/repositories/${pname}";
src = fetchFromGitHub {
owner = "AGProjects";
repo = pname;
rev = "release-${version}";
sha256 = "1xpyk2v3naxkjhpyris58dxg1lxbraxgjd6f7w1sah5j0sk7psla";
sha256 = "1xd2gbpmx2ghap9cnr1h6sxjai9419bdp3y9qp5lh67977m0qg30";
};
buildInputs = [ zope_interface ];
# No tests upstream to run
doCheck = false;
meta = with lib; {
description = "Basic building blocks for python applications";
homepage = https://github.com/AGProjects/python-application;
homepage = "https://github.com/AGProjects/python-application";
changelog = "https://github.com/AGProjects/python-application/blob/master/ChangeLog";
license = licenses.lgpl2Plus;
};
}

View File

@ -24,10 +24,13 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "A pure python implementation of OTR";
homepage = https://github.com/AGProjects/otr;
homepage = "https://github.com/AGProjects/python-otr";
license = licenses.lgpl21Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ edwtjo ];
# The package itself does not support python3, and its transitive
# dependencies rely on namespace package support that does not work in
# Nix's python2 infra. See #74619 for details.
broken = true;
};
}