ajout de docker pour ocean

base.nix

@@ -2,7 +2,11 @@
 
 {
   imports = [
+    # recettes
     ./base/base.nix
     ./desktop/desktop.nix
+
+    # moulinette de configuration
+    ./config-generator.nix
   ];
 }

base/base.nix

@@ -9,6 +9,14 @@
     ./services.nix
 
     # inclusion conditionnelle
-    ./config-generator.nix
+    ./activation-manuelle/auto-upgrade.nix
+    ./activation-manuelle/laptop.nix
+    ./activation-manuelle/locate.nix
+    ./activation-manuelle/fail2ban.nix
+    ./activation-manuelle/nix-serve-client.nix
+    ./activation-manuelle/nix-serve-server.nix
+    ./activation-manuelle/print.nix
+    ./activation-manuelle/swap.nix
+    ./activation-manuelle/users.nix
   ];
 }

config-generator.nix

@@ -9,19 +9,7 @@ let
   host = config.networking.hostName;
 in
 
-  {
+{
-    imports = [
-      ./activation-manuelle/auto-upgrade.nix
-      ./activation-manuelle/laptop.nix
-      ./activation-manuelle/locate.nix
-      ./activation-manuelle/fail2ban.nix
-      ./activation-manuelle/nix-serve-client.nix
-      ./activation-manuelle/nix-serve-server.nix
-      ./activation-manuelle/print.nix
-      ./activation-manuelle/swap.nix
-      ./activation-manuelle/users.nix
-    ];
-
     ###### interface
 
     options = {
@@ -171,6 +159,10 @@ in
         isPrunetwork = true;
         isServer = true;
       };
+
+      r6d.config-generator = {
+        docker = true;
+      };
     })
     (mkIf comp.isRadx {
       r6d.profiles = {

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
+    texLiveFull   # distribution LaTeX
-    texLive       # distribution LaTeX de base
+    #texLive       # distribution LaTeX de base
-    texLiveBeamer # paquets et extensions pour Beamer
+    #texLiveBeamer # paquets et extensions pour Beamer
-    texLiveModerncv # paquets pour la classe Modern CV
+    #texLiveModerncv # paquets pour la classe Modern CV
   ];
 }

desktop/app-cartographie.nix

@@ -11,7 +11,10 @@ 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
   ];
 }

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 ];
+    };
+  }
+