Merge pull request #19199 from wizeman/u/fix-help2man-hash

help2man: fix hash

pkgs/development/tools/misc/help2man/default.nix

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/help2man/${name}.tar.xz";
-    sha256 = "0miqq77ssk5rgsc9xlv7k5n2wk2c5wv2m1kh4zhbwrggfmjaycn2";
+    sha256 = "0lvp4306f5nq08f3snffs5pp1zwv8l35z6f5g0dds51zs6bzdv6l";
   };
 
   buildInputs = [ makeWrapper perl gettext LocaleGettext ];

pkgs/development/tools/misc/kibana/default.nix

@@ -3,8 +3,12 @@
 with stdenv.lib;
 let
   inherit (builtins) elemAt;
+  archOverrides = {
+    "i686" = "x86";
+  };
   info = splitString "-" stdenv.system;
-  arch = elemAt info 0;
+  arch = (elemAt info 0);
+  elasticArch = archOverrides."${arch}" or arch;
   plat = elemAt info 1;
   shas = {
     "x86_64-linux"  = "1md3y3a8rxvf37lnfc56kbirv2rjl68pa5672yxhfmjngrr20rcw";
@@ -16,7 +20,7 @@ in stdenv.mkDerivation rec {
   version = "4.6.0";
 
   src = fetchurl {
-    url = "https://download.elastic.co/kibana/kibana/${name}-${plat}-${arch}.tar.gz";
+    url = "https://download.elastic.co/kibana/kibana/${name}-${plat}-${elasticArch}.tar.gz";
     sha256 = shas."${stdenv.system}";
   };