diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-10-03 17:46:39 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-10-03 17:46:39 +0000 |
| commit | f1370041799b17454dc252d137795810edf37594 (patch) | |
| tree | c3a8dce88803a52060fe88c73fe7d2af4afa1cba /pkgs/development/tools/misc | |
| parent | 3c3d8710b5d61baace6e412fd4b765a3a50e4188 (diff) | |
| parent | b465d9c1fff4e92d6790e10dafc6a578c44ac98e (diff) | |
| download | nixlib-f1370041799b17454dc252d137795810edf37594.tar nixlib-f1370041799b17454dc252d137795810edf37594.tar.gz nixlib-f1370041799b17454dc252d137795810edf37594.tar.bz2 nixlib-f1370041799b17454dc252d137795810edf37594.tar.lz nixlib-f1370041799b17454dc252d137795810edf37594.tar.xz nixlib-f1370041799b17454dc252d137795810edf37594.tar.zst nixlib-f1370041799b17454dc252d137795810edf37594.zip | |
Merge branch 'master' into staging
* master: (81 commits) Add NixOS 17.09 AMIs gradle: 4.2 -> 4.2.1 maintainers.nix: use my GitHub handle as maintainer name fcitx-engines.rime: init at 0.3.2 brise: init at 2017-09-16 librime: init at 1.2.9 marisa: init at 0.2.4 opencc: build shared library and programs josm: 12712 -> 12914 exa: 0.7.0 -> 0.8.0 krb5: add deprecation date for old configuration rustRegistry: 2017-09-10 -> 2017-10-03 go-ethereum: Fix libusb segmentation faults on Darwin tor-browser-bundle-bin: 7.0.5 -> 7.0.6 libsodium: 1.0.13 -> 1.0.15 tor-browser-bundle: geoip support tor-browser-bundle: support transports obfs2,obfs3 tor-browser-bundle: bump https-everywhere to 2017.9.12 tint2: limit platforms to Linux since macOS is not supported and fails the tests eclipse-plugin-vrapper: init at 0.72.0 ...
Diffstat (limited to 'pkgs/development/tools/misc')
| -rw-r--r-- | pkgs/development/tools/misc/iozone/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/universal-ctags/default.nix | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/tools/misc/iozone/default.nix b/pkgs/development/tools/misc/iozone/default.nix index 7e2416808879..4bcf5f1599a6 100644 --- a/pkgs/development/tools/misc/iozone/default.nix +++ b/pkgs/development/tools/misc/iozone/default.nix @@ -7,6 +7,8 @@ let "linux-AMD64" else if stdenv.system == "x86_64-darwin" then "macosx" + else if stdenv.system == "aarch64-linux" then + "linux-arm" else abort "Platform ${stdenv.system} not yet supported."; in @@ -53,7 +55,7 @@ stdenv.mkDerivation rec { description = "IOzone Filesystem Benchmark"; homepage = http://www.iozone.org/; license = stdenv.lib.licenses.unfreeRedistributable; - platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin"]; - maintainers = [ stdenv.lib.maintainers.Baughn ]; + platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; + maintainers = with stdenv.lib.maintainers; [ Baughn makefu ]; }; } diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index 5b32cc14e6fa..2a77fc42602a 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages, libiconv }: stdenv.mkDerivation rec { name = "universal-ctags-${version}"; @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig pythonPackages.docutils ]; + buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; autoreconfPhase = '' ./autogen.sh --tmpdir |