JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #62667 from vanschelven/fix-python-sh

Browse Source 
python: sh: fix (patch a test to be able to install again)
This commit is contained in:
Mario Rodas 2019-06-05 10:37:25 -05:00 committed by GitHub
commit d3c9e5e16d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/python-modules/sh/default.nix
View File

@ -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