diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/networking/curl/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/chipsec/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/gopass/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/text/html-tidy/default.nix | 15 |
4 files changed, 20 insertions, 9 deletions
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 66d2dfcdb9ae..879f8e2e38f1 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, perl +{ lib, stdenv, fetchurl, pkg-config, perl, nixosTests , brotliSupport ? false, brotli ? null , c-aresSupport ? false, c-ares ? null , gnutlsSupport ? false, gnutls ? null @@ -177,6 +177,8 @@ stdenv.mkDerivation rec { ''; passthru = { + # Additional checking with support http3 protocol. + tests.nginx-http3 = nixosTests.nginx-http3; inherit opensslSupport openssl; tests = { inherit curlpp coeurl; diff --git a/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix index 64d8885eedd4..5b4957139d75 100644 --- a/pkgs/tools/security/chipsec/default.nix +++ b/pkgs/tools/security/chipsec/default.nix @@ -68,6 +68,6 @@ python3.pkgs.buildPythonApplication rec { license = licenses.gpl2Only; homepage = "https://github.com/chipsec/chipsec"; maintainers = with maintainers; [ johnazoidberg ]; - platforms = if withDriver then [ "x86_64-linux" ] else platforms.all; + platforms = [ "x86_64-linux" ] ++ lib.optional (!withDriver) "x86_64-darwin"; }; } diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 4e3926d7f064..f283a911a62c 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.14.1"; + version = "1.14.2"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -21,10 +21,10 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vdMOD6Zrl718jcntjEzOG+4Rr0aqhm0YidA0x3Gseqg="; + sha256 = "sha256-JhLFax0UR/AVl/736pdsAyyQF/555YmLWLnZrsLDjlA="; }; - vendorSha256 = "sha256-mdPAZrcdlq7R7DRIfuxf4PCpEJoJjzo/+TDKAVglk7A="; + vendorSha256 = "sha256-ESIlmY3SzmfWLqLxf62dOhAsHPOKc2YYSOhzpJCjvCQ="; subPackages = [ "." ]; @@ -57,7 +57,7 @@ buildGoModule rec { description = "The slightly more awesome Standard Unix Password Manager for Teams. Written in Go"; homepage = "https://www.gopass.pw/"; license = licenses.mit; - maintainers = with maintainers; [ rvolosatovs ]; + maintainers = with maintainers; [ rvolosatovs sikmir ]; changelog = "https://github.com/gopasspw/gopass/raw/v${version}/CHANGELOG.md"; longDescription = '' diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix index 9694295ed1fa..d80b8e8c899c 100644 --- a/pkgs/tools/text/html-tidy/default.nix +++ b/pkgs/tools/text/html-tidy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libxslt }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, libxslt, html-tidy }: stdenv.mkDerivation rec { pname = "html-tidy"; @@ -11,9 +11,18 @@ stdenv.mkDerivation rec { sha256 = "sha256-ZMz0NySxzX2XHiqB8f5asvwjIG6kdIcq8Gb3EbAxBaU="; }; - nativeBuildInputs = [ cmake libxslt/*manpage*/ ]; + # https://github.com/htacg/tidy-html5/pull/1036 + patches = (fetchpatch { + url = "https://github.com/htacg/tidy-html5/commit/e9aa038bd06bd8197a0dc049380bc2945ff55b29.diff"; + sha256 = "sha256-Q2GjinNBWLL+HXUtslzDJ7CJSTflckbjweiSMCnIVwg="; + }); - cmakeFlags = []; + nativeBuildInputs = [ cmake libxslt/*manpage*/ ] + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) html-tidy; + + cmakeFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DHOST_TIDY=tidy" + ]; # ATM bin/tidy is statically linked, as upstream provides no other option yet. # https://github.com/htacg/tidy-html5/issues/326#issuecomment-160322107 |