diff options
| author | Jörg Thalheim <joerg@higgsboson.tk> | 2016-10-03 19:26:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-03 19:26:44 +0200 |
| commit | 888f6a1280370de4f8268e0bae8d4b49d4db4cbc (patch) | |
| tree | 80bd6b2ddfc435bf19ce2061867a2d8c5622f653 /pkgs/development/tools/misc | |
| parent | 54867a040055813462156809a33a260d8bf60642 (diff) | |
| parent | 2ad13953a45a54816b73632277dcdbeda063827e (diff) | |
| download | nixlib-888f6a1280370de4f8268e0bae8d4b49d4db4cbc.tar nixlib-888f6a1280370de4f8268e0bae8d4b49d4db4cbc.tar.gz nixlib-888f6a1280370de4f8268e0bae8d4b49d4db4cbc.tar.bz2 nixlib-888f6a1280370de4f8268e0bae8d4b49d4db4cbc.tar.lz nixlib-888f6a1280370de4f8268e0bae8d4b49d4db4cbc.tar.xz nixlib-888f6a1280370de4f8268e0bae8d4b49d4db4cbc.tar.zst nixlib-888f6a1280370de4f8268e0bae8d4b49d4db4cbc.zip | |
Merge pull request #19199 from wizeman/u/fix-help2man-hash
help2man: fix hash
Diffstat (limited to 'pkgs/development/tools/misc')
| -rw-r--r-- | pkgs/development/tools/misc/help2man/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/kibana/default.nix | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 6839335245fc..8bf3db59147b 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/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 ]; diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix index d851741405ff..677ffa49c998 100644 --- a/pkgs/development/tools/misc/kibana/default.nix +++ b/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}"; }; |