diff --git a/pkgs/data/maps/usa-osm-topo-routable/default.nix b/pkgs/data/maps/usa-osm-topo-routable/default.nix

index c5fc4a14c8df2c52e7cdc45622c8b7da624ad3e4..11f1256ce176ebd2c5432b0510c2d51ef61e6c00 100644

--- a/pkgs/data/maps/usa-osm-topo-routable/default.nix

+++ b/pkgs/data/maps/usa-osm-topo-routable/default.nix

@@ -2,36 +2,16 @@ { lib, stdenvNoCC, fetchurl, p7zip }:

stdenvNoCC.mkDerivation rec {

pname = "usa-osm-topo-routable";

• version = "33";

• srcs = [

• (fetchurl {

•  url = "http://gmaptool.eu/sites/default/files/download/USA_OSM_Topo_v${version}.7z.001";
  

•  sha256 = "0603ja9j0m7yi88ykq60ix4savqr74nc4dhrjfhjidxm0zrdc48k";
  

• })

• (fetchurl {

•  url = "http://gmaptool.eu/sites/default/files/download/USA_OSM_Topo_v${version}.7z.002";
  

•  sha256 = "1q9l03fqnxd6rm6w77sjb1wd9cqc62ilraplrz2a0fsnf2n4wx5n";
  

• })

• (fetchurl {

•  url = "http://gmaptool.eu/sites/default/files/download/USA_OSM_Topo_v${version}.7z.003";
  

•  sha256 = "1kk82qp6xmsjh2s9jfjmvpa5ckiqhkl5a3hazamdaxk30zg3d0h5";
  

• })

• (fetchurl {

•  url = "http://gmaptool.eu/sites/default/files/download/USA_OSM_Topo_v${version}.7z.004";
  

•  sha256 = "1bp73mnd6bcwj9clps6knvrmpsykx9akqv31jai7kg2x500zq79m";
  

• })

• (fetchurl {

•  url = "http://gmaptool.eu/sites/default/files/download/USA_OSM_Topo_v${version}.7z.005";
  

•  sha256 = "1wz1kxinh6fh092zm6wzknkp46xdbnmdnd9mbclx1a2q6fid74x2";
  

• })

• ];

• version = "39";

• unpackPhase = lib.concatMapStringsSep "\n" (src: "ln -s ${src} ${src.name}") srcs;

• src = fetchurl {

• url = "https://gmaptool.eu/sites/default/files/download/USA_OSM_Topo_Base_v${version}.7z";

• hash = "sha256-MeXzOWmVRX11NFcFCNRdCn7k4i+ckqmJ4jNl9jVaqqk=";

• };

nativeBuildInputs = [ p7zip ];

• installPhase = "7z x USA_OSM_Topo_v${version}.7z.001 -o$out";

• installPhase = "7z x USA_OSM_Topo_v${version}.7z -o$out";

meta = with lib; {

 description = "USA OSM Topo Routable";

diff --git a/pkgs/misc/pvs-studio/how-to-use-pvs-studio-free.nix b/pkgs/misc/pvs-studio/how-to-use-pvs-studio-free.nix

index ecd7e31639547d1d1dbba625d5b003b9b2934bf6..965db470f2e5481680914f3712a884a1f101c4b1 100644

--- a/pkgs/misc/pvs-studio/how-to-use-pvs-studio-free.nix

+++ b/pkgs/misc/pvs-studio/how-to-use-pvs-studio-free.nix

@@ -18,12 +18,15 @@ hash = "sha256-xffOthjpBVP1aijdO6LTnHNQ3pvrO0/W3YJWIWLMuuQ=";

 })

];

• nativeBuildInputs = [ cmake ];

• postPatch = lib.optionalString (!stdenv.isDarwin) ''

• postPatch = ''

• sed -i '10i #include ' comments.h

 substituteInPlace CMakeLists.txt \

   --replace "set(CMAKE_INSTALL_PREFIX \"/usr\")" ""

'';

• nativeBuildInputs = [ cmake ];

• env.NIX_CFLAGS_COMPILE = "-Wno-error=unqualified-std-cast-call";

meta = with lib; {

 description = "How to use PVS-Studio for Free?";