diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-05-12 19:21:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-12 19:21:10 +0200 |
| commit | 315e42d06394bd979be55b286be15fcf671e07e2 (patch) | |
| tree | 20cd0d87696d1606e2c257ac34894d6dd9b58a2b /pkgs | |
| parent | 6046e8807481cfcbc143897f2e323772d251b693 (diff) | |
| parent | 4a74c4cf51d701ab11926cf39fc2972d941ecbd1 (diff) | |
Merge pull request #311015 from annaleeleaves/ip2unix-fix
ip2unix: upstream PR for out of range access
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/networking/ip2unix/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/tools/networking/ip2unix/default.nix b/pkgs/tools/networking/ip2unix/default.nix index b37d5b1272c8a..e30b806c6dc7c 100644 --- a/pkgs/tools/networking/ip2unix/default.nix +++ b/pkgs/tools/networking/ip2unix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, yaml-cpp, systemd +{ lib, stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkg-config, yaml-cpp, systemd , python3Packages, asciidoc, libxslt, docbook_xml_dtd_45, docbook_xsl , libxml2, docbook5 }: @@ -14,6 +14,15 @@ stdenv.mkDerivation rec { hash = "sha256-+p5wQbX35LAjZ4vIE4AhI4M6gQ7gVviqf9jJDAr9xg8"; }; + patches = [ + # https://github.com/nixcloud/ip2unix/pull/35 + # fix out of range string_view access + (fetchpatch { + url = "https://github.com/nixcloud/ip2unix/commit/050ddf76b4b925f27e255fbb820b0700407ceb2b.patch"; + hash = "sha256-5vaLmZmwuiMGV4KnVhuDSnXG1a390aBU51TShwpaMLs="; + }) + ]; + nativeBuildInputs = [ meson ninja pkg-config asciidoc libxslt.bin docbook_xml_dtd_45 docbook_xsl libxml2.bin docbook5 python3Packages.pytest python3Packages.pytest-timeout |