From aec2f9bfe9f8f1c2c962f0d7b0530a8da9ab4737 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Tue, 2 Aug 2016 01:19:55 +0200 Subject: [PATCH 1/4] =?UTF-8?q?ajout=20d'un=20d=C3=A9but=20de=20cr=C3=A9at?= =?UTF-8?q?ion=20de=20d=C3=A9rivation=20pour=20osm2pgsql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- osm2psql.nix | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 osm2psql.nix diff --git a/osm2psql.nix b/osm2psql.nix new file mode 100644 index 0000000..8e001bf --- /dev/null +++ b/osm2psql.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 ]; + }; + } + From 221bcd2deeaa163ad6c5a5b514365fbf1af9dbc1 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Tue, 2 Aug 2016 01:20:51 +0200 Subject: [PATCH 2/4] =?UTF-8?q?d=C3=A9placement=20dans=20dossier=20sp?= =?UTF-8?q?=C3=A9cifique?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- osm2psql.nix => logiciel-custom/osm2pgsql.nix | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename osm2psql.nix => logiciel-custom/osm2pgsql.nix (100%) diff --git a/osm2psql.nix b/logiciel-custom/osm2pgsql.nix similarity index 100% rename from osm2psql.nix rename to logiciel-custom/osm2pgsql.nix From 06ec0979dc89579536d149ff3c3f977bf91ba078 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Tue, 2 Aug 2016 13:48:36 +0200 Subject: [PATCH 3/4] =?UTF-8?q?ajout=20app=20g=C3=A9o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- desktop/app-cartographie.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/desktop/app-cartographie.nix b/desktop/app-cartographie.nix index aa033c1..c7c3ebf 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 viking # analyse de topo, gestion de données GPS ]; From a5842e776348df340a42405cf93169e7cb126a87 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Tue, 2 Aug 2016 13:48:58 +0200 Subject: [PATCH 4/4] =?UTF-8?q?r=C3=A9activation=20de=20tex=20full?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- desktop/app-bureautique.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 ]; }