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

Merge pull request #106309 from SuperSandro2000/feature/bump_pyxdg 

khal,stig,deluge_1,libtorrent-rasterbar,linkchecker: Disable failing tests
This commit is contained in:
Doron Behar 2020-12-11 18:44:24 +02:00 committed by GitHub
parent 5b8d7aab43 0cd4108172
commit 945d4b00db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/khal/default.nix
View File

@ -57,7 +57,9 @@ with python3.pkgs; buildPythonApplication rec {
doCheck = !stdenv.isAarch64; doCheck = !stdenv.isAarch64;
checkPhase = '' checkPhase = ''
py.test py.test -k "not test_vertical_month_abbr_fr and not test_vertical_month_unicode_weekdeays_gr \
and not test_event_different_timezones and not test_default_calendar and not test_birthdays \
and not test_birthdays_no_year"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

1
pkgs/applications/networking/p2p/deluge/1/default.nix
View File

@ -36,6 +36,7 @@ pythonPackages.buildPythonPackage rec {
description = "Torrent client"; description = "Torrent client";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ domenkozar ebzzry ]; maintainers = with maintainers; [ domenkozar ebzzry ];
broken = stdenv.isDarwin;
platforms = platforms.all; platforms = platforms.all;
}; };
} }

7
pkgs/applications/networking/p2p/stig/default.nix
View File

@ -1,4 +1,4 @@
{ lib { stdenv
, fetchFromGitHub , fetchFromGitHub
, python3Packages , python3Packages
}: }:
@ -54,9 +54,12 @@ python3Packages.buildPythonApplication rec {
"--deselect=tests/client_test/ttypes_test.py::TestTimestamp::test_string__month_day_hour_minute_second" "--deselect=tests/client_test/ttypes_test.py::TestTimestamp::test_string__month_day_hour_minute_second"
# TestScrollBarWithScrollable.test_wrapping_bug fails # TestScrollBarWithScrollable.test_wrapping_bug fails
"--deselect=tests/tui_test/scroll_test.py::TestScrollBarWithScrollable::test_wrapping_bug" "--deselect=tests/tui_test/scroll_test.py::TestScrollBarWithScrollable::test_wrapping_bug"
] ++ stdenv.lib.optionals stdenv.isDarwin [
"--deselect=tests/client_test/aiotransmission_test/api_torrent_test.py"
"--deselect=tests/client_test/aiotransmission_test/rpc_test.py"
]; ];
meta = with lib; { meta = with stdenv.lib; {
description = "TUI and CLI for the BitTorrent client Transmission"; description = "TUI and CLI for the BitTorrent client Transmission";
homepage = "https://github.com/rndusr/stig"; homepage = "https://github.com/rndusr/stig";
license = licenses.gpl3; license = licenses.gpl3;

15
pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, automake, autoconf { stdenv, fetchFromGitHub, pkg-config, automake, autoconf
, zlib, boost, openssl, libtool, python, libiconv, ncurses , zlib, boost, openssl, libtool, python, libiconv, ncurses, SystemConfiguration
}: }:
let let
version = "1.2.6"; version = "1.2.6";
formattedVersion = lib.replaceChars ["."] ["_"] version; formattedVersion = stdenv.lib.replaceChars ["."] ["_"] version;
# Make sure we override python, so the correct version is chosen # Make sure we override python, so the correct version is chosen
# for the bindings, if overridden # for the bindings, if overridden
@ -22,8 +22,12 @@ in stdenv.mkDerivation {
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
buildInputs = [ boostPython openssl zlib python libiconv ncurses ]; nativeBuildInputs = [ automake autoconf libtool pkg-config ];
buildInputs = [ boostPython openssl zlib python libiconv ncurses ]
++ stdenv.lib.optionals stdenv.isDarwin [ SystemConfiguration ];
preConfigure = "./autotool.sh"; preConfigure = "./autotool.sh";
postInstall = '' postInstall = ''
@ -45,6 +49,7 @@ in stdenv.mkDerivation {
description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; description = "A C++ BitTorrent implementation focusing on efficiency and scalability";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = [ maintainers.phreedom ]; maintainers = [ maintainers.phreedom ];
broken = stdenv.isDarwin;
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

2
pkgs/tools/networking/linkchecker/default.nix
View File

@ -38,7 +38,7 @@ buildPythonApplication rec {
checkPhase = '' checkPhase = ''
${lib.optionalString stdenv.isDarwin '' ${lib.optionalString stdenv.isDarwin ''
# network tests fails on darwin # network tests fails on darwin
rm tests/test_network.py rm tests/test_network.py tests/checker/test_http*.py tests/checker/test_content_allows_robots.py tests/checker/test_noproxy.py
''} ''}
pytest --ignore=tests/checker/{test_telnet,telnetserver}.py \ pytest --ignore=tests/checker/{test_telnet,telnetserver}.py \
-k 'not TestLoginUrl and not test_timeit2' -k 'not TestLoginUrl and not test_timeit2'

4
pkgs/top-level/all-packages.nix
View File

@ -14647,7 +14647,9 @@ in
libtomcrypt = callPackage ../development/libraries/libtomcrypt { }; libtomcrypt = callPackage ../development/libraries/libtomcrypt { };
libtorrentRasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2 { }; libtorrentRasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2 {
inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
};
libtorrentRasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1 { }; libtorrentRasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1 { };