From 156532fdc0ff066af6b0ad442bdda2649077bd90 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 22 May 2022 02:00:38 +0300 Subject: [PATCH] Move geospatial servers into its own folder --- .../{ => geospatial}/mapcache/default.nix | 0 .../{ => geospatial}/mapserver/default.nix | 0 .../{ => geospatial}/martin/default.nix | 0 .../{ => geospatial}/mbtileserver/default.nix | 0 .../pg_featureserv/default.nix | 0 .../{ => geospatial}/pg_tileserv/default.nix | 0 .../servers/{ => geospatial}/t-rex/default.nix | 0 .../{ => geospatial}/tegola/default.nix | 0 .../{ => geospatial}/tile38/default.nix | 0 pkgs/top-level/all-packages.nix | 18 +++++++++--------- 10 files changed, 9 insertions(+), 9 deletions(-) rename pkgs/servers/{ => geospatial}/mapcache/default.nix (100%) rename pkgs/servers/{ => geospatial}/mapserver/default.nix (100%) rename pkgs/servers/{ => geospatial}/martin/default.nix (100%) rename pkgs/servers/{ => geospatial}/mbtileserver/default.nix (100%) rename pkgs/servers/{ => geospatial}/pg_featureserv/default.nix (100%) rename pkgs/servers/{ => geospatial}/pg_tileserv/default.nix (100%) rename pkgs/servers/{ => geospatial}/t-rex/default.nix (100%) rename pkgs/servers/{ => geospatial}/tegola/default.nix (100%) rename pkgs/servers/{ => geospatial}/tile38/default.nix (100%) diff --git a/pkgs/servers/mapcache/default.nix b/pkgs/servers/geospatial/mapcache/default.nix similarity index 100% rename from pkgs/servers/mapcache/default.nix rename to pkgs/servers/geospatial/mapcache/default.nix diff --git a/pkgs/servers/mapserver/default.nix b/pkgs/servers/geospatial/mapserver/default.nix similarity index 100% rename from pkgs/servers/mapserver/default.nix rename to pkgs/servers/geospatial/mapserver/default.nix diff --git a/pkgs/servers/martin/default.nix b/pkgs/servers/geospatial/martin/default.nix similarity index 100% rename from pkgs/servers/martin/default.nix rename to pkgs/servers/geospatial/martin/default.nix diff --git a/pkgs/servers/mbtileserver/default.nix b/pkgs/servers/geospatial/mbtileserver/default.nix similarity index 100% rename from pkgs/servers/mbtileserver/default.nix rename to pkgs/servers/geospatial/mbtileserver/default.nix diff --git a/pkgs/servers/pg_featureserv/default.nix b/pkgs/servers/geospatial/pg_featureserv/default.nix similarity index 100% rename from pkgs/servers/pg_featureserv/default.nix rename to pkgs/servers/geospatial/pg_featureserv/default.nix diff --git a/pkgs/servers/pg_tileserv/default.nix b/pkgs/servers/geospatial/pg_tileserv/default.nix similarity index 100% rename from pkgs/servers/pg_tileserv/default.nix rename to pkgs/servers/geospatial/pg_tileserv/default.nix diff --git a/pkgs/servers/t-rex/default.nix b/pkgs/servers/geospatial/t-rex/default.nix similarity index 100% rename from pkgs/servers/t-rex/default.nix rename to pkgs/servers/geospatial/t-rex/default.nix diff --git a/pkgs/servers/tegola/default.nix b/pkgs/servers/geospatial/tegola/default.nix similarity index 100% rename from pkgs/servers/tegola/default.nix rename to pkgs/servers/geospatial/tegola/default.nix diff --git a/pkgs/servers/tile38/default.nix b/pkgs/servers/geospatial/tile38/default.nix similarity index 100% rename from pkgs/servers/tile38/default.nix rename to pkgs/servers/geospatial/tile38/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2b8f14efb1b..6eceb41f904a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7671,11 +7671,11 @@ with pkgs; mani = callPackage ../development/tools/mani { }; - mapcache = callPackage ../servers/mapcache { }; + mapcache = callPackage ../servers/geospatial/mapcache { }; - mapserver = callPackage ../servers/mapserver { }; + mapserver = callPackage ../servers/geospatial/mapserver { }; - martin = callPackage ../servers/martin { + martin = callPackage ../servers/geospatial/martin { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -10893,7 +10893,7 @@ with pkgs; tidy-viewer = callPackage ../tools/text/tidy-viewer { }; - tile38 = callPackage ../servers/tile38 { }; + tile38 = callPackage ../servers/geospatial/tile38 { }; tiled = libsForQt5.callPackage ../applications/editors/tiled { }; @@ -11509,7 +11509,7 @@ with pkgs; td = callPackage ../tools/misc/td { }; - tegola = callPackage ../servers/tegola {}; + tegola = callPackage ../servers/geospatial/tegola {}; tftp-hpa = callPackage ../tools/networking/tftp-hpa {}; @@ -13086,7 +13086,7 @@ with pkgs; remarkable2-toolchain = callPackage ../development/tools/misc/remarkable/remarkable2-toolchain { }; - t-rex = callPackage ../servers/t-rex { + t-rex = callPackage ../servers/geospatial/t-rex { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -21959,7 +21959,7 @@ with pkgs; mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { }; - mbtileserver = callPackage ../servers/mbtileserver { }; + mbtileserver = callPackage ../servers/geospatial/mbtileserver { }; memcached = callPackage ../servers/memcached {}; @@ -22201,9 +22201,9 @@ with pkgs; tomcat-native = callPackage ../servers/http/tomcat/tomcat-native.nix { }; - pg_featureserv = callPackage ../servers/pg_featureserv { }; + pg_featureserv = callPackage ../servers/geospatial/pg_featureserv { }; - pg_tileserv = callPackage ../servers/pg_tileserv { }; + pg_tileserv = callPackage ../servers/geospatial/pg_tileserv { }; pies = callPackage ../servers/pies { };