Merge branch 'master' into staging

* master: (81 commits)
  Add NixOS 17.09 AMIs
  gradle: 4.2 -> 4.2.1
  maintainers.nix: use my GitHub handle as maintainer name
  fcitx-engines.rime: init at 0.3.2
  brise: init at 2017-09-16
  librime: init at 1.2.9
  marisa: init at 0.2.4
  opencc: build shared library and programs
  josm: 12712 -> 12914
  exa: 0.7.0 -> 0.8.0
  krb5: add deprecation date for old configuration
  rustRegistry: 2017-09-10 -> 2017-10-03
  go-ethereum: Fix libusb segmentation faults on Darwin
  tor-browser-bundle-bin: 7.0.5 -> 7.0.6
  libsodium: 1.0.13 -> 1.0.15
  tor-browser-bundle: geoip support
  tor-browser-bundle: support transports obfs2,obfs3
  tor-browser-bundle: bump https-everywhere to 2017.9.12
  tint2: limit platforms to Linux since macOS is not supported and fails the tests
  eclipse-plugin-vrapper: init at 0.72.0
  ...
This commit is contained in:
Orivej Desh
2017-10-03 17:46:39 +00:00
88 changed files with 1417 additions and 656 deletions
@@ -0,0 +1,25 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-stdint-${version}";
version = "0.3.0";
src = fetchFromGitHub {
owner = "andrenth";
repo = "ocaml-stdint";
rev = version;
sha256 = "18nh23yx4ghgq7mjf4mdyq8kj1fdw5d0abw919s8n4mv21cmpwia";
};
buildInputs = [ ocaml findlib ocamlbuild ];
configurePhase = "ocaml setup.ml -configure --prefix $out";
createFindlibDestdir = true;
meta = {
description = "Various signed and unsigned integers for OCaml";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.gebner ];
inherit (src.meta) homepage;
inherit (ocaml.meta) platforms;
};
}