Merge master into staging-next

4 files changed, 111 insertions, 0 deletions

diff --git a/pkgs/by-name/ff/ff2mpv-go/package.nix b/pkgs/by-name/ff/ff2mpv-go/package.nix
new file mode 100644
index 000000000000..71e0f98a478d
--- /dev/null
+++ b/pkgs/by-name/ff/ff2mpv-go/package.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildGoModule
+, fetchgit
+, mpv
+}:
+buildGoModule rec {
+  pname = "ff2mpv-go";
+  version = "1.0.1";
+
+  src = fetchgit {
+    url = "https://git.clsr.net/util/ff2mpv-go/";
+    rev = "v${version}";
+    hash = "sha256-e/AuOA3isFTyBf97Zwtr16yo49UdYzvktV5PKB/eH/s=";
+  };
+
+  vendorHash = null;
+
+  postPatch = ''
+    substituteInPlace ff2mpv.go --replace '"mpv"' '"${lib.getExe mpv}"'
+  '';
+
+  postInstall = ''
+    mkdir -p "$out/lib/mozilla/native-messaging-hosts"
+    $out/bin/ff2mpv-go --manifest > "$out/lib/mozilla/native-messaging-hosts/ff2mpv.json"
+  '';
+
+  meta = with lib; {
+    description = "Native messaging host for ff2mpv written in Go";
+    homepage = "https://git.clsr.net/util/ff2mpv-go/";
+    license = licenses.publicDomain;
+    maintainers = with maintainers; [ ambroisie ];
+    mainProgram = "ff2mpv-go";
+  };
+}
diff --git a/pkgs/by-name/go/gosmore/package.nix b/pkgs/by-name/go/gosmore/package.nix
new file mode 100644
index 000000000000..2bc778ff9cb2
--- /dev/null
+++ b/pkgs/by-name/go/gosmore/package.nix
@@ -0,0 +1,38 @@
+{ lib, stdenv, fetchFromGitHub, libxml2, gtk2, curl, pkg-config }:
+
+stdenv.mkDerivation rec {
+  pname = "gosmore";
+  version = "unstable-2014-03-17";
+
+  src = fetchFromGitHub {
+    owner = "openstreetmap";
+    repo = "svn-archive";
+    rev = "89b1fbfbc9e9a8b5e78795fd40bdfa60550322fc";
+    sparseCheckout = [ "applications/rendering/gosmore" ];
+    hash = "sha256-MfuJVsyGWspGNAFD6Ktbbyawb4bPwUITe7WkyFs6JxI=";
+  };
+
+  sourceRoot = "${src.name}/applications/rendering/gosmore";
+
+  buildInputs = [ libxml2 gtk2 curl ];
+
+  nativeBuildInputs = [ pkg-config ];
+
+  prePatch = ''
+    sed -e '/curl.types.h/d' -i *.{c,h,hpp,cpp}
+    sed -e "24i #include <ctime>" -e "s/data/dat/g" -i jni/libgosm.cpp
+  '';
+
+  patches = [ ./pointer_int_comparison.patch ];
+  patchFlags = [ "-p1" "--binary" ]; # patch has dos style eol
+
+  meta = with lib; {
+    description = "Open Street Map viewer";
+    homepage = "https://sourceforge.net/projects/gosmore/";
+    maintainers = with maintainers; [
+      raskin
+    ];
+    platforms = platforms.linux;
+    license = licenses.bsd2;
+  };
+}
diff --git a/pkgs/by-name/go/gosmore/pointer_int_comparison.patch b/pkgs/by-name/go/gosmore/pointer_int_comparison.patch
new file mode 100644
index 000000000000..4a715b6d8591
--- /dev/null
+++ b/pkgs/by-name/go/gosmore/pointer_int_comparison.patch
@@ -0,0 +1,11 @@
+--- blah_/jni/gosmore.cpp	1970-01-01 01:00:01.000000000 +0100

++++ /dev/stdin	2018-03-18 00:21:08.474217132 +0100

+@@ -1273,7 +1273,7 @@

+       if (deg[i] < -180 || deg[i] > 180) break;

+       if (i == 0 && (strncasecmp (t, "lat", 3) == 0 ||

+                      strncasecmp (t, "lon", 3) == 0)) { // lat=-25.7 lon=28.2

+-        for (t += 3; t != '\0' && !isalnum (*t); t++) {}

++        for (t += 3; *t != '\0' && !isalnum (*t); t++) {}

+       }

+       if (i == 1) { // Success !

+         //printf ("%lf %lf %u\n", deg[lonFirst ? 1 : 0], deg[lonFirst ? 0 : 1],

diff --git a/pkgs/by-name/re/regina/package.nix b/pkgs/by-name/re/regina/package.nix
new file mode 100644
index 000000000000..7480ade5413c
--- /dev/null
+++ b/pkgs/by-name/re/regina/package.nix
@@ -0,0 +1,28 @@
+{ lib
+, stdenv
+, fetchurl
+, ncurses
+}:
+
+stdenv.mkDerivation rec {
+  pname = "regina-rexx";
+  version = "3.9.5";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/regina-rexx/regina-rexx/${version}/${pname}-${version}.tar.gz";
+    hash = "sha256-COmpBhvuADjPtFRG3iB2b/2uUO6jf2ZCRG7E5zoqvFE=";
+  };
+
+  buildInputs = [ ncurses ];
+
+  configureFlags = [
+    "--libdir=$(out)/lib"
+  ];
+
+  meta = with lib; {
+    description = "REXX interpreter";
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.unix;
+    license = licenses.lgpl2;
+  };
+}