pyrox.dev
Merge pull request #311015 from annaleeleaves/ip2unix-fix
ip2unix: upstream PR for out of range access
authored by Weijia Wang and committed by GitHub 315e42d0 6046e880
+10
-1
pkgs/tools/networking/ip2unix/default.nix
+10
-1
pkgs/tools/networking/ip2unix/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, yaml-cpp, systemd
2
, python3Packages, asciidoc, libxslt, docbook_xml_dtd_45, docbook_xsl
3
, libxml2, docbook5
4
}:
···
13
rev = "v${version}";
14
hash = "sha256-+p5wQbX35LAjZ4vIE4AhI4M6gQ7gVviqf9jJDAr9xg8";
15
};
16
17
nativeBuildInputs = [
18
meson ninja pkg-config asciidoc libxslt.bin docbook_xml_dtd_45 docbook_xsl
···
1
+
{ lib, stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkg-config, yaml-cpp, systemd
2
, python3Packages, asciidoc, libxslt, docbook_xml_dtd_45, docbook_xsl
3
, libxml2, docbook5
4
}:
···
13
rev = "v${version}";
14
hash = "sha256-+p5wQbX35LAjZ4vIE4AhI4M6gQ7gVviqf9jJDAr9xg8";
15
};
16
+
17
+
patches = [
18
+
# https://github.com/nixcloud/ip2unix/pull/35
19
+
# fix out of range string_view access
20
+
(fetchpatch {
21
+
url = "https://github.com/nixcloud/ip2unix/commit/050ddf76b4b925f27e255fbb820b0700407ceb2b.patch";
22
+
hash = "sha256-5vaLmZmwuiMGV4KnVhuDSnXG1a390aBU51TShwpaMLs=";
23
+
})
24
+
];
25
26
nativeBuildInputs = [
27
meson ninja pkg-config asciidoc libxslt.bin docbook_xml_dtd_45 docbook_xsl