From 9a88d2248b796a3fc557b3746470bc2a0dff9c09 Mon Sep 17 00:00:00 2001 From: wucke13 Date: Fri, 24 Jan 2020 21:07:09 +0100 Subject: [PATCH 1/2] tangogps: drop at 0.99.2 tangogps is abandoned. It looks like it this is the case since the early 2010s. foxtrotgps is a fork, that still is maintained. --- pkgs/applications/misc/tangogps/default.nix | 46 --------------------- pkgs/top-level/all-packages.nix | 4 -- 2 files changed, 50 deletions(-) delete mode 100644 pkgs/applications/misc/tangogps/default.nix 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 ,#include ,g' src/*.c - sed -i -e 's,#include ,#include ,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; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee74eb17f311..b75b39b833cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21599,10 +21599,6 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - tangogps = callPackage ../applications/misc/tangogps { - gconf = gnome2.GConf; - }; - tambura = callPackage ../applications/audio/tambura { }; teams = callPackage ../applications/networking/instant-messengers/teams { }; From f18604531390273733757ec36097699c469a9ab5 Mon Sep 17 00:00:00 2001 From: wucke13 Date: Fri, 24 Jan 2020 21:02:54 +0100 Subject: [PATCH 2/2] foxtrotgps: init at 1.2.2 --- pkgs/applications/misc/foxtrotgps/default.nix | 40 +++++++++++++++++++ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 + 3 files changed, 43 insertions(+) create mode 100644 pkgs/applications/misc/foxtrotgps/default.nix 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/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 68dfe49545a4..371bdcd1bf1b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -414,6 +414,7 @@ mapAliases ({ system_config_printer = system-config-printer; # added 2016-01-03 systool = sysfsutils; # added 2018-04-25 tahoelafs = tahoe-lafs; # added 2018-03-26 + tangogps = foxtrotgps; # added 2020-01-26 telepathy_farstream = telepathy-farstream; # added 2018-02-25 telepathy_gabble = telepathy-gabble; # added 2018-02-25 telepathy_glib = telepathy-glib; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b75b39b833cf..a7c0ce934d54 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19178,6 +19178,8 @@ in formatter = callPackage ../applications/misc/formatter { }; + foxtrotgps = callPackage ../applications/misc/foxtrotgps { }; + fractal = callPackage ../applications/networking/instant-messengers/fractal { }; freecad = qt5.callPackage ../applications/graphics/freecad { mpi = openmpi; };