From 2c5fe63fbe31470ebb7090cb22f47adc6753cdd1 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 29 Mar 2020 18:18:04 -0400 Subject: [PATCH 1/2] python27Packages.application: 2.7.0 -> 2.8.0 and fix build The build is currently broken due to failure to build `darcs` to fetch the src package. The homepage is already their GitHub repo, and it appears to be the active src of development anyways. See #83718 I came across this while debugging this failure: https://hydra.nixos.org/build/115510612 Note that the `application` dependency *does* succeed on Hydra, because it's already on local disk in Hydra's store, but I cannot rebuild locally because it has prefer local builds. https://hydra.nixos.org/build/115512559 This package is not reproducible on 20.03 or buildable outside of Hydra, so I intend to backport the fix. CC @NixOS/nixos-release-managers ZHF: #80379 --- .../python-modules/application/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/application/default.nix b/pkgs/development/python-modules/application/default.nix index 654567cc23fc..90b21baafdda 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; }; } From c77bd38764f829c3d0be920a1d8604cc3e9ada99 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 29 Mar 2020 18:42:39 -0400 Subject: [PATCH 2/2] python27Packages.python-otr: mark as broken See inline comment for details. https://hydra.nixos.org/build/115510612 CC @NixOS/nixos-release-managers ZHF: #80379 --- pkgs/development/python-modules/python-otr/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-otr/default.nix b/pkgs/development/python-modules/python-otr/default.nix index 2b08bbffa450..d83d25972450 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; }; - }