5 files changed, 44 insertions, 50 deletions
diff --git a/pkgs/applications/misc/foxtrotgps/default.nix b/pkgs/applications/misc/foxtrotgps/default.nix
new file mode 100644
index 000000000000..dc3f1922c214
--- /dev/null
+++ b/pkgs/applications/misc/foxtrotgps/default.nix
@@ -0,0 +1,40 @@
+{ fetchurl, stdenv, pkg-config, wrapGAppsHook, curl, gnome2, gpsd, gtk2
+, intltool, libexif, python3Packages, sqlite }:
+
+stdenv.mkDerivation rec {
+  pname = "foxtrotgps";
+  version = "1.2.2";
+
+  src = fetchurl {
+    url = "https://www.foxtrotgps.org/releases/foxtrotgps-${version}.tar.xz";
+    sha256 = "0grn35j5kwc286dxx18fv32qa330xmalqliwy6zirxmj6dffvrkg";
+  };
+
+  nativeBuildInputs = [ pkg-config wrapGAppsHook ];
+
+  buildInputs = [
+    curl.dev
+    gnome2.libglade.dev
+    gpsd
+    gtk2.dev
+    intltool
+    libexif
+    sqlite.dev
+    (python3Packages.python.withPackages (pythonPackages: with python3Packages;
+    [ beautifulsoup4 feedparser sqlalchemy ]))
+    ];
+
+  meta = with stdenv.lib; {
+    description = "GPS/GIS application optimized for small screens";
+    longDescription = ''
+      An easy to use, free & open-source GPS/GIS application that works well on
+      small screens, and is especially suited to touch input. It spun off of
+      tangoGPS in 2010 with a focus on cooperation and fostering community
+      innovation.
+    '';
+    homepage = "https://www.foxtrotgps.org/";
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ wucke13 ];
+  };
+}
diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index 6900f305c0f8..188e902614fa 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -21,14 +21,14 @@
 with python3Packages;
 buildPythonApplication rec {
   pname = "kitty";
-  version = "0.15.1";
+  version = "0.16.0";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "kovidgoyal";
     repo = "kitty";
     rev = "v${version}";
-    sha256 = "0y25w8123rjd6f5875mk8yv7mdr75mgswl3sh6zixm7b9r771s9p";
+    sha256 = "1bszyddar0g1gdz67h8rd3gbrdhi6ahjg7j14cjiqxm1938z9ajf";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix
index f84ac6d600a6..846df292eb1a 100644
--- a/pkgs/applications/misc/loxodo/default.nix
+++ b/pkgs/applications/misc/loxodo/default.nix
@@ -30,7 +30,7 @@ py.buildPythonApplication {
 
   meta = with stdenv.lib; {
     description = "A Password Safe V3 compatible password vault";
-    homepage = http://www.christoph-sommer.de/loxodo/;
+    homepage = https://www.christoph-sommer.de/loxodo/;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
   };
diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix
index 8dbd0cd57767..1465b0ea0523 100644
--- a/pkgs/applications/misc/slic3r/default.nix
+++ b/pkgs/applications/misc/slic3r/default.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
       instructions for your 3D printer. It cuts the model into horizontal
       slices (layers), generates toolpaths to fill them and calculates the
       amount of material to be extruded.'';
-    homepage = http://slic3r.org/;
+    homepage = https://slic3r.org/;
     license = licenses.agpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ bjornfor the-kenny ];
diff --git a/pkgs/applications/misc/tangogps/default.nix b/pkgs/applications/misc/tangogps/default.nix
deleted file mode 100644
index 10b487828ea5..000000000000
--- a/pkgs/applications/misc/tangogps/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gettext, gtk2, gconf
-, curl, libexif, sqlite, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "tangogps-0.99.2";
-
-  src = fetchurl {
-    url = "http://www.tangogps.org/downloads/${name}.tar.gz";
-    sha256 = "15q2kkrv4mfsivfdzjgpxr7s2amw7d501q2ayjl3ff4vmvfn5516";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gettext gtk2 gconf curl libexif sqlite libxml2 ];
-  NIX_LDFLAGS = "-lm";
-
-  # bogus includes fail with newer library version
-  postPatch = ''
-    sed -i -e 's,#include <glib/.*>,#include <glib.h>,g' src/*.c
-    sed -i -e 's,#include <curl/.*>,#include <curl/curl.h>,g' src/*.c src/*.h
-  '';
-
-  meta = {
-    description = "User friendly map and GPS user interface";
-
-    longDescription = ''
-      tangoGPS is an easy to use, fast and lightweight mapping
-      application for use with or without GPS.
-
-      It runs on any Linux platform from the desktop over eeePC down
-      to phones like the Openmoko Neo.
-
-      By default tangoGPS uses map data from the OpenStreetMap
-      project.  Additionally a variety of other repositories can be
-      easily added.
-
-      The maps are automagically downloaded and cached for offline use
-      while you drag or zoom the map.  Furthermore you can
-      conveniently pre-cache areas with tangoGPS.
-    '';
-
-    #homepage = http://www.tangogps.org/; # no longer valid, I couldn't find any other
-
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
-  };
-}