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
@@ -52,12 +52,12 @@ rec {
};
gradle_latest = gradleGen rec {
name = "gradle-4.2";
name = "gradle-4.2.1";
nativeVersion = "0.14";
src = fetchurl {
url = "http://services.gradle.org/distributions/${name}-bin.zip";
sha256 = "1bifb3smmdxkfk94li2l63g2jxcl1bjca2bqcq2rqnp568yxcpai";
sha256 = "1h7v133rm81jf0bgv9mgvydl7rgh4430dnsfs66wflfay82cqldm";
};
};
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
homepage = https://crystal-lang.org/;
license = licenses.asl20;
description = "Dependency manager for the Crystal language";
maintainers = with maintainers; [ mingchuan ];
maintainers = with maintainers; [ sifmelcara ];
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
};
}