diff --git a/desktop/app-bureautique.nix b/desktop/app-bureautique.nix index d5f1250..4b78222 100644 --- a/desktop/app-bureautique.nix +++ b/desktop/app-bureautique.nix @@ -35,9 +35,9 @@ mkIf profiles.isDesktop { graphviz # dot, neato : traçage de graphes (carré, rond) jekyll # générateur statique de site web pandoc - #texLiveFull # distribution LaTeX - texLive # distribution LaTeX de base - texLiveBeamer # paquets et extensions pour Beamer - texLiveModerncv # paquets pour la classe Modern CV + texLiveFull # distribution LaTeX + #texLive # distribution LaTeX de base + #texLiveBeamer # paquets et extensions pour Beamer + #texLiveModerncv # paquets pour la classe Modern CV ]; } diff --git a/desktop/app-cartographie.nix b/desktop/app-cartographie.nix index a1d7191..3b2e525 100644 --- a/desktop/app-cartographie.nix +++ b/desktop/app-cartographie.nix @@ -11,6 +11,8 @@ mkIf profiles.isDesktop { environment.systemPackages = with pkgs; [ # Gestion de données géographiques + expat + gpsbabel # pour convettir les données des GPS josm # outil de contribution à OpenStreetMap qgis # client lourd de manipulation de données géographiques viking # analyse de topo, gestion de données GPS diff --git a/logiciel-custom/osm2pgsql.nix b/logiciel-custom/osm2pgsql.nix new file mode 100644 index 0000000..8e001bf --- /dev/null +++ b/logiciel-custom/osm2pgsql.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl +, boost +, bzip2 +, cmake +, expat +, geos +, lua +, postgresql +, proj +, zlib +} + +stdenv.mkDerivation rec { + #version = "0.87.1"; + version = "0.90.1"; + name = "osm2pgsql-${version}-0"; + + src = fetchurl { + url = "https://github.com/openstreetmap/osm2pgsql/archive/${version}.tar.gz"; + sha256 = "0i0zg8di8nbh96qnyyr156ikwcsq1w9b2291bazm5whb351flmqx"; + }; + + #nativeBuildInputs = [ ]; + buildInputs = [ ]; + + #preConfigure = '' + ''; + #buildPhase = ''jam "-j$NIX_BUILD_CORES" ''; + #installPhase = '' + #''; + + meta = with stdenv.lib; { + homepage = http://wiki.openstreetmap.org/wiki/Osm2pgsql; + description = "osm2pgsql is a tool for loading OpenStreetMap data into a PostgreSQL / PostGIS database suitable for applications like rendering into a map, geocoding with Nominatim, or general analysis."; + license = licenses.gpl2; + #maintainers = [ maintainers.phunehehe ]; + maintainers = [ maintainers.jpierre03 ]; + }; + } +