From 5c2a47d5c7deed77ebd6f09721279ba07f1f8e03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 23 May 2021 20:45:20 +0200 Subject: [PATCH 1/8] nix: enable pie --- pkgs/tools/package-management/nix/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 159fc5b39c12..4a1d6c741f2c 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -38,6 +38,8 @@ common = outputs = [ "out" "dev" "man" "doc" ]; + hardeningEnable = [ "pie" ]; + nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isLinux [ util-linuxMinimal ] From 7212f6bcb4743b17a3d6a46cc5e2e17e3f54ab94 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 24 Jul 2021 16:50:56 +0000 Subject: [PATCH 2/8] dnsproxy: 0.38.3 -> 0.39.0 --- pkgs/tools/networking/dnsproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index ffa2138ffa82..f42294974c29 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.38.3"; + version = "0.39.0"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VfEfxcewKo8D8kNsMuCvrLOZNl632ZIFyD+RG8qzjQ4="; + sha256 = "sha256-rHU07rh8wZPaaxZmXVBu4tpt02Jq7Yu//dwWeVDUpw4="; }; vendorSha256 = null; From 8cd70d10fd46962336f9ac16d23da23d1295ab0a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 24 Jul 2021 19:00:38 +0000 Subject: [PATCH 3/8] gotestsum: 1.6.4 -> 1.7.0 --- pkgs/development/tools/gotestsum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix index e9bc48b0dcf2..1e63b07d03ed 100644 --- a/pkgs/development/tools/gotestsum/default.nix +++ b/pkgs/development/tools/gotestsum/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gotestsum"; - version = "1.6.4"; + version = "1.7.0"; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; rev = "v${version}"; - sha256 = "sha256-5iSUk/J73enbc/N3bn7M4oj2A0yoF1jTWpnXD380hFI="; + sha256 = "sha256-nZaVi39dOytJTM69xpl+d9XoUt+yHdndPgY2ggfNeMQ="; }; - vendorSha256 = "sha256-sHi8iW+ZV/coeAwDUYnSH039UNtUO9HK0Bhz9Gmtv8k="; + vendorSha256 = "sha256-wP5y8Ec6eSe+rdMEQQdX0fFTQ0HWuiyBRHxGlraZd+o="; doCheck = false; From e721776cbbaeedf7d7da434fba5845f2d81685b4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 31 Jul 2021 09:04:52 +0000 Subject: [PATCH 4/8] Revert "notmuch: skip T568-lib-thread" This reverts commit a4380866507afa5899cf0f1e05f0a7179145d3cf. > This should be fixed in commit a37d5f5, which was part of Notmuch > 0.31.4. https://nmbug.notmuchmail.org/nmweb/show/878s1o54c1.fsf%40tethera.net --- .../applications/networking/mailreaders/notmuch/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index dceb9c92deb8..e1a235c8309e 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -86,12 +86,6 @@ stdenv.mkDerivation rec { gdb man emacs ]; - # Expects there to always be a thread with ID - # thread:0000000000000009, but notmuch new is non-deterministic so - # this isn't always the case. Upstream bug report: - # https://nmbug.notmuchmail.org/nmweb/show/871reno6g7.fsf%40alyssa.is - NOTMUCH_SKIP_TESTS = "lib-thread"; - installTargets = [ "install" "install-man" "install-info" ]; postInstall = lib.optionalString withEmacs '' From 15eec2111fc06cca2b0abd7b3de1b6922fabf21e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 31 Jul 2021 09:34:41 +0000 Subject: [PATCH 5/8] notmuch: 0.32.1 -> 0.32.2; clarify license Also fix an incorrect (but apparently harmless) use of lib.optional. --- .../networking/mailreaders/notmuch/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index dceb9c92deb8..71cb68d0debe 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -12,7 +12,7 @@ with lib; stdenv.mkDerivation rec { - version = "0.32.1"; + version = "0.32.2"; pname = "notmuch"; passthru = { @@ -20,10 +20,9 @@ stdenv.mkDerivation rec { inherit version; }; - src = fetchgit { - url = "https://git.notmuchmail.org/git/notmuch"; - sha256 = "sha256:06r0hdz8mxnzag74md62a9m6c2zm0fxn45n4n1c26j5cmrys7j16"; - rev = version; + src = fetchurl { + url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz"; + sha256 = "1myylb19hj5nb1vriqng252vfjwwkgbi3gxj93pi2q1fzyw7w2lf"; }; nativeBuildInputs = [ @@ -31,7 +30,7 @@ stdenv.mkDerivation rec { doxygen # (optional) api docs pythonPackages.sphinx # (optional) documentation -> doc/INSTALL texinfo # (optional) documentation -> doc/INSTALL - ] ++ optional withEmacs [ emacs ]; + ] ++ optional withEmacs emacs; buildInputs = [ gnupg # undefined dependencies @@ -103,7 +102,7 @@ stdenv.mkDerivation rec { meta = { description = "Mail indexer"; homepage = "https://notmuchmail.org/"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ flokli puckipedia ]; platforms = platforms.unix; }; From 01c5b01858ff6870ec138c5fefdfaa13e9f6725e Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 31 Jul 2021 19:21:17 +0300 Subject: [PATCH 6/8] udocker: 1.1.3 -> 1.3.1 and make usable --- pkgs/tools/virtualization/udocker/default.nix | 49 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/pkgs/tools/virtualization/udocker/default.nix b/pkgs/tools/virtualization/udocker/default.nix index fb067de82125..6584c5bee5c6 100644 --- a/pkgs/tools/virtualization/udocker/default.nix +++ b/pkgs/tools/virtualization/udocker/default.nix @@ -1,35 +1,42 @@ -{ lib, fetchFromGitHub, proot, patchelf, fakechroot, runc, simplejson, pycurl, coreutils, nose, mock, buildPythonApplication }: +{ lib +, fetchFromGitHub +, singularity +, python3Packages +}: -buildPythonApplication rec { - - version = "1.1.3"; +python3Packages.buildPythonApplication rec { pname = "udocker"; + version = "1.3.1"; src = fetchFromGitHub { owner = "indigo-dc"; - repo = "udocker" ; + repo = "udocker"; rev = "v${version}"; - sha256 = "1c8y1p3brj987drikwrby8m1hdr40ja4anx0p4xsij3ll2h62w6z"; + sha256 = "0dfsjgidsnah8nrclrq10yz3ja859123z81kq4zdifbrhnrn5a2x"; }; - buildInputs = [ proot patchelf fakechroot runc simplejson pycurl coreutils ]; + # crun patchelf proot runc fakechroot + # are download statistically linked during runtime + buildInputs = [ + singularity + ] ++ (with python3Packages; [ + pytest-runner + pycurl + ]); - postPatch = '' - substituteInPlace udocker.py --replace /usr/sbin:/sbin:/usr/bin:/bin $PATH - substituteInPlace udocker.py --replace /bin/chmod ${coreutils}/bin/chmod - substituteInPlace udocker.py --replace /bin/rm ${coreutils}/bin/rm - substituteInPlace tests/unit_tests.py --replace /bin/rm ${coreutils}/bin/rm - substituteInPlace udocker.py --replace "autoinstall = True" "autoinstall = False" - ''; - - checkInputs = [ - nose - mock + checkInputs = with python3Packages; [ + pytestCheckHook ]; - checkPhase = '' - NOSE_EXCLUDE=test_03_create_repo,test_04_is_repo,test_02__get_group_from_host nosetests -v tests/unit_tests.py - ''; + disabledTests = [ + "test_05__get_volume_bindings" + ]; + + disabledTestPaths = [ + # Network + "tests/unit/test_curl.py" + "tests/unit/test_dockerioapi.py" + ]; meta = with lib; { description = "basic user tool to execute simple docker containers in user space without root privileges"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d3e5fafb151..b986fa71e37e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27668,7 +27668,7 @@ in umurmur = callPackage ../applications/networking/umurmur { }; - udocker = pythonPackages.callPackage ../tools/virtualization/udocker { }; + udocker = callPackage ../tools/virtualization/udocker { }; uefitoolPackages = recurseIntoAttrs (callPackage ../tools/system/uefitool/variants.nix {}); uefitool = uefitoolPackages.new-engine; From a7dbb32253ed33b1c8fba5eb0ad10025cbe3f7f8 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 31 Jul 2021 18:19:14 -0400 Subject: [PATCH 7/8] findutils: remove upstreamed patch The patch for 32-bit ARM was included in 4.8.0, and therefore needs to be removed. --- pkgs/tools/misc/findutils/default.nix | 5 +-- .../misc/findutils/fix-gnulib-tests-arm.patch | 45 ------------------- 2 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 pkgs/tools/misc/findutils/fix-gnulib-tests-arm.patch diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 57839f730562..8c8b8c7b2b43 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -20,10 +20,7 @@ stdenv.mkDerivation rec { substituteInPlace xargs/xargs.c --replace 'char default_cmd[] = "echo";' 'char default_cmd[] = "${coreutils}/bin/echo";' ''; - patches = [ ./no-install-statedir.patch ] - # fix gnulib tests on 32-bit ARM. Included on findutils master. - # https://lists.gnu.org/r/bug-gnulib/2020-08/msg00225.html - ++ lib.optional stdenv.hostPlatform.isAarch32 ./fix-gnulib-tests-arm.patch; + patches = [ ./no-install-statedir.patch ]; buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort diff --git a/pkgs/tools/misc/findutils/fix-gnulib-tests-arm.patch b/pkgs/tools/misc/findutils/fix-gnulib-tests-arm.patch deleted file mode 100644 index 39bd29f8439e..000000000000 --- a/pkgs/tools/misc/findutils/fix-gnulib-tests-arm.patch +++ /dev/null @@ -1,45 +0,0 @@ ->From 175e0bc72808d564074c4adcc72aeadb74adfcc6 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Thu, 27 Aug 2020 17:52:58 -0700 -Subject: [PATCH] perror, strerror_r: remove unportable tests - -Problem reported by Florian Weimer in: -https://lists.gnu.org/r/bug-gnulib/2020-08/msg00220.html -* tests/test-perror2.c (main): -* tests/test-strerror_r.c (main): Omit unportable tests. ---- - tests/test-perror2.c | 3 --- - tests/test-strerror_r.c | 3 --- - 2 files changed, 6 deletions(-) - -diff --git a/gnulib-tests/test-perror2.c b/gnulib-tests/test-perror2.c -index 1d14eda7b..c6214dd25 100644 ---- a/gnulib-tests/test-perror2.c -+++ b/gnulib-tests/test-perror2.c -@@ -79,9 +79,6 @@ main (void) - errno = -5; - perror (""); - ASSERT (!ferror (stderr)); -- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1)); -- ASSERT (msg2 == msg4 || STREQ (msg2, str2)); -- ASSERT (msg3 == msg4 || STREQ (msg3, str3)); - ASSERT (STREQ (msg4, str4)); - - free (str1); -diff --git a/gnulib-tests/test-strerror_r.c b/gnulib-tests/test-strerror_r.c -index b11d6fd9f..c1dbcf837 100644 ---- a/gnulib-tests/test-strerror_r.c -+++ b/gnulib-tests/test-strerror_r.c -@@ -165,9 +165,6 @@ main (void) - - strerror_r (EACCES, buf, sizeof buf); - strerror_r (-5, buf, sizeof buf); -- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1)); -- ASSERT (msg2 == msg4 || STREQ (msg2, str2)); -- ASSERT (msg3 == msg4 || STREQ (msg3, str3)); - ASSERT (STREQ (msg4, str4)); - - free (str1); --- -2.17.1 - From 71394c34478e5e53a8839980481e3eaea39254cd Mon Sep 17 00:00:00 2001 From: David Date: Sat, 31 Jul 2021 17:36:06 +0200 Subject: [PATCH 8/8] erlang-ls: skip tests on darwin --- pkgs/development/beam-modules/erlang-ls/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index 7635e46237b4..f2ba9a1815d8 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, fetchHex, rebar3Relx, buildRebar3, rebar3-proper, lib }: +{ fetchFromGitHub, fetchHex, rebar3Relx, buildRebar3, rebar3-proper, stdenv, lib }: let version = "0.17.0"; owner = "erlang-ls"; @@ -32,7 +32,8 @@ rebar3Relx { HOME=. rebar3 ct HOME=. rebar3 proper --constraint_tries 100 ''; - doCheck = true; + # tests seem to be a bit flaky on darwin, skip them for now + doCheck = !stdenv.isDarwin; installPhase = '' mkdir -p $out/bin cp _build/default/bin/erlang_ls $out/bin/