diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-09-21 21:08:21 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-09-21 21:09:32 +0200 |
| commit | 4683c374fa5b859341db19550d308ea73730f166 (patch) | |
| tree | 5b85193e1d17cfd26fa303d61888f4a2a37e89bc /pkgs/development/tools/misc | |
| parent | e9c1f640482f7028dfd192b6e8b3bf39eed7333b (diff) | |
| parent | 1ae204d2fab96b2aebc59c232f78a116db2b640b (diff) | |
| download | nixlib-4683c374fa5b859341db19550d308ea73730f166.tar nixlib-4683c374fa5b859341db19550d308ea73730f166.tar.gz nixlib-4683c374fa5b859341db19550d308ea73730f166.tar.bz2 nixlib-4683c374fa5b859341db19550d308ea73730f166.tar.lz nixlib-4683c374fa5b859341db19550d308ea73730f166.tar.xz nixlib-4683c374fa5b859341db19550d308ea73730f166.tar.zst nixlib-4683c374fa5b859341db19550d308ea73730f166.zip | |
Merge branch 'master' into staging
A couple thousand rebuilds again.
Diffstat (limited to 'pkgs/development/tools/misc')
| -rw-r--r-- | pkgs/development/tools/misc/gengetopt/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/kibana/5.x.nix | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/tools/misc/gengetopt/default.nix b/pkgs/development/tools/misc/gengetopt/default.nix index 19e934f884f7..304f16942eaf 100644 --- a/pkgs/development/tools/misc/gengetopt/default.nix +++ b/pkgs/development/tools/misc/gengetopt/default.nix @@ -10,6 +10,10 @@ stdenv.mkDerivation rec { doCheck = true; + postPatch = '' + sed -e 's/set -o posix/set +o posix/' -i configure + ''; + meta = { description = "Command-line option parser generator"; diff --git a/pkgs/development/tools/misc/kibana/5.x.nix b/pkgs/development/tools/misc/kibana/5.x.nix index 69a19987020d..735f85f74569 100644 --- a/pkgs/development/tools/misc/kibana/5.x.nix +++ b/pkgs/development/tools/misc/kibana/5.x.nix @@ -11,9 +11,9 @@ let elasticArch = archOverrides."${arch}" or arch; plat = elemAt info 1; shas = { - "x86_64-linux" = "0nmx7r6i54x7pii4ryh3wzzbwvnmcb3f1hn6ch96r24xi4v9m1sb"; - "i686-linux" = "0am6wmbcsh7zxzdrl1q9jbjrb7y4apvi6sr70j61xcx07pbickpp"; - "x86_64-darwin" = "0kjnlzsz4i2fca3jgfsr1kknqzaypb0r78a7cxz2m7daj3bmpvpl"; + "x86_64-linux" = "02dhhp16pmkrpi2dfrca9qzz1q7jrxhaw6l3cfflgxx77hz0hlnw"; + "i686-linux" = "1h1zr342dq7nngvzpf9pn9mvwsi7aksa3qjyqpcc4yvbmmyrlk0m"; + "x86_64-darwin" = "0van8cnir6s520crc20bf2clbkf822c3ylpk7iiq7da8hwvsypp9"; }; in stdenv.mkDerivation rec { name = "kibana-${version}"; |