diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-03-31 11:36:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-31 11:36:51 +0100 |
| commit | 61cee883a933a9c53c0f38a21fdf73c891506eaf (patch) | |
| tree | c7033c6ac4d0bf98649e470265d79175493f70fb /pkgs/development/python-modules | |
| parent | d2e422fcef0273269ad8e54b5ac4d8b877c2f5ad (diff) | |
| parent | c77bd38764f829c3d0be920a1d8604cc3e9ada99 (diff) | |
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
Diffstat (limited to 'pkgs/development/python-modules')
| -rw-r--r-- | pkgs/development/python-modules/application/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/development/python-modules/python-otr/default.nix | 7 |
2 files changed, 16 insertions, 8 deletions
diff --git a/pkgs/development/python-modules/application/default.nix b/pkgs/development/python-modules/application/default.nix index 654567cc23fcf..90b21baafddaa 100644 --- a/pkgs/development/python-modules/application/default.nix +++ b/pkgs/development/python-modules/application/default.nix @@ -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; }; } diff --git a/pkgs/development/python-modules/python-otr/default.nix b/pkgs/development/python-modules/python-otr/default.nix index 2b08bbffa4506..d83d259724506 100644 --- a/pkgs/development/python-modules/python-otr/default.nix +++ b/pkgs/development/python-modules/python-otr/default.nix @@ -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; }; - } |