diff options
Diffstat (limited to 'pkgs/development')
22 files changed, 696 insertions, 44 deletions
diff --git a/pkgs/development/compilers/julia/shared.nix b/pkgs/development/compilers/julia/shared.nix index e07c2c04b92d..70ff40cd7ec5 100644 --- a/pkgs/development/compilers/julia/shared.nix +++ b/pkgs/development/compilers/julia/shared.nix @@ -104,6 +104,7 @@ stdenv.mkDerivation rec { touch test/$i.jl done rm stdlib/Sockets/test/runtests.jl && touch stdlib/Sockets/test/runtests.jl + rm stdlib/Distributed/test/runtests.jl && touch stdlib/Distributed/test/runtests.jl sed -e 's/Invalid Content-Type:/invalid Content-Type:/g' -i ./stdlib/LibGit2/test/libgit2.jl sed -e 's/Failed to resolve /failed to resolve /g' -i ./stdlib/LibGit2/test/libgit2.jl ''; diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix new file mode 100644 index 000000000000..8cc7a0bba62e --- /dev/null +++ b/pkgs/development/libraries/dqlite/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libuv, sqlite-replication }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "dqlite-${version}"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "CanonicalLtd"; + repo = "dqlite"; + rev = "v${version}"; + sha256 = "03dikhjppraagyvjx4zbp7f5jfg74jivighxkwrbzrcy0g8pmcvd"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ libuv sqlite-replication ]; + + meta = { + description = "Expose a SQLite database over the network and replicate it across a cluster of peers"; + homepage = https://github.com/CanonicalLtd/dqlite/; + license = licenses.asl20; + maintainers = with maintainers; [ joko ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libaosd/default.nix b/pkgs/development/libraries/libaosd/default.nix new file mode 100644 index 000000000000..e63bfd20c797 --- /dev/null +++ b/pkgs/development/libraries/libaosd/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, fetchFromGitHub, pkgconfig, cairo, pango, + libX11, libXcomposite, autoconf, automake }: + +stdenv.mkDerivation rec { + version = "0.2.7-9-g177589f"; + name = "libaosd-${version}"; + + src = fetchFromGitHub { + owner = "atheme-legacy"; + repo = "libaosd"; + rev = "${version}"; + sha256 = "1cn7k0n74p6jp25kxwcyblhmbdvgw3mikvj0m2jh4c6xccfrgb9a"; + }; + + nativeBuildInputs = [ autoconf automake pkgconfig ]; + buildInputs = [ cairo pango libX11 libXcomposite ]; + enableParallelBuilding = true; + + preConfigure = '' + ./autogen.sh + ''; + + meta = with stdenv.lib; { + longDescription = '' + libaosd is an advanced on screen display library. + + It supports many modern features like anti-aliased text and + composited rendering via XComposite, as well as support for + rendering Cairo and Pango layouts. + ''; + homepage = https://github.com/atheme-legacy/libaosd; + license = licenses.mit; + maintainers = with maintainers; [ unode ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/development/libraries/libmd/default.nix b/pkgs/development/libraries/libmd/default.nix index 2da8e5ebf738..de8baa7ad198 100644 --- a/pkgs/development/libraries/libmd/default.nix +++ b/pkgs/development/libraries/libmd/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "libmd"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { url = "https://archive.hadrons.org/software/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1iv45npzv0gncjgcpx5m081861zdqxw667ysghqb8721yrlyl6pj"; + sha256 = "0waclg2d5qin3r26gy5jvy4584ik60njc8pqbzwk0lzq3j9ynkp1"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix index 1304aff9e3b3..8c0094a3152b 100644 --- a/pkgs/development/libraries/libowfat/default.nix +++ b/pkgs/development/libraries/libowfat/default.nix @@ -1,17 +1,29 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libowfat-0.31"; + name = "libowfat-0.32"; src = fetchurl { url = "https://www.fefe.de/libowfat/${name}.tar.xz"; - sha256 = "04lagr62bd2cr0k8h59qfnx2klh2cf73k5kxsx8xrdybzhfarr6i"; + sha256 = "1hcqg7pvy093bxx8wk7i4gvbmgnxz2grxpyy7b4mphidjbcv7fgl"; }; + # Dirty patch because 0.32 "moved headers to <libowfat/> upon install" + # but it breaks gatling-0.15 and opentracker-2018-05-26 ... + postPatch = '' + substituteInPlace GNUmakefile --replace \ + 'install -d $(DESTDIR)$(INCLUDEDIR)/libowfat' \ + 'install -d $(DESTDIR)$(INCLUDEDIR)' + substituteInPlace GNUmakefile --replace \ + 'install -m 644 $(INCLUDES) $(DESTDIR)$(INCLUDEDIR)/libowfat' \ + 'install -m 644 $(INCLUDES) $(DESTDIR)$(INCLUDEDIR)' + ''; + makeFlags = "prefix=$(out)"; + enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.fefe.de/libowfat/; + homepage = https://www.fefe.de/libowfat/; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index aad6911036ed..3835822673ce 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake +{ stdenv, fetchFromGitHub, cmake , alsaSupport ? !stdenv.isDarwin, alsaLib ? null , pulseSupport ? !stdenv.isDarwin, libpulseaudio ? null , CoreServices, AudioUnit, AudioToolbox @@ -10,12 +10,14 @@ assert alsaSupport -> alsaLib != null; assert pulseSupport -> libpulseaudio != null; stdenv.mkDerivation rec { - version = "1.19.0"; + version = "1.19.1"; name = "openal-soft-${version}"; - src = fetchurl { - url = "http://kcat.strangesoft.net/openal-releases/${name}.tar.bz2"; - sha256 = "1mhf5bsb58s1xk6hvxl7ly7rd4rpl9z8h07xl1q94brywykg7bgi"; + src = fetchFromGitHub { + owner = "kcat"; + repo = "openal-soft"; + rev = name; + sha256 = "0b0g0q1c36nfb289xcaaj3cmyfpiswvvgky3qyalsf9n4dj7vnzi"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/science/math/lrs/default.nix b/pkgs/development/libraries/science/math/lrs/default.nix new file mode 100644 index 000000000000..3cf5c3619a9e --- /dev/null +++ b/pkgs/development/libraries/science/math/lrs/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl, gmp}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "lrs"; + version = "7.0"; + + src = fetchurl { + url = "http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/lrslib-070.tar.gz"; + sha256 = "1zjdmkjracz695k73c2pvipc0skpyn1wzagkhilsvcw9pqljpwg9"; + }; + + buildInputs = [ gmp ]; + + preBuild = '' + export makeFlags="$makeFlags prefix=$out"; + ''; + + meta = { + inherit version; + description = "Implementation of the reverse search algorithm for vertex enumeration/convex hull problems"; + license = stdenv.lib.licenses.gpl2 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "http://cgm.cs.mcgill.ca/~avis/C/lrs.html"; + }; +} diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index a4c2b3297145..c1f401d0badb 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,39 +1,82 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig +{ stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig , wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa_noglu +, libpng, ffmpeg_4 +, python3Packages # TODO: Temporary }: -let pname = "wlroots"; - version = "unstable-2018-03-16"; +let + pname = "wlroots"; + version = "0.1"; + meson480 = meson.overrideAttrs (oldAttrs: rec { + name = pname + "-" + version; + pname = "meson"; + version = "0.48.0"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "0qawsm6px1vca3babnqwn0hmkzsxy4w0gi345apd2qk3v0cv7ipc"; + }; + patches = builtins.filter # Remove gir-fallback-path.patch + (str: !(stdenv.lib.hasSuffix "gir-fallback-path.patch" str)) + oldAttrs.patches; + }); in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchFromGitHub { owner = "swaywm"; repo = "wlroots"; - rev = "9cc875429b40e2567b219f8e9ffd23316d136204"; - sha256 = "1prhic3pyf9n65qfg5akzkc9qv2z3ab60dpcacr7wgr9nxrvnsdq"; + rev = version; + sha256 = "0xfipgg2qh2xcf3a1pzx8pyh1aqpb9rijdyi0as4s6fhgy4w269c"; }; - # $out for the library and $bin for rootston - outputs = [ "out" "bin" ]; + patches = [ (fetchpatch { # TODO: Only required for version 0.1 + url = https://github.com/swaywm/wlroots/commit/be6210cf8216c08a91e085dac0ec11d0e34fb217.patch; + sha256 = "0njv7mr4ark603w79cxcsln29galh87vpzsx2dzkrl1x5x4i6cj5"; + }) ]; + + # $out for the library, $bin for rootston, and $examples for the example + # programs (in examples) AND rootston + outputs = [ "out" "bin" "examples" ]; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson480 ninja pkgconfig ]; buildInputs = [ wayland libGL wayland-protocols libinput libxkbcommon pixman xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa_noglu + libpng ffmpeg_4 + ]; + + mesonFlags = [ + "-Dlibcap=enabled" "-Dlogind=enabled" "-Dxwayland=enabled" "-Dx11-backend=enabled" + "-Dxcb-icccm=enabled" "-Dxcb-xkb=enabled" "-Dxcb-errors=enabled" ]; - # Install rootston (the reference compositor) to $bin postInstall = '' - mkdir -p $bin/bin - cp rootston/rootston $bin/bin/ - mkdir $bin/lib - cp libwlroots* $bin/lib/ - patchelf --set-rpath "$bin/lib:${stdenv.lib.makeLibraryPath buildInputs}" $bin/bin/rootston - mkdir $bin/etc - cp ../rootston/rootston.ini.example $bin/etc/rootston.ini + # Install rootston (the reference compositor) to $bin and $examples + for output in "$bin" "$examples"; do + mkdir -p $output/bin + cp rootston/rootston $output/bin/ + mkdir $output/lib + cp libwlroots* $output/lib/ + patchelf \ + --set-rpath "$output/lib:${stdenv.lib.makeLibraryPath buildInputs}" \ + $output/bin/rootston + mkdir $output/etc + cp ../rootston/rootston.ini.example $output/etc/rootston.ini + done + # Install ALL example programs to $examples: + # screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle + # screenshot output-layout multi-pointer rotation tablet touch pointer + # simple + mkdir -p $examples/bin + for binary in $(find ./examples -executable -type f | grep -vE '\.so'); do + patchelf \ + --set-rpath "$examples/lib:${stdenv.lib.makeLibraryPath buildInputs}" \ + "$binary" + cp "$binary" $examples/bin/ + done ''; meta = with stdenv.lib; { @@ -42,8 +85,5 @@ in stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; - # Marked as broken until the first official/stable release (upstream - # request). See #38344 for the public discussion. - broken = true; }; } diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index 9d0065277172..12fb076d946b 100644 --- a/pkgs/development/libraries/zimg/default.nix +++ b/pkgs/development/libraries/zimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec{ name = "zimg-${version}"; - version = "2.7.5"; + version = "2.8"; src = fetchFromGitHub { owner = "sekrit-twc"; repo = "zimg"; rev = "release-${version}"; - sha256 = "1f4iv99w1sn7kp8xlv2vr20m6qif7c8km1vqjfs9kf2305z5lxww"; + sha256 = "0s4n1swg1hgv81l8hvf0ny0fn305vf6l6dakbj452304p6ihxd83"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/ocaml-modules/zmq/default.nix b/pkgs/development/ocaml-modules/zmq/default.nix new file mode 100644 index 000000000000..a792877e0590 --- /dev/null +++ b/pkgs/development/ocaml-modules/zmq/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, dune, czmq, stdint }: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-zmq-${version}"; + version = "20180726"; + src = fetchFromGitHub { + owner = "issuu"; + repo = "ocaml-zmq"; + rev = "d312a8458d6b688f75470248f11875fbbfa5bb1a"; + sha256 = "1f5l4bw78y4drabhyvmpj3z8k30bill33ca7bzhr02m55yf6gqpf"; + }; + + patches = [ + ./ocaml-zmq-issue43.patch + ]; + + buildInputs = [ ocaml findlib dune czmq ]; + + propagatedBuildInputs = [ stdint ]; + + buildPhase = "dune build -p zmq"; + + inherit (dune) installPhase; + + meta = with stdenv.lib; { + description = "ZeroMQ bindings for OCaml"; + license = licenses.mit; + maintainers = with maintainers; [ akavel ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/zmq/lwt.nix b/pkgs/development/ocaml-modules/zmq/lwt.nix new file mode 100644 index 000000000000..80c934b44d64 --- /dev/null +++ b/pkgs/development/ocaml-modules/zmq/lwt.nix @@ -0,0 +1,12 @@ +{ stdenv, ocaml, findlib, dune, zmq, ocaml_lwt }: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-zmq-lwt-${version}"; + inherit (zmq) version src installPhase meta; + + buildInputs = [ ocaml findlib dune ]; + + propagatedBuildInputs = [ zmq ocaml_lwt ]; + + buildPhase = "dune build -p zmq-lwt"; +} diff --git a/pkgs/development/ocaml-modules/zmq/ocaml-zmq-issue43.patch b/pkgs/development/ocaml-modules/zmq/ocaml-zmq-issue43.patch new file mode 100644 index 000000000000..0d01e8b45f39 --- /dev/null +++ b/pkgs/development/ocaml-modules/zmq/ocaml-zmq-issue43.patch @@ -0,0 +1,11 @@ +--- source/zmq/src/caml_zmq_stubs.c 1970-01-01 01:00:01.000000000 +0100 ++++ source/zmq/src/caml_zmq_stubs.c 1970-01-01 01:00:01.000000000 +0100 +@@ -35,7 +35,7 @@ + #include "socket.h" + #include "msg.h" + +-#include <uint64.h> ++#include <ocaml_stdint/uint64.h> + + /** + * Version diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix index 6df19e4c94be..a77e98dae4c8 100644 --- a/pkgs/development/python-modules/cypari2/default.nix +++ b/pkgs/development/python-modules/cypari2/default.nix @@ -11,11 +11,12 @@ buildPythonPackage rec { pname = "cypari2"; - version = "1.2.1"; + # upgrade may break sage, please test the sage build or ping @timokau on upgrade + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "0v2kikwf0advq8j76nwzhlacwj1yys9cvajm4fqgmasjdsnf1q4k"; + sha256 = "04f00xp8aaz37v00iqg1mv5wjq00a5qhk8cqa93s13009s9x984r"; }; # This differs slightly from the default python installPhase in that it pip-installs diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 95ee4e93f2a8..8d2b1d17b2d5 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -3,15 +3,15 @@ , go-md2man }: let - version = "1.1"; + version = "1.4"; src = fetchFromGitHub { rev = "v${version}"; - owner = "projectatomic"; + owner = "containers"; repo = "buildah"; - sha256 = "0pc7bzcaafrz56glygzhnbilgaz4ca2kmklw8njfgamffbw4d54p"; + sha256 = "0b9pfi22qcqyp0im8vp02ibrwd49ghgi64d5l98z01cj52n2j2dz"; }; - goPackagePath = "github.com/projectatomic/buildah"; + goPackagePath = "github.com/containers/buildah"; in buildGoPackage rec { name = "buildah-${version}"; @@ -45,7 +45,7 @@ in buildGoPackage rec { meta = { description = "A tool which facilitates building OCI images"; - homepage = https://github.com/projectatomic/buildah; + homepage = https://github.com/containers/buildah; maintainers = with stdenv.lib.maintainers; [ Profpatsch ]; license = stdenv.lib.licenses.asl20; }; diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix index 64921ec6e10e..bb44074dfc75 100644 --- a/pkgs/development/tools/gocode/default.nix +++ b/pkgs/development/tools/gocode/default.nix @@ -1,9 +1,9 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "gocode-${version}"; - version = "20180727-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "00e7f5ac290aeb20a3d8d31e737ae560a191a1d5"; + name = "gocode-unstable-${version}"; + version = "2018-10-22"; + rev = "e893215113e5f7594faa3a8eb176c2700c921276"; goPackagePath = "github.com/mdempsky/gocode"; @@ -13,12 +13,15 @@ buildGoPackage rec { allowGoReference = true; src = fetchFromGitHub { + inherit rev; + owner = "mdempsky"; repo = "gocode"; - inherit rev; - sha256 = "0vrwjq4r90za47hm88yx5h2mvkv7y4yaj2xbx3skg62wq2drsq31"; + sha256 = "1zsll7yghv64890k7skl0g2lg9rsaiisgrfnb8kshsxrcxi1kc2l"; }; + goDeps = ./deps.nix; + preBuild = '' # getting an error building the testdata because they contain invalid files # on purpose as part of the testing. diff --git a/pkgs/development/tools/gocode/deps.nix b/pkgs/development/tools/gocode/deps.nix new file mode 100644 index 000000000000..4eefdd9c6d04 --- /dev/null +++ b/pkgs/development/tools/gocode/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "6fe81c087942f588f40c3f67b41ce284f2f70eee"; + sha256 = "04yl7rk2lf94bxz74ja5snh7ava9gcnf2yx6y002pfkk538r6w5d"; + }; + } +] diff --git a/pkgs/development/tools/kube-prompt/default.nix b/pkgs/development/tools/kube-prompt/default.nix new file mode 100644 index 000000000000..2ea69a0c56b5 --- /dev/null +++ b/pkgs/development/tools/kube-prompt/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "kube-prompt-${version}"; + version = "1.0.4"; + rev = "v${version}"; + + goPackagePath = "github.com/c-bata/kube-prompt"; + + src = fetchFromGitHub { + inherit rev; + owner = "c-bata"; + repo = "kube-prompt"; + sha256 = "09c2kjsk8cl7qgxbr1s7qd9br5shf7gccxvbf7nyi6wjiass9yg5"; + }; + + goDeps = ./deps.nix; + + meta = { + description = "An interactive kubernetes client featuring auto-complete using go-prompt"; + license = lib.licenses.mit; + homepage = https://github.com/c-bata/kube-prompt; + maintainers = [ lib.maintainers.vdemeester ]; + }; +} diff --git a/pkgs/development/tools/kube-prompt/deps.nix b/pkgs/development/tools/kube-prompt/deps.nix new file mode 100644 index 000000000000..393b69a2a331 --- /dev/null +++ b/pkgs/development/tools/kube-prompt/deps.nix @@ -0,0 +1,309 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "aad3f485ee528456e0768f20397b4d9dd941e755"; + sha256 = "1cgabmg76axkbpm7zip3ym2mym6kwgc9cw9kil0inmckkh3x1ky8"; + }; + } + { + goPackagePath = "github.com/c-bata/go-prompt"; + fetch = { + type = "git"; + url = "https://github.com/c-bata/go-prompt"; + rev = "c52492ff1b386e5c0ba5271b5eaad165fab09eca"; + sha256 = "14k8anchf0rcpxfbb2acrajdqrfspscbkn47m4py1zh5rkk6b9p9"; + }; + } + { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"; + sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "636bf0302bc95575d69441b25a2603156ffdddf1"; + sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; + sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; + }; + } + { + goPackagePath = "github.com/google/btree"; + fetch = { + type = "git"; + url = "https://github.com/google/btree"; + rev = "e89373fe6b4a7413d7acd6da1725b83ef713e6e4"; + sha256 = "0jlkjjlf8ilifgsb2bv0jfgl4cxl1bypx7a6pjkwz3xf6k8jd7mj"; + }; + } + { + goPackagePath = "github.com/google/gofuzz"; + fetch = { + type = "git"; + url = "https://github.com/google/gofuzz"; + rev = "24818f796faf91cd76ec7bddd72458fbced7a6c1"; + sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm"; + }; + } + { + goPackagePath = "github.com/googleapis/gnostic"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gnostic"; + rev = "7c663266750e7d82587642f65e60bc4083f1f84e"; + sha256 = "0yh3ckd7m0r9h50wmxxvba837d0wb1k5yd439zq4p1kpp4390z12"; + }; + } + { + goPackagePath = "github.com/gregjones/httpcache"; + fetch = { + type = "git"; + url = "https://github.com/gregjones/httpcache"; + rev = "9cad4c3443a7200dd6400aef47183728de563a38"; + sha256 = "0wjdwcwqqcx2d5y68qvhg6qyj977il5ijmnn9h9cd6wjbdy0ay6s"; + }; + } + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "9316a62528ac99aaecb4e47eadd6dc8aa6533d58"; + sha256 = "1mvgn89vp39gcpvhiq4n7nw5ipj7fk6h03jgc6fjwgvwvss213pb"; + }; + } + { + goPackagePath = "github.com/json-iterator/go"; + fetch = { + type = "git"; + url = "https://github.com/json-iterator/go"; + rev = "ab8a2e0c74be9d3be70b3184d9acc634935ded82"; + sha256 = "1x3wz44p1238gpyzkiiilvvrq9q8dwjdm9kdidq65yjq0zcn0sq4"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"; + sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb"; + sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; + }; + } + { + goPackagePath = "github.com/mattn/go-tty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-tty"; + rev = "931426f7535ac39720c8909d70ece5a41a2502a6"; + sha256 = "00cb07v13xrfqm39m1j2h2zvj684gl9fzr51591i9a52a9m6xlj5"; + }; + } + { + goPackagePath = "github.com/modern-go/concurrent"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/concurrent"; + rev = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"; + sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; + }; + } + { + goPackagePath = "github.com/modern-go/reflect2"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/reflect2"; + rev = "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd"; + sha256 = "1721y3yr3dpx5dx5ashf063qczk2awy5zjir1jvp1h5hn7qz4i49"; + }; + } + { + goPackagePath = "github.com/petar/GoLLRB"; + fetch = { + type = "git"; + url = "https://github.com/petar/GoLLRB"; + rev = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4"; + sha256 = "01xp3lcamqkvl91jg6ly202gdsgf64j39rkrcqxi6v4pbrcv7hz0"; + }; + } + { + goPackagePath = "github.com/peterbourgon/diskv"; + fetch = { + type = "git"; + url = "https://github.com/peterbourgon/diskv"; + rev = "5f041e8faa004a95c88a202771f4cc3e991971e6"; + sha256 = "1mxpa5aad08x30qcbffzk80g9540wvbca4blc1r2qyzl65b8929b"; + }; + } + { + goPackagePath = "github.com/pkg/term"; + fetch = { + type = "git"; + url = "https://github.com/pkg/term"; + rev = "cda20d4ac917ad418d86e151eff439648b06185b"; + sha256 = "08frhz411dwyli5spfxn32d3ni9mrgdav51lmg8a1wpdmw0r0wwp"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "583c0c0531f06d5278b7d917446061adc344b5cd"; + sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "a2144134853fc9a27a7b1e3eb4f19f1a76df13c9"; + sha256 = "0hjjk6k9dq7zllwsw9icdfbli12ii379q2lajd6l7lyw72wy28by"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1"; + sha256 = "018zmn4kmg2mbngcciqal54slc3pl4ry5vlv0bw36fcxvnazxnbp"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "ef147856a6ddbb60760db74283d2424e98c87bff"; + sha256 = "1q1vm1z40fx1grlrm7az4rln6v5pj9xi5n1cjqg5xgq4dsk9132y"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "ac767d655b305d4e9612f5f6e33120b9176c4ad4"; + sha256 = "1ds29n5lh4j21hmzxz7vk7hv1k6sixc7f0zsdc9xqdg0j7d212zm"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "golang.org/x/time"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/time"; + rev = "fbb02b2291d28baffd63558aa44b4b56f178d650"; + sha256 = "0jjqcv6rzihlgg4i797q80g1f6ch5diz2kxqh6488gwkb6nds4h4"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "b1f26356af11148e710935ed1ac8a7f5702c7612"; + sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x"; + }; + } + { + goPackagePath = "gopkg.in/inf.v0"; + fetch = { + type = "git"; + url = "https://github.com/go-inf/inf"; + rev = "d2d2541c53f18d2a059457998ce2876cc8e67cbf"; + sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + }; + } + { + goPackagePath = "k8s.io/api"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/api"; + rev = "072894a440bdee3a891dea811fe42902311cd2a3"; + sha256 = "1hlbfwak4adwkj74jdiw8kmapri9rqmmjssncqiq0xnwlkcyn0ig"; + }; + } + { + goPackagePath = "k8s.io/apimachinery"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/apimachinery"; + rev = "103fd098999dc9c0c88536f5c9ad2e5da39373ae"; + sha256 = "04navnpm59d75dhlz07rmay7m2izrf4m0i9xklxzqg7mlk9g20jc"; + }; + } + { + goPackagePath = "k8s.io/client-go"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/client-go"; + rev = "7d04d0e2a0a1a4d4a1cd6baa432a2301492e4e65"; + sha256 = "06rszpgckx9gmqz9gbq8wnl39d1dnl28wdgrygj2fhz5prhj0x4s"; + }; + } +] \ No newline at end of file diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix new file mode 100644 index 000000000000..e0b744c83593 --- /dev/null +++ b/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub, ocamlPackages, dune }: + +with ocamlPackages; + +if !stdenv.lib.versionAtLeast ocaml.version "4.05" +then throw "ocamlformat is not available for OCaml ${ocaml.version}" +else + +stdenv.mkDerivation rec { + version = "0.8"; + pname = "ocamlformat"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "ocaml-ppx"; + repo = pname; + rev = version; + sha256 = "1i7rsbs00p43362yv7z7dw0qsnv7vjf630qk676qvfg7kg422w6j"; + }; + + buildInputs = [ + ocaml + dune + findlib + base + cmdliner + fpath + ocaml-migrate-parsetree + stdio + ]; + + configurePhase = '' + patchShebangs tools/gen_version.sh + tools/gen_version.sh src/Version.ml version + ''; + + buildPhase = '' + dune build -p ocamlformat + ''; + + inherit (dune) installPhase; + + meta = { + homepage = "https://github.com/ocaml-ppx/ocamlformat"; + description = "Auto-formatter for OCaml code"; + maintainers = [ stdenv.lib.maintainers.Zimmi48 ]; + license = stdenv.lib.licenses.mit; + inherit (ocamlPackages.ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/tools/vgo2nix/default.nix b/pkgs/development/tools/vgo2nix/default.nix new file mode 100644 index 000000000000..ad556606c9ae --- /dev/null +++ b/pkgs/development/tools/vgo2nix/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, lib +, buildGoPackage +, go +, makeWrapper +, nix-prefetch-git +, fetchFromGitHub +}: + +buildGoPackage rec { + name = "vgo2nix-${version}"; + version = "unstable-2018-10-14"; + goPackagePath = "github.com/adisbladis/vgo2nix"; + + nativeBuildInputs = [ makeWrapper ]; + + src = fetchFromGitHub { + owner = "adisbladis"; + repo = "vgo2nix"; + rev = "a36137a2b9675f5e9b7e0a7840bc9fe9f2414d4e"; + sha256 = "1658hr1535v8w3s41q0bcgk8hmisjn8gcw7i3n2d2igszn1dp0q4"; + }; + + goDeps = ./deps.nix; + + allowGoReference = true; + + postInstall = with stdenv; let + binPath = lib.makeBinPath [ nix-prefetch-git go ]; + in '' + wrapProgram $bin/bin/vgo2nix --prefix PATH : ${binPath} + ''; + + meta = with stdenv.lib; { + description = "Convert go.mod files to nixpkgs buildGoPackage compatible deps.nix files"; + homepage = https://github.com/adisbladis/vgo2nix; + license = licenses.mit; + maintainers = with maintainers; [ adisbladis ]; + }; + +} diff --git a/pkgs/development/tools/vgo2nix/deps.nix b/pkgs/development/tools/vgo2nix/deps.nix new file mode 100644 index 000000000000..b8327cd6069f --- /dev/null +++ b/pkgs/development/tools/vgo2nix/deps.nix @@ -0,0 +1,12 @@ +[ + + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "ded554d0681e"; + sha256 = "04rlq9hc3ccww9sbsrl48fl6wbjprb136rqxyr7dmgfj444aml56"; + }; + } +] diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix index 20c9a71aadd5..dade09ee5f6e 100644 --- a/pkgs/development/tools/wabt/default.nix +++ b/pkgs/development/tools/wabt/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/WebAssembly/wabt; license = licenses.asl20; maintainers = with maintainers; [ ekleog ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } |