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

python3Packages.sh: 1.12.14 -> 1.13.1

Browse Source 
Sandbox build will now succeed on Darwin and Linux

Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
This commit is contained in:
Sirio Balmelli
2020-07-20 20:07:42 +02:00
committed by Jon
parent 7a1dfb5b3d
commit 223ed16ba9
2 changed files with 36 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,28 +1,22 @@
{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, python, coverage, lsof, glibcLocales }:
{ lib, buildPythonPackage, fetchPypi, fetchpatch, python, coverage, lsof, glibcLocales, coreutils }:
buildPythonPackage rec {
pname = "sh";
version = "1.12.14";
version = "1.13.1";
src = fetchPypi {
inherit pname version;
sha256 = "1z2hx357xp3v4cv44xmqp7lli3frndqpyfmpbxf7n76h7s1zaaxm";
sha256 = "18w6wawmpzfh52s0jimwn59a7rfa7blrmg7bhwnq8siwbqhd58wp";
};
patches = [
# Disable tests that fail on Darwin
# Some of the failures are due to Nix using GNU coreutils
# Disable tests that fail on Darwin sandbox
./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
sed -i 's#/bin/sleep#${coreutils.outPath}/bin/sleep#' test.py
'';
checkInputs = [ coverage lsof glibcLocales ];
@@ -33,9 +27,10 @@ buildPythonPackage rec {
HOME=$(mktemp -d)
'';
meta = {
meta = with lib; {
description = "Python subprocess interface";
homepage = "https://pypi.python.org/pypi/sh/";
license = stdenv.lib.licenses.mit;
license = licenses.mit;
maintainers = with maintainers; [ siriobalmelli ];
};
}