Merge pull request #52030 from r-ryantm/auto-update/redis

redis: 5.0.1 -> 5.0.3
This commit is contained in:
Jörg Thalheim 2018-12-22 11:03:02 +01:00 committed by GitHub
commit ea10141de4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions

View File

@ -7,7 +7,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "thumbor"; pname = "thumbor";
version = "6.5.2"; version = "6.6.0";
disabled = isPy3k; # see https://github.com/thumbor/thumbor/issues/1004 disabled = isPy3k; # see https://github.com/thumbor/thumbor/issues/1004
@ -16,14 +16,14 @@ buildPythonPackage rec {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1ys5ymwbvgh2ir85g9nyrzzf8vgi16j6pzzi53b0rgjx0kwlmnxg"; sha256 = "0m4q40fcha1aydyr1khjhnb08cdfma67yxgyhsvwar5a6sl0906i";
}; };
postPatch = '' postPatch = ''
substituteInPlace "setup.py" \ substituteInPlace "setup.py" \
--replace '"argparse",' "" ${lib.optionalString isPy3k ''--replace '"futures",' ""''} --replace '"argparse",' "" ${lib.optionalString isPy3k ''--replace '"futures",' ""''}
substituteInPlace "setup.py" \ sed -i setup.py \
--replace "piexif>=1.0.13,<1.1.0" "piexif>=1.0.13" -e 's/piexif[^"]*/piexif/;s/Pillow[^"]*/Pillow/'
substituteInPlace "tests/test_utils.py" \ substituteInPlace "tests/test_utils.py" \
--replace "/bin/ls" "${coreutils}/bin/ls" --replace "/bin/ls" "${coreutils}/bin/ls"
substituteInPlace "tests/detectors/test_face_detector.py" \ substituteInPlace "tests/detectors/test_face_detector.py" \

View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, lua }: { stdenv, fetchurl, lua }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "5.0.1"; version = "5.0.3";
name = "redis-${version}"; name = "redis-${version}";
src = fetchurl { src = fetchurl {
url = "http://download.redis.io/releases/${name}.tar.gz"; url = "http://download.redis.io/releases/${name}.tar.gz";
sha256 = "1jxbjmsxn0lgh0y3k5j57rxf2sdjj71hxhw4jcvsvycpxh77r9l2"; sha256 = "00iyv4ybcgm5xxcm85lg1p99q7xijm05cpadlxa65chpz3fv9472";
}; };
buildInputs = [ lua ]; buildInputs = [ lua ];