From 52b8b68e8235f496e6bb972ae36e30bd8946a633 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Fri, 22 Jun 2018 13:52:33 +0200 Subject: Libsystem: remove libsystem_network.dylib from reexport list Fixes #42719 --- .../darwin/apple-source-releases/Libsystem/reexported_libraries | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries index 494426eba6d..edc2e759a29 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries @@ -19,7 +19,7 @@ /usr/lib/system/libsystem_configuration.dylib /usr/lib/system/libsystem_coreservices.dylib -# /usr/lib/system/libsystem_coretls.dylib # Removed in 10.13 +# /usr/lib/system/libsystem_coretls.dylib # Removed in 10.13 /usr/lib/system/libsystem_dnssd.dylib /usr/lib/system/libsystem_info.dylib @@ -28,7 +28,7 @@ /usr/lib/system/libsystem_m.dylib /usr/lib/system/libsystem_malloc.dylib -/usr/lib/system/libsystem_network.dylib +# /usr/lib/system/libsystem_network.dylib # Removed in 10.14 /usr/lib/system/libsystem_networkextension.dylib /usr/lib/system/libsystem_notify.dylib /usr/lib/system/libsystem_platform.dylib -- cgit 1.4.1 From 0e3ffe430e52f2f24ceee6d01173e99c9f75bfd7 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 8 Aug 2018 21:18:19 +0000 Subject: cryptsetup: fix tests --- pkgs/os-specific/linux/cryptsetup/default.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index fc13d97429c..5211fd2a61b 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { }) ]; + postPatch = '' + patchShebangs tests + ''; + NIX_LDFLAGS = "-lgcc_s"; configureFlags = [ -- cgit 1.4.1 From 556da201b82dfed2b4db8420a4d39786230cdeb6 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 8 Aug 2018 21:20:15 +0000 Subject: libaio: fix tests --- pkgs/os-specific/linux/libaio/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/os-specific/linux/libaio/default.nix index e2be136adee..949c8135df7 100644 --- a/pkgs/os-specific/linux/libaio/default.nix +++ b/pkgs/os-specific/linux/libaio/default.nix @@ -14,10 +14,20 @@ stdenv.mkDerivation rec { sha256 = "1kqpiswjn549s3w3m89bw5qkl7bw5pvq6gp5cdzd926ymlgivj5c"; }) ]; + postPatch = '' + patchShebangs harness + + # Makefile is too optimistic, gcc is too smart + substituteInPlace harness/Makefile \ + --replace "-Werror" "" + ''; + makeFlags = "prefix=$(out)"; hardeningDisable = stdenv.lib.optional (stdenv.isi686) "stackprotector"; + checkTarget = "partcheck"; # "check" needs root + meta = { description = "Library for asynchronous I/O in Linux"; homepage = http://lse.sourceforge.net/io/aio.html; -- cgit 1.4.1 From 662756bb6d992c8678cf4b430e61e40a2fd5d316 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 8 Aug 2018 21:19:37 +0000 Subject: fuse: make tests run, but disable --- pkgs/os-specific/linux/fuse/common.nix | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index 7cc58c19c07..1e4f3d8d583 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -4,6 +4,7 @@ , fusePackages, utillinux, gettext , meson, ninja, pkgconfig , autoreconfHook +, python3Packages, which }: let @@ -58,6 +59,14 @@ in stdenv.mkDerivation rec { ./makeconf.sh ''); + checkInputs = [ which ] ++ (with python3Packages; [ python pytest ]); + + checkPhase = '' + python3 -m pytest test/ + ''; + + doCheck = false; # v2: no tests, v3: all tests get skipped in a sandbox + postFixup = "cd $out\n" + (if isFuse3 then '' install -D -m444 etc/fuse.conf $common/etc/fuse.conf install -D -m444 etc/udev/rules.d/99-fuse3.rules $common/etc/udev/rules.d/99-fuse.rules -- cgit 1.4.1 From 6c931a13c5f9c2d2be31c1e5053e037b4e6b3cbd Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 8 Aug 2018 21:27:16 +0000 Subject: numactl: make tests run, but disable. Ugh! --- pkgs/os-specific/linux/numactl/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix index 9928897ae4d..4506945ffba 100644 --- a/pkgs/os-specific/linux/numactl/default.nix +++ b/pkgs/os-specific/linux/numactl/default.nix @@ -23,6 +23,15 @@ stdenv.mkDerivation rec { sha256 = "080b0sygmg7104qbbh1amh3b322yyiajwi2d3d0vayffgva0720v"; }); + postPatch = '' + patchShebangs test + ''; + + # You probably shouldn't ever run these! They will reconfigure Linux + # NUMA settings, which on my build machine makes the rest of package + # building ~5% slower until reboot. Ugh! + doCheck = false; # never ever! + meta = with stdenv.lib; { description = "Library and tools for non-uniform memory access (NUMA) machines"; homepage = http://oss.sgi.com/projects/libnuma/; -- cgit 1.4.1 From c74e59511d71ff220b5473a34ce31c5e58d3d2e7 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 8 Aug 2018 21:27:57 +0000 Subject: syslinux: make tests run, but disable --- pkgs/os-specific/linux/syslinux/default.nix | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index 8a87d3fce58..f02f1baafe6 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -21,19 +21,23 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ nasm perl python ]; - buildInputs = [ libuuid makeWrapper ]; - - enableParallelBuilding = false; # Fails very rarely with 'No rule to make target: ...' - hardeningDisable = [ "pic" "stackprotector" "fortify" ]; - - preBuild = '' + postPatch = '' substituteInPlace Makefile --replace /bin/pwd $(type -P pwd) substituteInPlace gpxe/src/Makefile.housekeeping --replace /bin/echo $(type -P echo) substituteInPlace utils/ppmtolss16 --replace /usr/bin/perl $(type -P perl) substituteInPlace gpxe/src/Makefile --replace /usr/bin/perl $(type -P perl) + + # fix tests + substituteInPlace tests/unittest/include/unittest/unittest.h \ + --replace /usr/include/ "" ''; + nativeBuildInputs = [ nasm perl python ]; + buildInputs = [ libuuid makeWrapper ]; + + enableParallelBuilding = false; # Fails very rarely with 'No rule to make target: ...' + hardeningDisable = [ "pic" "stackprotector" "fortify" ]; + stripDebugList = "bin sbin share/syslinux/com32"; makeFlags = [ @@ -47,6 +51,8 @@ stdenv.mkDerivation rec { "bios" ]; + doCheck = false; # fails. some fail in a sandbox, others require qemu + postInstall = '' wrapProgram $out/bin/syslinux \ --prefix PATH : "${mtools}/bin" -- cgit 1.4.1 From 7cd8fdbf631e58332af64fe96910056fe5314dbc Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 8 Aug 2018 21:28:37 +0000 Subject: utillinux: make tests run, but disable --- pkgs/os-specific/linux/util-linux/default.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 1a7232afedb..f8a5f201bf9 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -22,6 +22,8 @@ in stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" ]; postPatch = '' + patchShebangs tests/run.sh + substituteInPlace include/pathnames.h \ --replace "/bin/login" "${shadow}/bin/login" substituteInPlace sys-utils/eject.c \ @@ -54,6 +56,8 @@ in stdenv.mkDerivation rec { [ zlib pam ] ++ lib.filter (p: p != null) [ ncurses systemd perl ]; + doCheck = false; # "For development purpose only. Don't execute on production system!" + postInstall = '' rm "$bin/bin/su" # su should be supplied by the su package (shadow) '' + lib.optionalString minimal '' -- cgit 1.4.1 From 8e1a0b59fda94aecb2782ff8a733f202c3f119bb Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 1 Aug 2018 21:58:57 +0000 Subject: pmount: disable tests --- pkgs/os-specific/linux/pmount/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix index ea34075210d..f0f706157ed 100644 --- a/pkgs/os-specific/linux/pmount/default.nix +++ b/pkgs/os-specific/linux/pmount/default.nix @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { substituteInPlace ./src/Makefile --replace '-o root -g root -m 4755 ' '-m 755 ' ''; + doCheck = false; # fails 1 out of 1 tests with "Error: could not open fstab-type file: No such file or directory" + meta = { homepage = http://pmount.alioth.debian.org/; description = "Mount removable devices as normal user"; -- cgit 1.4.1 From 54f901d346b9df7f4506926160f0f378f0a79129 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 12 Aug 2018 00:32:18 +0200 Subject: Libsystem: remove version symbols These no longer exist on 10.14 Fixes #42719 --- .../os-specific/darwin/apple-source-releases/Libsystem/system_c_symbols | 2 -- .../darwin/apple-source-releases/Libsystem/system_kernel_symbols | 2 -- 2 files changed, 4 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_c_symbols b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_c_symbols index e298ae47f72..4d83c5cfe9b 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_c_symbols +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_c_symbols @@ -51,8 +51,6 @@ ___bt_setcur ___bt_split ___bt_sync ___buf_free -___cVersionNumber -___cVersionString ___call_hash ___cleanup ___cmp_D2A diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols index 000af8ad7b7..4d1a1f521b0 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols @@ -57,8 +57,6 @@ ___ioctl ___iopolicysys ___kdebug_trace ___kdebug_trace64 -___kernelVersionNumber -___kernelVersionString ___kill ___lchown ___libkernel_init -- cgit 1.4.1