Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Uptade pytest-timeout and x265 derivations #97344

Closed
wants to merge 3 commits into from
Closed

Uptade pytest-timeout and x265 derivations #97344

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
949f6c0
python: pytest-timeout 1.3.3 -> 1.4.2
jpgu-epam Sep 4, 2020
fa0692b
x265: 3.2 -> 3.4
jpgu-epam Sep 7, 2020
64b5456
x265: 3.2 -> 3.4
jpgu-epam Sep 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 9 additions & 18 deletions pkgs/development/libraries/x265/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, cmake, nasm, numactl
{ stdenv, fetchFromGitHub, fetchpatch, cmake, nasm, numactl
, numaSupport ? stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64) # Enabled by default on NUMA platforms
, debugSupport ? false # Run-time sanity checks (debugging)
, werrorSupport ? false # Warnings as errors
Expand All @@ -23,27 +23,18 @@ let
(mkFlag werrorSupport "WARNINGS_AS_ERRORS")
];

version = "3.2";
version = "3.4";

src = fetchurl {
urls = [
"https://get.videolan.org/x265/x265_${version}.tar.gz"
"ftp://ftp.videolan.org/pub/videolan/x265/x265_${version}.tar.gz"
];
sha256 = "0fqkhfhr22gzavxn60cpnj3agwdf5afivszxf3haj5k1sny7jk9n";
src = fetchFromGitHub {
owner = "videolan";
repo = "x265";
rev = "${version}";
jpgu-epam marked this conversation as resolved.
Show resolved Hide resolved
sha256 = "048c906xpp3m12m2xnb6zf2y39milxajp2n0kffa41pdya3zqn95";
};

patches = [
# Fix build on ARM (#406)
(fetchpatch {
url = "https://bitbucket.org/multicoreware/x265/issues/attachments/406/multicoreware/x265/1527562952.26/406/X265-2.8-asm-primitives.patch";
sha256 = "1vf8bpl37gbd9dcbassgkq9i0rp24qm3bl6hx9zv325174bn402v";
})
];

buildLib = has12Bit: stdenv.mkDerivation rec {
name = "libx265-${if has12Bit then "12" else "10"}-${version}";
inherit src patches;
inherit src;
enableParallelBuilding = true;

postPatch = ''
Expand Down Expand Up @@ -72,7 +63,7 @@ in

stdenv.mkDerivation rec {
pname = "x265";
inherit version src patches;
inherit version src;

enableParallelBuilding = true;

Expand Down
11 changes: 3 additions & 8 deletions pkgs/development/python-modules/pytest-timeout/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,17 @@

buildPythonPackage rec {
pname = "pytest-timeout";
version = "1.3.3";
version = "1.4.2";

src = fetchPypi {
inherit pname version;
sha256 = "1cczcjhw4xx5sjkhxlhc5c1bkr7x6fcyx12wrnvwfckshdvblc2a";
};

patches = fetchpatch {
url = "https://bitbucket.org/pytest-dev/pytest-timeout/commits/36998c891573d8ec1db1acd4f9438cb3cf2aee2e/raw";
sha256 = "05zc2w7mjgv8rm8i1cbxp7k09vlscmay5iy78jlzgjqkrx3wkf46";
sha256 = "0xnsigs0kmpq1za0d4i522sp3f71x5bgpdh3ski0rs74yqy13cr0";
};

checkInputs = [ pytest pexpect ];
checkPhase = ''
# test_suppresses_timeout_when_pdb_is_entered fails under heavy load
pytest -ra -k 'not test_suppresses_timeout_when_pdb_is_entered'
pytest -ra -k 'not test_suppresses_timeout_when_debugger_is_entered and not test_cov'
'';

meta = with lib;{
Expand Down