diff options
Diffstat (limited to 'pkgs/development/tools')
6 files changed, 62 insertions, 15 deletions
diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index d4edbf44a798..4bd95a8d745a 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -5,12 +5,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "ammonite-${version}"; - version = "1.6.8"; + version = "1.6.9"; scalaVersion = "2.12"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; - sha256 = "1lqc071v5f8dy1da669l0bfw9p8l6yavzlizzig9m441zcrmbj5d"; + sha256 = "1fi5j0kcndq00x72d8bkx6qiy9nh2i6c6m29gzfqql52qgbq1fd0"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix new file mode 100644 index 000000000000..47af70b37029 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -0,0 +1,37 @@ +{ buildGoModule, fetchFromGitHub, lib, writeText }: + +buildGoModule rec { + pname = "fly"; + version = "5.3.0"; + + src = fetchFromGitHub { + owner = "concourse"; + repo = "concourse"; + rev = "v${version}"; + sha256 = "06ns98k47nafhkkj7gkmxp7msn4ssypyss6ll0fm6380vq2cavnj"; + }; + + modSha256 = "11rnlmn5hp9nsgkmd716dsjmkr273035j9gzfhjxjsfpiax60i0a"; + + subPackages = [ "fly" ]; + + buildFlagsArray = '' + -ldflags= + -X github.com/concourse/concourse.Version=${version} + ''; + + # The fly.bash file included with this derivation can be replaced by a + # call to `fly completion bash` once the `completion` subcommand has + # made it into a release. Similarly, `fly completion zsh` will provide + # zsh completions. https://github.com/concourse/concourse/pull/4012 + postInstall = '' + install -D -m 444 ${./fly.bash} $out/share/bash-completion/completions/fly + ''; + + meta = with lib; { + description = "A command line interface to Concourse CI"; + homepage = https://concourse-ci.org; + license = licenses.asl20; + maintainers = with maintainers; [ ivanbrennan ]; + }; +} diff --git a/pkgs/development/tools/continuous-integration/fly/fly.bash b/pkgs/development/tools/continuous-integration/fly/fly.bash new file mode 100644 index 000000000000..a9acc5f70a40 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/fly/fly.bash @@ -0,0 +1,10 @@ +# credits: +# https://godoc.org/github.com/jessevdk/go-flags#hdr-Completion +# https://github.com/concourse/concourse/issues/1309#issuecomment-452893900 +_fly_compl() { + args=("${COMP_WORDS[@]:1:$COMP_CWORD}") + local IFS=$'\n' + COMPREPLY=($(GO_FLAGS_COMPLETION=1 ${COMP_WORDS[0]} "${args[@]}")) + return 0 +} +complete -F _fly_compl fly diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix index cb00111b2b46..19ed711f1f4c 100644 --- a/pkgs/development/tools/misc/babeltrace/default.nix +++ b/pkgs/development/tools/misc/babeltrace/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, libuuid, popt, elfutils }: stdenv.mkDerivation rec { - name = "babeltrace-1.5.6"; + name = "babeltrace-1.5.7"; src = fetchurl { url = "https://www.efficios.com/files/babeltrace/${name}.tar.bz2"; - sha256 = "1dxv2pwyqx2p7kzhcfansij40m9kanl85x2r68dmgp98g0hvq22k"; + sha256 = "0yw05cnk5w8b5nbznycglyn4h3hq56a1n8rlb9k9rlzz4ph32lr1"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index 3b176541f517..67acf874baff 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "merlin"; - version = "3.3.1"; + version = "3.3.2"; minimumOCamlVersion = "4.02.1"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "ocaml"; repo = pname; rev = "v${version}"; - sha256 = "1z2m6jykgn3nylh4bfirhxlb0bwamifv4fgml6j34ggk1drs8xrl"; + sha256 = "1z9mcxflraj15sbz6q7f84n31n9fsialw7z8bi3r1biz68nypva9"; }; buildInputs = [ yojson ]; diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index f844b369eb32..452f162b2356 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -7,7 +7,7 @@ assert lib.versionAtLeast ocaml.version "4.02.3"; let srcs = { cmdliner = fetchurl { - url = "https://erratique.ch/software/cmdliner/releases/cmdliner-1.0.2.tbz"; + url = "http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.2.tbz"; sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1"; }; cppo = fetchurl { @@ -23,16 +23,16 @@ let sha256 = "00yvyfm4j423zqndvgc1ycnmiffaa2l9ab40cyg23pf51qmzk2jm"; }; dune-local = fetchurl { - url = "https://github.com/ocaml/dune/releases/download/1.2.1/dune-1.2.1.tbz"; - sha256 = "00c5dbm4hkdapc2i7pg07b2lj8sv6ly38qr7zid58cdmbmzq21z9"; + url = "https://github.com/ocaml/dune/releases/download/1.6.3/dune-1.6.3.tbz"; + sha256 = "0dmf0wbfmgdy5plz1bjiisc2hjgblvxsnrqjmw2c8y45v1h23mdz"; }; extlib = fetchurl { url = "http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.5.tar.gz"; sha256 = "19slqf5bdj0rrph2w41giwmn6df2qm07942jn058pjkjrnk30d4s"; }; mccs = fetchurl { - url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+9.tar.gz"; - sha256 = "0gf86c65jdxxcwd96kcmrqxrmnnzc0570gb9ad6c57rl3fyy8yhv"; + url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+10.tar.gz"; + sha256 = "003kam22plnh88liyxi4d1065j2rys1mpdla20rxps53ah1xwmxg"; }; ocamlgraph = fetchurl { url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.8.tar.gz"; @@ -55,13 +55,13 @@ let sha256 = "02lb2d9i12bxrz2ba5wygk2bycan316skqlyri0597q7j9210g8r"; }; opam = fetchurl { - url = "https://github.com/ocaml/opam/archive/2.0.4.zip"; - sha256 = "1312nc9s4h0vksiimz7jsv3zw17fa05p6mdx23s5sii0qspvnx8c"; + url = "https://github.com/ocaml/opam/archive/2.0.5.zip"; + sha256 = "0arv5zaikvcqbicdk47jpfgvjrqhqm71yq2zmj7pp6zf7bm0js6s"; }; }; in stdenv.mkDerivation rec { name = "opam-${version}"; - version = "2.0.4"; + version = "2.0.5"; buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap; @@ -117,4 +117,4 @@ in stdenv.mkDerivation rec { platforms = platforms.all; }; } -# Generated by: ./opam.nix.pl -v 2.0.4 -p opam-shebangs.patch +# Generated by: ./opam.nix.pl -v 2.0.5 -p opam-shebangs.patch |