diff options
Diffstat (limited to 'pkgs/development/tools')
54 files changed, 533 insertions, 306 deletions
diff --git a/pkgs/development/tools/analysis/cov-build/default.nix b/pkgs/development/tools/analysis/cov-build/default.nix index fef98f1e04aa..bd0a4ee5e40a 100644 --- a/pkgs/development/tools/analysis/cov-build/default.nix +++ b/pkgs/development/tools/analysis/cov-build/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "7.0.2"; src = - if stdenv.system == "i686-linux" + if stdenv.hostPlatform.system == "i686-linux" then requireFile { name = "cov-analysis-linux32-${version}.tar.gz"; sha256 = "0i06wbd7blgx9adh9w09by4i18vwmldfp9ix97a5dph2cjymsviy"; diff --git a/pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch b/pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch deleted file mode 100644 index d5c3662e9abf..000000000000 --- a/pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/engines/ptrace.cc b/src/engines/ptrace.cc -index 59b615f..e02cddf 100644 ---- a/src/engines/ptrace.cc -+++ b/src/engines/ptrace.cc -@@ -21,6 +21,7 @@ - - #if defined(__aarch64__) - # include <sys/uio.h> -+# include <elf.h> - #endif - - #include <map> diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index 7d75d9a34e1a..af20165d155f 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "kcov-${version}"; - version = "35"; + version = "36"; src = fetchFromGitHub { owner = "SimonKagstrom"; repo = "kcov"; rev = "v${version}"; - sha256 = "1da9vm87pi5m9ika0q1f1ai85w3vwlap8yln147yr9sc37jp5jcw"; + sha256 = "1q1mw5mxz041lr6qc2v4280rmx13pg1bx5r3bxz9bzs941r405r3"; }; preConfigure = "patchShebangs src/bin-to-c-source.py"; @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { buildInputs = [ zlib curl elfutils python libiberty libopcodes ]; - patches = [ ./aarch64_nt_prstatus.patch ]; - enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index cbcfa981b6b5..5734a0f27953 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { ''; configureFlags = - stdenv.lib.optional (stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin") "--enable-only64bit"; + stdenv.lib.optional (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin") "--enable-only64bit"; doCheck = false; # fails diff --git a/pkgs/development/tools/build-managers/alibuild/default.nix b/pkgs/development/tools/build-managers/alibuild/default.nix new file mode 100644 index 000000000000..eb805dcce7a9 --- /dev/null +++ b/pkgs/development/tools/build-managers/alibuild/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, python}: + +python.pkgs.buildPythonApplication rec { + pname = "alibuild"; + version = "1.5.4rc3"; + + src = python.pkgs.fetchPypi { + inherit pname version; + sha256 = "1mnh0h9m96p78b9ln1gbl4lw1mgl16qbyfi9fj2l13p3nxaq1sib"; + }; + + argparse = null; + + doCheck = false; + propagatedBuildInputs = [ + python.pkgs.requests + python.pkgs.argparse + python.pkgs.pyyaml + ]; + + meta = with lib; { + homepage = "https://alisw.github.io/alibuild/"; + description = "Build tool for ALICE experiment software"; + license = licenses.gpl3; + maintainers = with maintainers; [ ktf ]; + }; +} diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix index 19ca5b9c0788..455cd0a3fe8b 100644 --- a/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -2,7 +2,7 @@ assert jdk != null; -let version = "3.5.3"; in +let version = "3.5.4"; in stdenv.mkDerivation rec { name = "apache-maven-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://apache/maven/maven-3/${version}/binaries/${name}-bin.tar.gz"; - sha256 = "0244mpziz4rw35x2cahsqlxpnygvi6qpll16g4kx87db7wvmcadm"; + sha256 = "0kd1jzlz3b2kglppi85h7286vdwjdmm7avvpwgppgjv42g4v2l6f"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 8d4b95c8808e..6a25aef8b36a 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, runCommand, makeWrapper +{ stdenv, lib, fetchurl, fetchpatch, runCommand, makeWrapper , jdk, zip, unzip, bash, writeCBin, coreutils , which, python, perl, gnused, gnugrep, findutils # Always assume all markers valid (don't redownload dependencies). @@ -26,7 +26,7 @@ let in stdenv.mkDerivation rec { - version = "0.15.2"; + version = "0.16.0"; meta = with lib; { homepage = "https://github.com/bazelbuild/bazel/"; @@ -40,12 +40,19 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "1w83zi6d9npi1jmiy022v92xp1cwdvn2qqgghlnl2v9sprryqlxz"; + sha256 = "1ca9pncnj6v4r1kvgxys7607wpz4d2ic6g0i7lpsc2zg2qwmjc67"; }; sourceRoot = "."; - patches = lib.optional enableNixHacks ./nix-hacks.patch; + patches = + lib.optional enableNixHacks ./nix-hacks.patch + # patch perl out of the bash completions + # should land in 0.18 + ++ [(fetchpatch { + url = "https://github.com/bazelbuild/bazel/commit/27be70979b54d7510bf401d9581fb4075737ef34.patch"; + sha256 = "04rip46lnibrsdyzjpi29wf444b49cbwb1xjcbrr3kdqsdj4d8h5"; + })]; # Bazel expects several utils to be available in Bash even without PATH. Hence this hack. @@ -121,10 +128,10 @@ stdenv.mkDerivation rec { echo "build --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\"" >> .bazelrc echo "build --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\"" >> .bazelrc echo "build --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\"" >> .bazelrc - sed -i -e "361 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "361 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "361 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "361 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "362 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "362 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "362 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "362 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh # --experimental_strict_action_env (which will soon become the # default, see bazelbuild/bazel#2574) hardcodes the default @@ -139,11 +146,6 @@ stdenv.mkDerivation rec { cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash - # the bash completion requires perl - # https://github.com/bazelbuild/bazel/issues/5943 - substituteInPlace scripts/bazel-complete-template.bash \ - --replace "perl" "${perl}/bin/perl" - patchShebangs . ''; in lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index a57d20e2702a..2cbc87a5267a 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, fetchpatch, curl, expat, zlib, bzip2 , useNcurses ? false, ncurses, useQt4 ? false, qt4, ps -, buildPlatform, hostPlatform }: with stdenv.lib; @@ -35,7 +34,7 @@ stdenv.mkDerivation rec { })] ++ # Don't search in non-Nix locations such as /usr, but do search in our libc. [ ./search-path.patch ] ++ - optional (hostPlatform != buildPlatform) (fetchurl { + optional (stdenv.hostPlatform != stdenv.buildPlatform) (fetchurl { name = "fix-darwin-cross-compile.patch"; url = "https://public.kitware.com/Bug/file_download.php?" + "file_id=4981&type=bug"; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index f5ca69e59c84..566694e06b04 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,12 +52,12 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-4.9"; + name = "gradle-4.10"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "0a0dkdzmz0ynf73inii8djy2hihqd9c97fir9c0d4g8px3f6jvp6"; + sha256 = "064zyli00cj3clbn631kivg5izhkyyf31f6x65a2rqac229gv314"; }; }; diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index ca53c4d8c535..35ae59af617c 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, stdenv, targetPlatform, writeTextDir, substituteAll }: +{ lib, python3Packages, stdenv, writeTextDir, substituteAll }: python3Packages.buildPythonApplication rec { version = "0.46.1"; @@ -57,10 +57,10 @@ python3Packages.buildPythonApplication rec { needs_exe_wrapper = true [host_machine] - system = '${targetPlatform.parsed.kernel.name}' - cpu_family = '${targetPlatform.parsed.cpu.family}' - cpu = '${targetPlatform.parsed.cpu.name}' - endian = ${if targetPlatform.isLittleEndian then "'little'" else "'big'"} + system = '${stdenv.targetPlatform.parsed.kernel.name}' + cpu_family = '${stdenv.targetPlatform.parsed.cpu.family}' + cpu = '${stdenv.targetPlatform.parsed.cpu.name}' + endian = ${if stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"} ''; # 0.45 update enabled tests but they are failing diff --git a/pkgs/development/tools/cargo-web/default.nix b/pkgs/development/tools/cargo-web/default.nix new file mode 100644 index 000000000000..06d6697ef965 --- /dev/null +++ b/pkgs/development/tools/cargo-web/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, openssl, pkgconfig, rustPlatform }: + +rustPlatform.buildRustPackage rec { + name = "cargo-web-${version}"; + version = "0.6.15"; + + src = fetchFromGitHub { + owner = "koute"; + repo = "cargo-web"; + rev = version; + sha256 = "076g7cd9v53vi8xvd4kfsiyzw1m2hhd1lwlwcv2dx2s5vlw4dxzh"; + }; + + cargoSha256 = "157av9zkirr00w9v11mh7yp8w36sy7rw6i80i5jmi0mgrdvcg5si"; + + nativeBuildInputs = [ openssl pkgconfig ]; + + meta = with stdenv.lib; { + description = "A Cargo subcommand for the client-side Web"; + homepage = https://github.com/koute/cargo-web; + license = with licenses; [asl20 /* or */ mit]; + maintainers = [ maintainers.kevincox ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/corgi/default.nix b/pkgs/development/tools/corgi/default.nix new file mode 100644 index 000000000000..94596ab68afa --- /dev/null +++ b/pkgs/development/tools/corgi/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "corgi-${rev}"; + rev = "v0.2.3"; + + goPackagePath = "github.com/DrakeW/corgi"; + + src = fetchFromGitHub { + owner = "DrakeW"; + repo = "corgi"; + inherit rev; + sha256 = "0ahwpyd6dac04qw2ak51xfbwkr42sab1gkhh52i7hlcy12jpwl8q"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "CLI workflow manager"; + longDescription = '' + Corgi is a command-line tool that helps with your repetitive command usages by organizing them into reusable snippet. + ''; + homepage = https://github.com/DrakeW/corgi; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ kalbasit ]; + }; +} diff --git a/pkgs/development/tools/corgi/deps.nix b/pkgs/development/tools/corgi/deps.nix new file mode 100644 index 000000000000..d48b141627c7 --- /dev/null +++ b/pkgs/development/tools/corgi/deps.nix @@ -0,0 +1,47 @@ +[ + { + goPackagePath = "github.com/chzyer/readline"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/readline"; + rev = "2972be24d48e78746da79ba8e24e8b488c9880de"; + sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r"; + }; + } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "2d684516a8861da43017284349b7e303e809ac21"; + sha256 = "1fcfmz4wji3gqmmsdx493r7d101s58hwjalqps6hy25nva5pvmfs"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "ae18d6b8b3205b561c79e8e5f69bff09736185f4"; + sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "99dc123558852f67743bd0b2caf8383cb3c6d720"; + sha256 = "0b2rjgycgpkpvpsqgvilqkr66bfk477lyd6l0jxmgxb1h0za5s25"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "d929dcbb10863323c436af3cf76cb16a6dfc9b29"; + sha256 = "1qjmqvszs9cmic7brm7pknq86zjra4hq923bn88blfvr3bap5bc4"; + }; + } +] diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 695a532305a9..942748a38106 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -4,7 +4,7 @@ let version = "1.8.2"; name = "electron-${version}"; - throwSystem = throw "Unsupported system: ${stdenv.system}"; + throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; meta = with stdenv.lib; { description = "Cross platform desktop application shell"; @@ -34,7 +34,7 @@ let url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip"; sha256 = "0k4np2d4y15x1qfay8y9m8v9y223vdpbq5fdxa3ywbbyf8j361zd"; }; - }.${stdenv.system} or throwSystem; + }.${stdenv.hostPlatform.system} or throwSystem; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix index a89861faebbc..af58762f80eb 100644 --- a/pkgs/development/tools/erlang/cuter/default.nix +++ b/pkgs/development/tools/erlang/cuter/default.nix @@ -1,5 +1,5 @@ { stdenv, autoreconfHook, which, writeText, makeWrapper, fetchFromGitHub, erlang -, beamPackages, z3, python27 }: +, beamPackages, z3, python }: stdenv.mkDerivation rec { name = "cuter-${version}"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { addToSearchPath ERL_LIBS "$1/lib/erlang/lib/" ''; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = with beamPackages; [ python27.pkgs.setuptools erlang z3.python python27 makeWrapper which ]; + nativeBuildInputs = [ autoreconfHook makeWrapper which ]; + buildInputs = [ python python.pkgs.setuptools z3.python erlang ]; buildFlags = "PWD=$(out)/lib/erlang/lib/cuter-${version} cuter_target"; configurePhase = '' @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { cp -r * "$out/lib/erlang/lib/cuter-${version}" cp cuter "$out/bin/cuter" wrapProgram $out/bin/cuter \ - --prefix PATH : "${python27}/bin" \ - --suffix PYTHONPATH : "${z3}/lib/python2.7/site-packages" \ + --prefix PATH : "${python}/bin" \ + --suffix PYTHONPATH : "${z3}/${python.sitePackages}" \ --suffix ERL_LIBS : "$out/lib/erlang/lib" ''; diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index b4a35b3a21c0..33f9ade46811 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -36,7 +36,7 @@ }: let - version = "0.99.3"; + version = "1.0.0"; in stdenv.mkDerivation rec { name = "flatpak-builder-${version}"; @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz"; - sha256 = "0sq3rcy3vwa36p6wq63wdvkk0hrs3qj1ngk26j9947nc14z39plk"; + sha256 = "0ysnz0dwc8wfd31afwssg9prvaqdga7z4mybnrzy8sgm0hi5p2l5"; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/github/github-release/default.nix b/pkgs/development/tools/github/github-release/default.nix index 1ccd1061a136..b80ddff054a9 100644 --- a/pkgs/development/tools/github/github-release/default.nix +++ b/pkgs/development/tools/github/github-release/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl }: let - linuxPredicate = stdenv.system == "x86_64-linux"; - bsdPredicate = stdenv.system == "x86_64-freebsd"; - darwinPredicate = stdenv.system == "x86_64-darwin"; + linuxPredicate = stdenv.hostPlatform.system == "x86_64-linux"; + bsdPredicate = stdenv.hostPlatform.system == "x86_64-freebsd"; + darwinPredicate = stdenv.hostPlatform.system == "x86_64-darwin"; metadata = assert linuxPredicate || bsdPredicate || darwinPredicate; if linuxPredicate then { arch = "linux-amd64"; diff --git a/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/pkgs/development/tools/google-app-engine-go-sdk/default.nix index c85186e1c0b2..ba4f4bb3f519 100644 --- a/pkgs/development/tools/google-app-engine-go-sdk/default.nix +++ b/pkgs/development/tools/google-app-engine-go-sdk/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "google-app-engine-go-sdk-${version}"; version = "1.9.61"; src = - if stdenv.system == "x86_64-linux" then + if stdenv.hostPlatform.system == "x86_64-linux" then fetchzip { url = "https://storage.googleapis.com/appengine-sdks/featured/go_appengine_sdk_linux_amd64-${version}.zip"; sha256 = "1i2j9ympl1218akwsmm7yb31v0gibgpzlb657bcravi1irfv1hhs"; diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index 2ef6b4a1d548..877080508d40 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "hcloud-${version}"; - version = "1.6.0"; + version = "1.6.1"; goPackagePath = "github.com/hetznercloud/cli"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "v${version}"; - sha256 = "0iswy8xjqvshwk9w2vz3miph953qdh21xga9hl6aili84x25xzbx"; + sha256 = "0v5n7y8vb23iva51kb15da198yk7glc1fix193icrk3pvcbj5bjr"; }; buildFlagsArray = [ "-ldflags=" "-w -X github.com/hetznercloud/cli/cli.Version=${version}" ]; diff --git a/pkgs/development/tools/kythe/default.nix b/pkgs/development/tools/kythe/default.nix new file mode 100644 index 000000000000..5aae1d4f3bef --- /dev/null +++ b/pkgs/development/tools/kythe/default.nix @@ -0,0 +1,47 @@ +{ stdenv, binutils , fetchurl, glibc }: + +stdenv.mkDerivation rec { + version = "0.0.28"; + name = "kythe-${version}"; + + src = fetchurl { + url = "https://github.com/google/kythe/releases/download/v0.0.28/kythe-v0.0.28.tar.gz"; + sha256 = "1qc7cngpxw66m3krpr5x50ns7gb3bpv2bdfzpb5afl12qp0mi6zm"; + }; + + buildInputs = + [ binutils ]; + + doCheck = false; + + dontBuild = true; + + installPhase = '' + cd tools + for exe in http_server \ + kythe read_entries triples verifier \ + write_entries write_tables; do + echo "Patching:" $exe + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $exe + patchelf --set-rpath "${stdenv.cc.cc.lib}/lib64" $exe + done + cd ../ + cp -R ./ $out + ''; + + meta = with stdenv.lib; { + description = "A pluggable, (mostly) language-agnostic ecosystem for building tools that work with code."; + longDescription = '' + The Kythe project was founded to provide and support tools and standards + that encourage interoperability among programs that manipulate source + code. At a high level, the main goal of Kythe is to provide a standard, + language-agnostic interchange mechanism, allowing tools that operate on + source code — including build systems, compilers, interpreters, static + analyses, editors, code-review applications, and more — to share + information with each other smoothly. ''; + homepage = https://kythe.io/; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = [ maintainers.mpickering ]; + }; +} diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index d569b8d30687..8c210cb93601 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, flex, bison }: let - version = "2.1.7"; + version = "2.2.0"; in stdenv.mkDerivation { name = "minizinc-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { rev = "${version}"; owner = "MiniZinc"; repo = "libminizinc"; - sha256 = "05rifsgzfaalv5ymv59sjcvhr6i1byzbmq5p36hj3hpi5f929kip"; + sha256 = "05is1r5y06jfqwvka90dn2ffxnvbgyswaxl00aqz6455hnggnxvm"; }; # meta is all the information about the package.. diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 3ca9e539ddd8..3205366f80eb 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -1,6 +1,5 @@ { stdenv, buildPackages , fetchurl, zlib, autoreconfHook264 -, hostPlatform, buildPlatform, targetPlatform , noSysDirs, gold ? true, bison ? null }: @@ -13,7 +12,7 @@ let inherit (stdenv.lib) optionals optionalString; # The targetPrefix prepended to binary names to allow multiple binuntils on the # PATH to both be usable. - targetPrefix = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; + targetPrefix = optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "${stdenv.targetPlatform.config}-"; in stdenv.mkDerivation rec { @@ -65,14 +64,14 @@ stdenv.mkDerivation rec { # be satisfied on aarch64 platform. Add backported fix from bugzilla. # https://sourceware.org/bugzilla/show_bug.cgi?id=22764 ./relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch - ] ++ stdenv.lib.optional targetPlatform.isiOS ./support-ios.patch; + ] ++ stdenv.lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch; outputs = [ "out" "info" "man" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ bison - ] ++ stdenv.lib.optionals targetPlatform.isiOS [ + ] ++ stdenv.lib.optionals stdenv.targetPlatform.isiOS [ autoreconfHook264 ]; buildInputs = [ zlib ]; @@ -94,14 +93,14 @@ stdenv.mkDerivation rec { # As binutils takes part in the stdenv building, we don't want references # to the bootstrap-tools libgcc (as uses to happen on arm/mips) - NIX_CFLAGS_COMPILE = if hostPlatform.isDarwin + NIX_CFLAGS_COMPILE = if stdenv.hostPlatform.isDarwin then "-Wno-string-plus-int -Wno-deprecated-declarations" else "-static-libgcc"; hardeningDisable = [ "format" ]; # TODO(@Ericson2314): Always pass "--target" and always targetPrefix. - configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target"; configureFlags = [ "--enable-targets=all" "--enable-64-bit-bfd" @@ -122,7 +121,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails # else fails with "./sanity.sh: line 36: $out/bin/size: not found" - doInstallCheck = buildPlatform == hostPlatform && hostPlatform == targetPlatform; + doInstallCheck = stdenv.buildPlatform == stdenv.hostPlatform && stdenv.hostPlatform == stdenv.targetPlatform; enableParallelBuilding = true; diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix index 8ec0ecd5785d..16098bda3ee5 100644 --- a/pkgs/development/tools/misc/cflow/default.nix +++ b/pkgs/development/tools/misc/cflow/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ gettext ] ++ # We don't have Emacs/GTK/etc. on {Dar,Cyg}win. stdenv.lib.optional - (! (stdenv.lib.lists.any (x: stdenv.system == x) + (! (stdenv.lib.lists.any (x: stdenv.hostPlatform.system == x) [ "i686-cygwin" ])) emacs; diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index ae59f85a211e..a60a77bed30b 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -6,14 +6,9 @@ # Run time , ncurses, readline, gmp, mpfr, expat, zlib, dejagnu -, buildPlatform, hostPlatform, targetPlatform - -, pythonSupport ? hostPlatform == buildPlatform && !hostPlatform.isCygwin, python ? null +, pythonSupport ? stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.hostPlatform.isCygwin, python ? null , guile ? null -# Additional dependencies for GNU/Hurd. -, mig ? null, hurd ? null - }: let @@ -21,13 +16,12 @@ let version = "8.1.1"; in -assert targetPlatform.isHurd -> mig != null && hurd != null; assert pythonSupport -> python != null; stdenv.mkDerivation rec { name = - stdenv.lib.optionalString (targetPlatform != hostPlatform) - (targetPlatform.config + "-") + stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) + (stdenv.targetPlatform.config + "-") + basename; src = fetchurl { @@ -38,13 +32,10 @@ stdenv.mkDerivation rec { patches = [ ./debug-info-from-env.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-target-match.patch; - nativeBuildInputs = [ pkgconfig texinfo perl setupDebugInfoDirs ] - # TODO(@Ericson2314) not sure if should be host or target - ++ stdenv.lib.optional targetPlatform.isHurd mig; + nativeBuildInputs = [ pkgconfig texinfo perl setupDebugInfoDirs ]; buildInputs = [ ncurses readline gmp mpfr expat zlib guile ] ++ stdenv.lib.optional pythonSupport python - ++ stdenv.lib.optional targetPlatform.isHurd hurd ++ stdenv.lib.optional doCheck dejagnu; propagatedNativeBuildInputs = [ setupDebugInfoDirs ]; @@ -57,7 +48,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target"; configureFlags = with stdenv.lib; [ "--enable-targets=all" "--enable-64-bit-bfd" diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index 7e92df1a9978..e5ea17841aa6 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, hostPlatform, fetchurl }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "gnum4-1.4.18"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-syscmd-shell=${stdenv.shell}" ]; # Upstream is aware of it; it may be in the next release. - patches = [ ./s_isdir.patch ] ++ stdenv.lib.optional hostPlatform.isDarwin stdenv.secure-format-patch; + patches = [ ./s_isdir.patch ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin stdenv.secure-format-patch; meta = { homepage = http://www.gnu.org/software/m4/; diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index b786aa2123f6..7e2dc49fe0f2 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,4 +1,4 @@ -{ stdenv, hostPlatform, fetchurl, perl, gettext, LocaleGettext }: +{ stdenv, fetchurl, perl, gettext, LocaleGettext }: stdenv.mkDerivation rec { name = "help2man-1.47.6"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = false; # target `check' is missing - patches = if hostPlatform.isCygwin then [ ./1.40.4-cygwin-nls.patch ] else null; + patches = if stdenv.hostPlatform.isCygwin then [ ./1.40.4-cygwin-nls.patch ] else null; # We don't use makeWrapper here because it uses substitutions our # bootstrap shell can't handle. @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cat > $out/bin/help2man <<EOF #! $SHELL -e export PERL5LIB=\''${PERL5LIB:+:}$gettext_perl - ${stdenv.lib.optionalString hostPlatform.isCygwin + ${stdenv.lib.optionalString stdenv.hostPlatform.isCygwin "export PATH=\''${PATH:+:}${gettext}/bin"} exec -a \$0 $out/bin/.help2man-wrapped "\$@" EOF diff --git a/pkgs/development/tools/misc/iozone/default.nix b/pkgs/development/tools/misc/iozone/default.nix index 31d70d280e32..1d5da65df7e0 100644 --- a/pkgs/development/tools/misc/iozone/default.nix +++ b/pkgs/development/tools/misc/iozone/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, gnuplot }: let - target = if stdenv.system == "i686-linux" then + target = if stdenv.hostPlatform.system == "i686-linux" then "linux" - else if stdenv.system == "x86_64-linux" then + else if stdenv.hostPlatform.system == "x86_64-linux" then "linux-AMD64" - else if stdenv.system == "x86_64-darwin" then + else if stdenv.hostPlatform.system == "x86_64-darwin" then "macosx" - else if stdenv.system == "aarch64-linux" then + else if stdenv.hostPlatform.system == "aarch64-linux" then "linux-arm" - else throw "Platform ${stdenv.system} not yet supported."; + else throw "Platform ${stdenv.hostPlatform.system} not yet supported."; in stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/misc/kibana/5.x.nix b/pkgs/development/tools/misc/kibana/5.x.nix index 4aa9dc8b89a0..0529a2764924 100644 --- a/pkgs/development/tools/misc/kibana/5.x.nix +++ b/pkgs/development/tools/misc/kibana/5.x.nix @@ -6,7 +6,7 @@ let archOverrides = { "i686" = "x86"; }; - info = splitString "-" stdenv.system; + info = splitString "-" stdenv.hostPlatform.system; arch = (elemAt info 0); elasticArch = archOverrides."${arch}" or arch; plat = elemAt info 1; @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${elasticArch}.tar.gz"; - sha256 = shas."${stdenv.system}" or (throw "Unknown architecture"); + sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture"); }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix deleted file mode 100644 index 1fd52f435574..000000000000 --- a/pkgs/development/tools/misc/kibana/6.x.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ elk6Version -, enableUnfree ? true -, stdenv -, makeWrapper -, fetchzip -, fetchurl -, nodejs -, coreutils -, which -}: - -with stdenv.lib; -let - inherit (builtins) elemAt; - info = splitString "-" stdenv.system; - arch = elemAt info 0; - plat = elemAt info 1; - shas = - if enableUnfree - then { - "x86_64-linux" = "1kk97ggpzmblhqm6cfd2sv5940f58h323xcyg6rba1njj7lzanv0"; - "x86_64-darwin" = "1xvwffk8d8br92h0laf4b1m76kvki6cj0pbgcvirfcj1r70vk6c3"; - } - else { - "x86_64-linux" = "0m81ki1v61gpwb3s6zf84azqrirlm9pdfx65g3xmvdp3d3wii5ly"; - "x86_64-darwin" = "0zh9p6vsq1d0gh6ks7z6bh8sbhn6rm4jshjcfp3c9k7n2qa8vv9b"; - }; - - # For the correct phantomjs version see: - # https://github.com/elastic/kibana/blob/master/x-pack/plugins/reporting/server/browsers/phantom/paths.js - phantomjs = rec { - name = "phantomjs-${version}-linux-x86_64"; - version = "2.1.1"; - src = fetchzip { - inherit name; - url = "https://github.com/Medium/phantomjs/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "0g2dqjzr2daz6rkd6shj6rrlw55z4167vqh7bxadl8jl6jk7zbfv"; - }; - }; - -in stdenv.mkDerivation rec { - name = "kibana-${optionalString (!enableUnfree) "oss-"}${version}"; - version = elk6Version; - - src = fetchurl { - url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${arch}.tar.gz"; - sha256 = shas."${stdenv.system}" or (throw "Unknown architecture"); - }; - - buildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p $out/libexec/kibana $out/bin - mv * $out/libexec/kibana/ - rm -r $out/libexec/kibana/node - makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \ - --prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}" - sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana - '' + - # phantomjs is needed in the unfree version. When phantomjs doesn't exist in - # $out/libexec/kibana/data kibana will try to download and unpack it during - # runtime which will fail because the nix store is read-only. So we make sure - # it already exist in the nix store. - optionalString enableUnfree '' - ln -s ${phantomjs.src} $out/libexec/kibana/data/${phantomjs.name} - ''; - - meta = { - description = "Visualize logs and time-stamped data"; - homepage = http://www.elasticsearch.org/overview/kibana; - license = if enableUnfree then licenses.elastic else licenses.asl20; - maintainers = with maintainers; [ offline rickynils basvandijk ]; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix index fc1ac9323387..72321f560c7f 100644 --- a/pkgs/development/tools/misc/kibana/default.nix +++ b/pkgs/development/tools/misc/kibana/default.nix @@ -1,27 +1,50 @@ -{ stdenv, makeWrapper, fetchurl, nodejs, coreutils, which }: +{ elk6Version +, enableUnfree ? true +, stdenv +, makeWrapper +, fetchzip +, fetchurl +, nodejs +, coreutils +, which +}: with stdenv.lib; let inherit (builtins) elemAt; - archOverrides = { - "i686" = "x86"; - }; - info = splitString "-" stdenv.system; - arch = (elemAt info 0); - elasticArch = archOverrides."${arch}" or arch; + info = splitString "-" stdenv.hostPlatform.system; + arch = elemAt info 0; plat = elemAt info 1; - shas = { - "x86_64-linux" = "1wnnrhhpgc58s09p99cmi8r2jmwsd5lmh2inb0k8nmizz5v1sjz0"; - "i686-linux" = "0sdx59jlfrf7r9793xpn2vxaxjdczgn3qfw8yny03dcs6fjaxi2y"; - "x86_64-darwin" = "0rmp536kn001g52lxngpj6x6d0j3qj0r11d4djbz7h6s5ml03kza"; + shas = + if enableUnfree + then { + "x86_64-linux" = "1kk97ggpzmblhqm6cfd2sv5940f58h323xcyg6rba1njj7lzanv0"; + "x86_64-darwin" = "1xvwffk8d8br92h0laf4b1m76kvki6cj0pbgcvirfcj1r70vk6c3"; + } + else { + "x86_64-linux" = "0m81ki1v61gpwb3s6zf84azqrirlm9pdfx65g3xmvdp3d3wii5ly"; + "x86_64-darwin" = "0zh9p6vsq1d0gh6ks7z6bh8sbhn6rm4jshjcfp3c9k7n2qa8vv9b"; + }; + + # For the correct phantomjs version see: + # https://github.com/elastic/kibana/blob/master/x-pack/plugins/reporting/server/browsers/phantom/paths.js + phantomjs = rec { + name = "phantomjs-${version}-linux-x86_64"; + version = "2.1.1"; + src = fetchzip { + inherit name; + url = "https://github.com/Medium/phantomjs/releases/download/v${version}/${name}.tar.bz2"; + sha256 = "0g2dqjzr2daz6rkd6shj6rrlw55z4167vqh7bxadl8jl6jk7zbfv"; + }; }; + in stdenv.mkDerivation rec { - name = "kibana-${version}"; - version = "4.6.5"; + name = "kibana-${optionalString (!enableUnfree) "oss-"}${version}"; + version = elk6Version; src = fetchurl { - url = "https://download.elastic.co/kibana/kibana/${name}-${plat}-${elasticArch}.tar.gz"; - sha256 = shas."${stdenv.system}" or (throw "Unknown architecture"); + url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${arch}.tar.gz"; + sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture"); }; buildInputs = [ makeWrapper ]; @@ -33,13 +56,20 @@ in stdenv.mkDerivation rec { makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \ --prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}" sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana + '' + + # phantomjs is needed in the unfree version. When phantomjs doesn't exist in + # $out/libexec/kibana/data kibana will try to download and unpack it during + # runtime which will fail because the nix store is read-only. So we make sure + # it already exist in the nix store. + optionalString enableUnfree '' + ln -s ${phantomjs.src} $out/libexec/kibana/data/${phantomjs.name} ''; meta = { description = "Visualize logs and time-stamped data"; homepage = http://www.elasticsearch.org/overview/kibana; - license = licenses.asl20; - maintainers = with maintainers; [ offline rickynils ]; + license = if enableUnfree then licenses.elastic else licenses.asl20; + maintainers = with maintainers; [ offline rickynils basvandijk ]; platforms = with platforms; unix; }; } diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index d1d35d9a4824..bd7f62a7bcd2 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -1,5 +1,4 @@ { stdenv, fetchurl, m4, perl, help2man -, buildPlatform, hostPlatform }: stdenv.mkDerivation rec { @@ -26,7 +25,7 @@ stdenv.mkDerivation rec { # Don't run the native `strip' when cross-compiling. This breaks at least # with `.a' files for MinGW. - dontStrip = hostPlatform != buildPlatform; + dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; meta = { description = "GNU Libtool, a generic library support script"; diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index 005fb09fba09..28c2660ac3d7 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, buildPackages, ncurses }: -let dialect = with stdenv.lib; last (splitString "-" stdenv.system); in +let dialect = with stdenv.lib; last (splitString "-" stdenv.hostPlatform.system); in stdenv.mkDerivation rec { name = "lsof-${version}"; diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index a8183aa4ba08..c89492287db4 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; src = - if stdenv.system == "i686-linux" then + if stdenv.hostPlatform.system == "i686-linux" then fetchurl { name = "saleae-logic-${version}-32bit.zip"; url = "http://downloads.saleae.com/logic/${version}/Logic%20${version}%20(32-bit).zip"; sha256 = "1dyrj07cgj2fvwi1sk97vady9ri8f8n7mxy9zyzmw9isngs7bmll"; } - else if stdenv.system == "x86_64-linux" then + else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { name = "saleae-logic-${version}-64bit.zip"; url = "http://downloads.saleae.com/logic/${version}/Logic%20${version}%20(64-bit).zip"; diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 1e449d722c35..33a46e16a3ab 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional libunwind.supportsHost libunwind; # support -k - configureFlags = stdenv.lib.optional (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV) "--enable-mpers=check"; + configureFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86) "--enable-mpers=check"; # fails 1 out of 523 tests with # "strace-k.test: failed test: ../../strace -e getpid -k ../stack-fcall output mismatch" diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index 0059c10afe0c..831a9ec62780 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "tokei-${version}"; - version = "7.0.3"; + version = "8.0.0"; src = fetchFromGitHub { owner = "Aaronepower"; repo = "tokei"; rev = "v${version}"; - sha256 = "1n2ddwmyd414p6a98khq8y0bmljwcclw30wy5zy5b6z1l40yxcza"; + sha256 = "1sfwmjlvjrd8r0ynnayw7g3514mfiky2j30byphaagdw4jkxbd7c"; }; - cargoSha256 = "0ngqk8nnw00s25y91vgsl37j26xl2ws75l3lvklf9gbd4bi01crv"; + cargoSha256 = "0v29gych757h7vv5jsg7rpl705gpqn0ya8ai53582qd2cc6yz4c3"; meta = with stdenv.lib; { description = "Count code, quickly"; diff --git a/pkgs/development/tools/misc/travis/Gemfile b/pkgs/development/tools/misc/travis/Gemfile index 788341de3fa6..9b1967e6b9b6 100644 --- a/pkgs/development/tools/misc/travis/Gemfile +++ b/pkgs/development/tools/misc/travis/Gemfile @@ -1,3 +1,3 @@ source "https://rubygems.org" -gem "travis", "1.8.8" +gem "travis", "1.8.9" diff --git a/pkgs/development/tools/misc/travis/Gemfile.lock b/pkgs/development/tools/misc/travis/Gemfile.lock index a1c8332a3d44..3dc948a7cd89 100644 --- a/pkgs/development/tools/misc/travis/Gemfile.lock +++ b/pkgs/development/tools/misc/travis/Gemfile.lock @@ -2,14 +2,14 @@ GEM remote: https://rubygems.org/ specs: addressable (2.4.0) - backports (3.6.8) - ethon (0.10.1) + backports (3.11.4) + ethon (0.11.0) ffi (>= 1.3.0) - faraday (0.11.0) + faraday (0.15.2) multipart-post (>= 1.2, < 3) - faraday_middleware (0.11.0.1) + faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) - ffi (1.9.18) + ffi (1.9.25) gh (0.15.1) addressable (~> 2.4.0) backports @@ -17,18 +17,18 @@ GEM multi_json (~> 1.0) net-http-persistent (~> 2.9) net-http-pipeline - highline (1.7.8) - json (2.0.3) + highline (1.7.10) + json (2.1.0) launchy (2.4.3) addressable (~> 2.3) - multi_json (1.12.1) + multi_json (1.13.1) multipart-post (2.0.0) net-http-persistent (2.9.4) net-http-pipeline (1.0.1) pusher-client (0.6.2) json websocket (~> 1.0) - travis (1.8.8) + travis (1.8.9) backports faraday (~> 0.9) faraday_middleware (~> 0.9, >= 0.9.1) @@ -39,13 +39,13 @@ GEM typhoeus (~> 0.6, >= 0.6.8) typhoeus (0.8.0) ethon (>= 0.8.0) - websocket (1.2.4) + websocket (1.2.8) PLATFORMS ruby DEPENDENCIES - travis (= 1.8.8) + travis (= 1.8.9) BUNDLED WITH 1.14.6 diff --git a/pkgs/development/tools/misc/travis/gemset.nix b/pkgs/development/tools/misc/travis/gemset.nix index c9a54bd324c2..2ca55dbdee3e 100644 --- a/pkgs/development/tools/misc/travis/gemset.nix +++ b/pkgs/development/tools/misc/travis/gemset.nix @@ -10,45 +10,45 @@ backports = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1zcgqw7m7jb8n7b2jwla5cq0nw9wsgddxfmn0a9v89ihzd4i1a5k"; + sha256 = "1hshjxww2h7s0dk57njrygq4zpp0nlqrjfya7zwm27iq3rhc3y8g"; type = "gem"; }; - version = "3.6.8"; + version = "3.11.4"; }; ethon = { dependencies = ["ffi"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i873cvma4j52xmij7kasjylh66vf60cy5prkp4cz4hcn9jlkznl"; + sha256 = "0y70szwm2p0b9qfvpqrzjrgm3jz0ig65vlbfr6ppc3z0m1h7kv48"; type = "gem"; }; - version = "0.10.1"; + version = "0.11.0"; }; faraday = { dependencies = ["multipart-post"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "18p1csdivgwmshfw3mb698a3bn0yrykg30khk5qxjf6n168g91jr"; + sha256 = "14lg0c4bphk16rccc5jmaan6nfcvmy0caiahpc61f9zfwpsj7ymg"; type = "gem"; }; - version = "0.11.0"; + version = "0.15.2"; }; faraday_middleware = { dependencies = ["faraday"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bcarc90brm1y68bl957w483bddsy9idj2gghqnysk6bbxpsvm00"; + sha256 = "1p7icfl28nvl8qqdsngryz1snqic9l8x6bk0dxd7ygn230y0k41d"; type = "gem"; }; - version = "0.11.0.1"; + version = "0.12.2"; }; ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0"; + sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q"; type = "gem"; }; - version = "1.9.18"; + version = "1.9.25"; }; gh = { dependencies = ["addressable" "backports" "faraday" "multi_json" "net-http-persistent" "net-http-pipeline"]; @@ -62,18 +62,18 @@ highline = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr"; + sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y"; type = "gem"; }; - version = "1.7.8"; + version = "1.7.10"; }; json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0cpw154il64w6q20rrnsbjx1cdfz1yrzz1lgdbpn59lcwc6mprql"; + sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; type = "gem"; }; - version = "2.0.3"; + version = "2.1.0"; }; launchy = { dependencies = ["addressable"]; @@ -87,10 +87,10 @@ multi_json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk"; + sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; type = "gem"; }; - version = "1.12.1"; + version = "1.13.1"; }; multipart-post = { source = { @@ -129,10 +129,10 @@ dependencies = ["backports" "faraday" "faraday_middleware" "gh" "highline" "launchy" "pusher-client" "typhoeus"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "02bjz73f6r9b7nskwzcvcbr4hlvgwrf9rnr6d218d2i1rk4ww936"; + sha256 = "0lw206zr2waic1kmm6x9qj91975g035wfsvbqs09z1cy8cvp63yw"; type = "gem"; }; - version = "1.8.8"; + version = "1.8.9"; }; typhoeus = { dependencies = ["ethon"]; @@ -146,9 +146,9 @@ websocket = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1shymfaw14p8jdi74nwz4nsgc9cmpli166lkp5g5wbhjmhmpvrnh"; + sha256 = "0f11rcn4qgffb1rq4kjfwi7di79w8840x9l74pkyif5arp0mb08x"; type = "gem"; }; - version = "1.2.4"; + version = "1.2.8"; }; } \ No newline at end of file diff --git a/pkgs/development/tools/neoload/default.nix b/pkgs/development/tools/neoload/default.nix index c68c29f86dea..06945f10eb23 100644 --- a/pkgs/development/tools/neoload/default.nix +++ b/pkgs/development/tools/neoload/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { name = "neoload-4.1.4"; src = fetchurl ( - if stdenv.system == "x86_64-linux" then + if stdenv.hostPlatform.system == "x86_64-linux" then { url = http://neoload.installers.neotys.com/documents/download/neoload/v4.1/neoload_4_1_4_linux_x64.sh; sha256 = "199jcf5a0nwfm8wfld2rcjgq64g91vvz2bkmki8dxfzf1yasifcd"; } else diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index df7630e2d16f..099e31b8d62d 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -3,7 +3,7 @@ , gdk_pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap , libnotify}: let - bits = if stdenv.system == "x86_64-linux" then "x64" + bits = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" else "ia32"; nwEnv = buildEnv { diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index 90c377c4472f..bd0c7f5002c3 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -7,7 +7,7 @@ , sqlite, udev }: let - bits = if stdenv.system == "x86_64-linux" then "x64" + bits = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" else "ia32"; nwEnv = buildEnv { diff --git a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix index 84365889638c..4d7900de80d2 100644 --- a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix +++ b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix @@ -4,6 +4,11 @@ let version = "0.9.8.6-0.rc1"; webpage = "http://omake.metaprl.org"; in + +if stdenv.lib.versionAtLeast ocaml.version "4.06" +then throw "${pname}-${version} is not available for OCaml ${ocaml.version}" +else + stdenv.mkDerivation { name = "${pname}-${version}"; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index ae624c549eb1..851c6f01b20f 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "packer-${version}"; - version = "1.2.4"; + version = "1.2.5"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "06prn2mq199476zlxi5hxk5yn21mqzbqk8v0fy8s6h91g8h6205n"; + sha256 = "0wbf0iqfqphwy2snspf34j16ar4ghk0f1zsw8n8vj8gviiivlr7p"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/packet/default.nix b/pkgs/development/tools/packet/default.nix index eb1a48d24b84..4c30d000ce20 100644 --- a/pkgs/development/tools/packet/default.nix +++ b/pkgs/development/tools/packet/default.nix @@ -1,18 +1,16 @@ -# This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchFromGitHub }: +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "packet-${version}"; - version = "20161215-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "2b8f07ae2246e1a96e007233419867fa0d6747f9"; + version = "v2.2.2"; goPackagePath = "github.com/ebsarr/packet"; - src = fetchFromGitHub { - inherit rev; - owner = "ebsarr"; - repo = "packet"; - sha256 = "1wchrm96ly5m1rcy9d51fs3xjswh746r27hgc410rksiahanzhff"; + src = fetchgit { + rev = version; + url = "https://github.com/ebsarr/packet"; + sha256 = "18n8f2rlab4icb28k1b9gnh30zy382v792x07fmcdqq4nkw6wvwf"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/packet/deps.nix b/pkgs/development/tools/packet/deps.nix index 0c7fee1a11af..53a9bef73207 100644 --- a/pkgs/development/tools/packet/deps.nix +++ b/pkgs/development/tools/packet/deps.nix @@ -1,12 +1,21 @@ -# This file was generated by go2nix. +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 [ { goPackagePath = "github.com/cpuguy83/go-md2man"; fetch = { type = "git"; url = "https://github.com/cpuguy83/go-md2man"; - rev = "a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa"; - sha256 = "1rm3zjrmfpzy0l3qp02xmd5pqzl77pdql9pbxhl0k1qw2vfzrjv6"; + rev = "691ee98543af2f262f35fbb54bdd42f00b9b9cc5"; + sha256 = "1864g10y9n6ni0p1yqjhvwyjdh0lgxnf7dlb0c4njazdg5rppww9"; + }; + } + { + goPackagePath = "github.com/ebsarr/packngo"; + fetch = { + type = "git"; + url = "https://github.com/ebsarr/packngo"; + rev = "bc067ae8c334d03f246fd5537dac6d4ed4192ada"; + sha256 = "1q7w8pdw87ifmkpcayk5qri4lb81bh82jrzh3fdmnbldwmjynyj2"; }; } { @@ -14,8 +23,8 @@ fetch = { type = "git"; url = "https://github.com/fsnotify/fsnotify"; - rev = "fd9ec7deca8bf46ecd2a795baaacf2b3a9be1197"; - sha256 = "0jf7zmkypfl6v24xxnv12w55384diyabfp2m7ibafgafljwlg3ls"; + rev = "ccc981bf80385c528a65fbfdd49bf2d8da22aa23"; + sha256 = "0hcrfmiyx27izac3v0ii0qq2kfjvhr9ma1i79hrl6a6y2ayagzz7"; }; } { @@ -23,8 +32,8 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/hcl"; - rev = "eb6f65b2d77ed5078887f960ff570fbddbbeb49d"; - sha256 = "1wx6hpxmq5sby54025j9hliz10gv5v0bq6q1z2cd0asznj154ij1"; + rev = "8cb6e5b959231cc1119e43259c4a608f9c51a241"; + sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; }; } { @@ -32,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/magiconair/properties"; - rev = "b3b15ef068fd0b17ddf408a23669f20811d194d2"; - sha256 = "0m6jvlsi4bcnrfb4mas54wxp80d4ls209vhanvv20zgpy4y7qdsh"; + rev = "c2353362d570a7bfa228149c62842019201cfb71"; + sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; }; } { @@ -41,8 +50,8 @@ fetch = { type = "git"; url = "https://github.com/mitchellh/mapstructure"; - rev = "bfdb1a85537d60bc7e954e600c250219ea497417"; - sha256 = "141kkh801jyp1r6hba14krydqg1iivp13j12is70j0g05z9fbji8"; + rev = "fa473d140ef3c6adf42d6b391fe76707f1f243c8"; + sha256 = "0f06q4fpzg0c370cvmpsl0iq2apl5nkbz5cd3nba5x5ysmshv1lm"; }; } { @@ -50,17 +59,8 @@ fetch = { type = "git"; url = "https://github.com/packethost/packngo"; - rev = "91a3a4f65e3cd6ee66d919b4e7103ae038ce66ff"; - sha256 = "0v032qv9jjvv67fm2jl20pk4f46pymj688b6j0i42kpgmc9zxanz"; - }; - } - { - goPackagePath = "github.com/pelletier/go-buffruneio"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-buffruneio"; - rev = "df1e16fde7fc330a0ca68167c23bf7ed6ac31d6d"; - sha256 = "0jwn2g4jfdb3wvpqisd8h055099pwx6c5i3bb4zxk5l9vybg1c5f"; + rev = "2100ba98e6dc4ca18563d91edfdbba3c4bf46ddb"; + sha256 = "03iav4lxiir9dphygh5jgqvygs59ci80yfqws34vzy47pxb1wsc8"; }; } { @@ -68,8 +68,8 @@ fetch = { type = "git"; url = "https://github.com/pelletier/go-toml"; - rev = "a1f048ba24490f9b0674a67e1ce995d685cddf4a"; - sha256 = "09fb872v64bvjgzp3a926ic5hm08pzy0i53j02yb93v38g4ihdv3"; + rev = "c2dbbc24a97911339e01bda0b8cabdbd8f13b602"; + sha256 = "0v1dsqnk5zmn6ir8jgxijx14s47jvijlqfz3aq435snfrgybd5rz"; }; } { @@ -77,8 +77,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/afero"; - rev = "72b31426848c6ef12a7a8e216708cb0d1530f074"; - sha256 = "0sbmpv1zxxl32nsv76bp3n3zp08in2yz4fv02mjzaws9rk97yfj8"; + rev = "787d034dfe70e44075ccc060d346146ef53270ad"; + sha256 = "0138rjiacl71h7kvhzinviwvy6qa2m6rflpv9lgqv15hnjvhwvg1"; }; } { @@ -86,8 +86,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/cast"; - rev = "56a7ecbeb18dde53c6db4bd96b541fd9741b8d44"; - sha256 = "16fj6ghk7wykcfh3ka4iyhl1s11briawrvscncb6l64dv794w2cr"; + rev = "8965335b8c7107321228e3e3702cab9832751bac"; + sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2"; }; } { @@ -95,8 +95,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/cobra"; - rev = "1dd5ff2e11b6dca62fdcb275eb804b94607d8b06"; - sha256 = "0whzk9yz0yby9vag9m7hk4n1kwa07qcgi6wizvw20j0y30d31hgx"; + rev = "99dc123558852f67743bd0b2caf8383cb3c6d720"; + sha256 = "0b2rjgycgpkpvpsqgvilqkr66bfk477lyd6l0jxmgxb1h0za5s25"; }; } { @@ -104,8 +104,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/jwalterweatherman"; - rev = "fa7ca7e836cf3a8bb4ebf799f472c12d7e903d66"; - sha256 = "0404b7bzx7cq1b2bgdb3gs7gjzm4vvg1hl2y9mcm4m6vz56vbcz8"; + rev = "14d3d4c518341bea657dd8a226f5121c0ff8c9f2"; + sha256 = "1f9154lijbz0kkgqwmbphykwl4adv4fvkx6n1p7fdq3x5j9g8i17"; }; } { @@ -113,8 +113,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/pflag"; - rev = "51268031d79952516489a9f8aa34e9709b98d946"; - sha256 = "04qkkm2gjklh66hx3zj4jm6v0bdxvyq6rchs4r0k87aba7syw008"; + rev = "298182f68c66c05229eb03ac171abe6e309ee79a"; + sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; }; } { @@ -122,8 +122,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/viper"; - rev = "5ed0fc31f7f453625df314d8e66b9791e8d13003"; - sha256 = "16j2lly6rv60hc7mpbmda9vp1vs1qhig9kjgf6mss7n6my40s3ga"; + rev = "0ac2068de99fd349edc4954d0e9b4a600d75da44"; + sha256 = "1h33gm0m0d4mrwf097v2mpwjza1zmmkqy67a51jjdcrqx1zys8gj"; }; } { @@ -131,8 +131,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "d75a52659825e75fff6158388dddc6a5b04f9ba5"; - sha256 = "0zbv11kq5d8dxiddd4kzr785gbwb7x8d7lq4rqs5s7s43h0pl3x7"; + rev = "fa5fdf94c78965f1aa8423f0cc50b8b8d728b05a"; + sha256 = "1wrf7y6a1ar1r8yd88zlmic55alx91k5nqks7f8w1d5j7hp1if35"; }; } { @@ -140,8 +140,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "11dbc599981ccdf4fb18802a28392a8bcf7a9395"; - sha256 = "139hlf5xr5ggy48dbrfya3ajy7q3z3y6p6lrvkvl6m5wxfapa9hj"; + rev = "6e3c4e7365ddcc329f090f96e4348398f6310088"; + sha256 = "1r511ncipn7sdlssn06fpzcpy4mp4spagni4ryxq86p2b0bi8pn4"; }; } { @@ -149,8 +149,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "a5b47d31c556af34a302ce5d659e6fea44d90de0"; - sha256 = "0v6l48fshdjrqzyq1kwn22gy7vy434xdr1i0lm3prsf6jbln9fam"; + rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; }; } ] diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix index 51a83760be39..43fdeff9090b 100644 --- a/pkgs/development/tools/phantomjs/default.nix +++ b/pkgs/development/tools/phantomjs/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { # because it has bundled a lot of external libraries (like QT and Webkit) # and no easy/nice way to use the system versions of these - src = if stdenv.system == "i686-linux" then + src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-linux-i686.tar.bz2"; sha256 = "11fzmssz9pqf3arh4f36w06sl2nyz8l9h8iyxyd7w5aqnq5la0j1"; } else - if stdenv.system == "x86_64-linux" then + if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-linux-x86_64.tar.bz2"; sha256 = "0fhnqxxsxhy125fmif1lwgnlhfx908spy7fx9mng4w72320n5nd1"; diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index aeeae494e586..68df0af6ee46 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -1,6 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper, llvmPackages }: - -# Future work: Automatically communicate NIX_CFLAGS_COMPILE to bindgen's tests and the bindgen executable itself. +{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin }: rustPlatform.buildRustPackage rec { name = "rust-bindgen-${version}"; @@ -13,23 +11,54 @@ rustPlatform.buildRustPackage rec { sha256 = "0cqjr7qspjrfgqcp4nqxljmhhbqyijb2jpw3lajgjj48y6wrnw93"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ llvmPackages.clang-unwrapped.lib ]; + cargoSha256 = "0b8v6c7q1abibzygrigldpd31lyd5ngmj4vq5d7zni96m20mm85w"; + + libclang = llvmPackages.libclang.lib; #for substituteAll + + buildInputs = [ libclang ]; + + propagatedBuildInputs = [ clang ]; # to populate NIX_CXXSTDLIB_COMPILE + + patches = [ + # https://github.com/rust-lang-nursery/rust-bindgen/pull/1376 + (fetchpatch { + url = https://github.com/rust-lang-nursery/rust-bindgen/commit/c8b5406f08af82a92bf8faf852c21ba941d9c176.patch; + sha256 = "16ibr2rplh0qz8rsq6gir45xlz5nasad4y8fprwhrb7ssv8wfkss"; + }) + ]; configurePhase = '' - export LIBCLANG_PATH="${llvmPackages.clang-unwrapped.lib}/lib" + export LIBCLANG_PATH="${libclang}/lib" ''; postInstall = '' - wrapProgram $out/bin/bindgen --set LIBCLANG_PATH "${llvmPackages.clang-unwrapped.lib}/lib" + mv $out/bin/{bindgen,.bindgen-wrapped}; + substituteAll ${./wrapper.sh} $out/bin/bindgen + chmod +x $out/bin/bindgen ''; - cargoSha256 = "0b8v6c7q1abibzygrigldpd31lyd5ngmj4vq5d7zni96m20mm85w"; - - doCheck = false; # A test fails because it can't find standard headers in NixOS + doCheck = false; # half the tests fail because our rustfmt is not nightly enough + checkInputs = + let fakeRustup = writeScriptBin "rustup" '' + #!${stdenv.shell} + shift + shift + exec "$@" + ''; + in [ + rustfmt + fakeRustup # the test suite insists in calling `rustup run nightly rustfmt` + clang + ]; meta = with stdenv.lib; { description = "C and C++ binding generator"; + longDescription = '' + Bindgen takes a c or c++ header file and turns them into + rust ffi declarations. + As with most compiler related software, this will only work + inside a nix-shell with the required libraries as buildInputs. + ''; homepage = https://github.com/rust-lang-nursery/rust-bindgen; license = with licenses; [ bsd3 ]; maintainers = [ maintainers.ralith ]; diff --git a/pkgs/development/tools/rust/bindgen/wrapper.sh b/pkgs/development/tools/rust/bindgen/wrapper.sh new file mode 100755 index 000000000000..95cd0901cec8 --- /dev/null +++ b/pkgs/development/tools/rust/bindgen/wrapper.sh @@ -0,0 +1,36 @@ +#!/usr/bin/env bash +sep='--' # whether to add -- before new options +cxx=0 # whether cxx was explicitly requested +lastWasx=0 # whether the last argument passed was -x +for e in "$@"; do + if [[ "$e" == "--" ]]; then + sep= + fi; + if [[ "$sep" == "" ]]; then + # we look for -x c++ after -- only + if [[ "$e" == "-x" ]]; then + lastWasx=1 + fi; + if [[ $lastWasx -eq 1 && "$e" == "c++" ]]; then + lastWasx=0 + cxx=1 + fi; + if [[ "$e" == "-xc++" || "$e" == -std=c++* ]]; then + cxx=1 + fi; + fi; +done; +cxxflags= +if [[ $cxx -eq 1 ]]; then + cxxflags=$NIX_CXXSTDLIB_COMPILE +fi; +if [[ -n "$NIX_DEBUG" ]]; then + set -x; +fi; +export LIBCLANG_PATH="@libclang@/lib" +# shellcheck disable=SC2086 +# cxxflags and NIX_CFLAGS_COMPILE should be word-split +exec -a "$0" @out@/bin/.bindgen-wrapped "$@" $sep $cxxflags $NIX_CFLAGS_COMPILE +# note that we add the flags after $@ which is incorrect. This is only for the sake +# of simplicity. + diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index fe32f7c24506..50e2bd8dad84 100644 --- a/pkgs/development/tools/sauce-connect/default.nix +++ b/pkgs/development/tools/sauce-connect/default.nix @@ -4,18 +4,18 @@ with lib; stdenv.mkDerivation rec { name = "sauce-connect-${version}"; - version = "4.4.12"; + version = "4.5.1"; src = fetchurl ( - if stdenv.system == "x86_64-linux" then { + if stdenv.hostPlatform.system == "x86_64-linux" then { url = "https://saucelabs.com/downloads/sc-${version}-linux.tar.gz"; - sha256 = "1yqvx64bgiq27hdhwkzgmzyib8pbjn1idpq6783srxq64asf6iyw"; - } else if stdenv.system == "i686-linux" then { + sha256 = "0lpfvlax7k8r65bh01i3kzrlmx0vnm9vhhir8k1gp2f4rv6z4lyx"; + } else if stdenv.hostPlatform.system == "i686-linux" then { url = "https://saucelabs.com/downloads/sc-${version}-linux32.tar.gz"; - sha256 = "02kib56lv4lhwkj5r15484lvvbyjvf9ydi5vccsmxgsxrzmddnl6"; + sha256 = "1h9n1mzmrmlrbd0921b0sgg7m8z0w71pdb5sif6h1b9f97cp353x"; } else { url = "https://saucelabs.com/downloads/sc-${version}-osx.zip"; - sha256 = "1gqsbw9f6nachk3c86knbqq417smqyf19mi63fmrfxrbxzy2fkv2"; + sha256 = "0rkyd402f1n92ad3w1460j1a4m46b29nandv4z6wvg2pasyyf2lj"; } ); diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 238c3bc704d0..abbd2a9116ca 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -15,8 +15,8 @@ let }; }; - spec = allSpecs."${stdenv.system}" - or (throw "missing chromedriver binary for ${stdenv.system}"); + spec = allSpecs."${stdenv.hostPlatform.system}" + or (throw "missing chromedriver binary for ${stdenv.hostPlatform.system}"); libs = stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index fe75c9fd2085..f247a20b1b27 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -38,6 +38,7 @@ in buildRubyGem rec { patches = [ ./unofficial-installation-nowarn.patch + ./use-system-bundler-version.patch ]; # PATH additions: diff --git a/pkgs/development/tools/vagrant/use-system-bundler-version.patch b/pkgs/development/tools/vagrant/use-system-bundler-version.patch new file mode 100644 index 000000000000..c386acf4a1c7 --- /dev/null +++ b/pkgs/development/tools/vagrant/use-system-bundler-version.patch @@ -0,0 +1,13 @@ +diff --git i/lib/vagrant/bundler.rb w/lib/vagrant/bundler.rb +index 301e40e37..e361ab510 100644 +--- i/lib/vagrant/bundler.rb ++++ w/lib/vagrant/bundler.rb +@@ -217,7 +217,7 @@ module Vagrant + source_list = {} + system_plugins = plugins.map do |plugin_name, plugin_info| + plugin_name if plugin_info["system"] +- end.compact ++ end.compact << "bundler" + installer_set = VagrantSet.new(:both) + installer_set.system_plugins = system_plugins + diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix new file mode 100644 index 000000000000..26347d4b2782 --- /dev/null +++ b/pkgs/development/tools/wabt/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, cmake, python3 }: + +stdenv.mkDerivation rec { + name = "wabt-${version}"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "WebAssembly"; + repo = "wabt"; + rev = version; + sha256 = "1cbak3ach7cna98j2r0v3y38c59ih2gv0p6f43qp782pyj07hzfy"; + }; + + nativeBuildInputs = [ cmake ]; + cmakeFlags = [ "-DBUILD_TESTS=OFF" ]; + buildInputs = [ python3 ]; + + meta = with stdenv.lib; { + description = "The WebAssembly Binary Toolkit"; + longDescription = '' + WABT (we pronounce it "wabbit") is a suite of tools for WebAssembly, + including: + * wat2wasm: translate from WebAssembly text format to the WebAssembly + binary format + * wasm2wat: the inverse of wat2wasm, translate from the binary format + back to the text format (also known as a .wat) + * wasm-objdump: print information about a wasm binary. Similiar to + objdump. + * wasm-interp: decode and run a WebAssembly binary file using a + stack-based interpreter + * wat-desugar: parse .wat text form as supported by the spec interpreter + (s-expressions, flat syntax, or mixed) and print "canonical" flat + format + * wasm2c: convert a WebAssembly binary file to a C source and header + ''; + homepage = https://github.com/WebAssembly/wabt; + license = licenses.asl20; + maintainers = with maintainers; [ ekleog ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index 4aa08f994576..b2455095a01a 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -1,9 +1,8 @@ { stdenv, lib, buildPackages, makeWrapper, writeText, runCommand , CoreServices, ImageIO, CoreGraphics -, targetPlatform -, xcodePlatform ? targetPlatform.xcodePlatform or "MacOSX" -, xcodeVer ? targetPlatform.xcodeVer or "9.4.1" -, sdkVer ? targetPlatform.sdkVer or "10.10" }: +, xcodePlatform ? stdenv.targetPlatform.xcodePlatform or "MacOSX" +, xcodeVer ? stdenv.targetPlatform.xcodeVer or "9.4.1" +, sdkVer ? stdenv.targetPlatform.sdkVer or "10.10" }: let |