From 927e9d4ff2a7f46a6594654b882287449fd5fa57 Mon Sep 17 00:00:00 2001 From: Klaas van Schelven Date: Wed, 5 Jun 2019 17:12:27 +0200 Subject: [PATCH] python: sh: fix (patch a test to be able to install again) See https://github.com/amoffat/sh/pull/468 --- pkgs/development/python-modules/sh/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix index 964386564e45..aa18f07e49e5 100644 --- a/pkgs/development/python-modules/sh/default.nix +++ b/pkgs/development/python-modules/sh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, python, coverage, lsof, glibcLocales }: +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, python, coverage, lsof, glibcLocales }: buildPythonPackage rec { pname = "sh"; @@ -9,9 +9,17 @@ buildPythonPackage rec { sha256 = "1z2hx357xp3v4cv44xmqp7lli3frndqpyfmpbxf7n76h7s1zaaxm"; }; - # Disable tests that fail on Darwin - # Some of the failures are due to Nix using GNU coreutils - patches = [ ./disable-broken-tests-darwin.patch ]; + patches = [ + # Disable tests that fail on Darwin + # Some of the failures are due to Nix using GNU coreutils + ./disable-broken-tests-darwin.patch + # Fix tests for Python 3.7. See: https://github.com/amoffat/sh/pull/468 + (fetchpatch { + url = "https://github.com/amoffat/sh/commit/b6202f75706473f02084d819e0765056afa43664.patch"; + sha256 = "1kzxyxcc88zhgn2kmfg9yrbs4n405b2jq7qykb453l52hy10vi94"; + excludes = [ ".travis.yml" ]; + }) + ]; postPatch = '' sed -i 's#/usr/bin/env python#${python.interpreter}#' test.py