···1{ lib
2, buildPythonPackage
03, fetchPypi
004, pytest
5-, six
6-, decorator
7, pytestCheckHook
08}:
910buildPythonPackage rec {
11- version = "1.1.5";
12 pname = "pytest-relaxed";
00001314 src = fetchPypi {
15 inherit pname version;
16- sha256 = "e39a7e5b14e14dfff0de0ad720dfffa740c128d599ab14cfac13f4deb34164a6";
17 };
1819- # newer decorator versions are incompatible and cause the test suite to fail
20- # but only a few utility functions are used from this package which means it has no actual impact on test execution in paramiko and Fabric
21- postPatch = ''
22- substituteInPlace setup.py \
23- --replace "decorator>=4,<5" "decorator>=4" \
24- --replace "pytest>=3,<5" "pytest>=3"
25- '';
2627- buildInputs = [ pytest ];
002829- propagatedBuildInputs = [ six decorator ];
00003031- checkInputs = [ pytestCheckHook ];
003233- # lots of assertion errors mainly around decorator
34- doCheck = false;
03536 meta = with lib; {
37 homepage = "https://pytest-relaxed.readthedocs.io/";
38 description = "Relaxed test discovery/organization for pytest";
039 license = licenses.bsd0;
40- maintainers = [ maintainers.costrouc ];
41- # see https://github.com/bitprophet/pytest-relaxed/issues/12
42- broken = true;
43 };
44}
···56buildGoModule rec {
7 pname = "trivy";
8- version = "0.35.0";
910 src = fetchFromGitHub {
11 owner = "aquasecurity";
12 repo = pname;
13 rev = "v${version}";
14- sha256 = "sha256-0lEKXCQ7os6hyqEuugNI8ogZiqJZq58VGafEKrcmV3I=";
15 };
16 # hash missmatch on across linux and darwin
17 proxyVendor = true;
18- vendorSha256 = "sha256-cl6EShtXhe72fbKIMbma9pEGLPBVSNZMiHWi94BbkMM=";
1920 excludedPackages = "misc";
21
···56buildGoModule rec {
7 pname = "trivy";
8+ version = "0.36.0";
910 src = fetchFromGitHub {
11 owner = "aquasecurity";
12 repo = pname;
13 rev = "v${version}";
14+ sha256 = "sha256-5yAfF/iRAbCJFXEcdhg7vqiMTpw7NNixFaQU93uSv6I=";
15 };
16 # hash missmatch on across linux and darwin
17 proxyVendor = true;
18+ vendorSha256 = "sha256-9oG6xJ0D6SulN6ErC/F5Ycmly4wp+GCF8lftu+xoagE=";
1920 excludedPackages = "misc";
21
-20
pkgs/tools/networking/cadaver/configure.patch
···1---- a/configure.orig
2-+++ b/configure
3-@@ -9595,7 +9595,7 @@ fi
4- $as_echo "$ne_cv_lib_neon" >&6; }
5- if test "$ne_cv_lib_neon" = "yes"; then
6- ne_cv_lib_neonver=no
7-- for v in 27 28 29; do
8-+ for v in 27 28 29 30 31; do
9- case $ne_libver in
10- 0.$v.*) ne_cv_lib_neonver=yes ;;
11- esac
12-@@ -10328,7 +10328,7 @@ fi
13- $as_echo "$ne_cv_lib_neon" >&6; }
14- if test "$ne_cv_lib_neon" = "yes"; then
15- ne_cv_lib_neonver=no
16-- for v in 27 28 29; do
17-+ for v in 27 28 29 30 31; do
18- case $ne_libver in
19- 0.$v.*) ne_cv_lib_neonver=yes ;;
20- esac
···00000000000000000000
+25-19
pkgs/tools/networking/cadaver/default.nix
···1-{ lib, stdenv, fetchurl, fetchpatch, neon, pkg-config, readline, zlib, openssl }:
000000023stdenv.mkDerivation rec {
4 pname = "cadaver";
5- version = "0.23.3";
67 src = fetchurl {
8- url = "http://www.webdav.org/cadaver/cadaver-${version}.tar.gz";
9- sha256 = "1jizq69ifrjbjvz5y79wh1ny94gsdby4gdxwjad4bfih6a5fck7x";
10 };
1112- patches = [
13- (fetchpatch {
14- url = "https://projects.archlinux.org/svntogit/community.git/plain/trunk/disable-sslv2.patch?h=packages/cadaver";
15- name = "disable-sslv2.patch";
16- sha256 = "1qx65hv584wdarks51yhd3y38g54affkphm5wz27xiz4nhmbssrr";
17- })
18- # Cadaver also works with newer versions of neon than stated
19- # in the configure script
20- ./configure.patch
21 ];
2223- configureFlags = [ "--with-ssl" "--with-readline" ];
002425- nativeBuildInputs = [ pkg-config ];
26- buildInputs = [ neon readline zlib openssl ];
0002728 meta = with lib; {
29 description = "A command-line WebDAV client";
30- homepage = "http://www.webdav.org/cadaver";
031 maintainers = with maintainers; [ ianwookim ];
32- license = licenses.gpl2;
33- platforms = with platforms; linux ++ freebsd ++ openbsd;
34 };
35}
···84 buildPackages.binutils = nativePlatforms;
85 mpg123 = nativePlatforms;
86 };
0000000000087in
8889{
···226 # attribute, so there is no way to detect this -- we must add it
227 # as a special case.
228 (builtins.removeAttrs tools ["bootstrapTools"]);
0000229}
···84 buildPackages.binutils = nativePlatforms;
85 mpg123 = nativePlatforms;
86 };
87+88+ # Enabled-but-unsupported platforms for which nix is known to build.
89+ # We provide Hydra-built `nixStatic` for these platforms. This
90+ # allows users to bootstrap their own system without either (a)
91+ # trusting binaries from a non-Hydra source or (b) having to fight
92+ # with their host distribution's versions of nix's numerous
93+ # build dependencies.
94+ nixCrossStatic = {
95+ nixStatic = nativePlatforms;
96+ };
97+98in
99100{
···237 # attribute, so there is no way to detect this -- we must add it
238 # as a special case.
239 (builtins.removeAttrs tools ["bootstrapTools"]);
240+241+ # Cross-built nixStatic for platforms for enabled-but-unsupported platforms
242+ mips64el-nixCrossStatic = mapTestOnCross lib.systems.examples.mips64el-linux-gnuabi64 nixCrossStatic;
243+ powerpc64le-nixCrossStatic = mapTestOnCross lib.systems.examples.powernv nixCrossStatic;
244}