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
+14 -18
View File
@@ -1,28 +1,24 @@
{stdenv, fetchurl, libX11, libXt, libXext, libXaw }:
{ stdenv, fetchurl, libX11, libXt, libXext, libXaw }:
assert stdenv.system == "i686-linux";
stdenv.mkDerivation rec {
name = "darcnes-${version}";
version = "9b0401";
stdenv.mkDerivation {
name = "darcnes-9b0401";
src = fetchurl {
url = http://www.dridus.com/~nyef/darcnes/download/dn9b0401.tgz;
url = "https://web.archive.org/web/20130511081532/http://www.dridus.com/~nyef/darcnes/download/dn${version}.tgz";
sha256 = "05a7mh51rg7ydb414m3p5mm05p4nz2bgvspqzwm3bhbj7zz543k3";
};
buildInputs = [ libX11 libXt libXext libXaw ];
installPhase = ''
mkdir -p $out/bin
cp darcnes $out/bin
'';
patches = [ ./label.patch ];
meta = {
homepage = http://www.dridus.com/~nyef/darcnes/;
description = "Multi-System emulator, specially for NES";
/* Prohibited commercial use, credit required. */
license = stdenv.lib.licenses.free;
};
buildInputs = [ libX11 libXt libXext libXaw ];
installPhase = "install -Dt $out/bin darcnes";
meta = {
homepage = https://web.archive.org/web/20130502171725/http://www.dridus.com/~nyef/darcnes/;
description = "Sega Master System, Game Gear, SG-1000, NES, ColecoVision and Apple II emulator";
# Prohibited commercial use, credit required.
license = stdenv.lib.licenses.free;
platforms = [ "i686-linux" ];
};
}