diff --git a/pkgs/by-name/te/tegola/package.nix b/pkgs/by-name/te/tegola/package.nix new file mode 100644 index 000000000000..f4847781f04f --- /dev/null +++ b/pkgs/by-name/te/tegola/package.nix @@ -0,0 +1,48 @@ +{ lib, buildGoModule, buildNpmPackage, fetchFromGitHub }: +let + version = "0.20.0"; + + src = fetchFromGitHub { + owner = "go-spatial"; + repo = "tegola"; + rev = "v${version}"; + sha256 = "sha256-Jlpw3JaU5+DO7Z5qruEMoLRf95cPGd9Z+MeDGSgbMjc="; + }; + + frontend = buildNpmPackage { + pname = "tegola-ui"; + inherit version; + + src = "${src}/ui"; + + npmDepsHash = "sha256-rhUdWt1X5/F0uvT8gI1T9ei6Y+HK1tKj2fuTKlMAwJk="; + + installPhase = '' + cp -r dist $out + ''; + }; +in +buildGoModule { + pname = "tegola"; + inherit version src; + + vendorHash = null; + + subPackages = [ "cmd/tegola" ]; + + ldflags = [ "-s" "-w" "-X github.com/go-spatial/tegola/internal/build.Version=${version}" ]; + + preBuild = '' + rm -rf ui/dist + cp -r ${frontend} ui/dist + go generate ./server + ''; + + meta = with lib; { + homepage = "https://www.tegola.io/"; + description = "Mapbox Vector Tile server"; + mainProgram = "tegola"; + maintainers = with maintainers; teams.geospatial.members ++ [ ingenieroariel ]; + license = licenses.mit; + }; +} diff --git a/pkgs/servers/geospatial/tegola/default.nix b/pkgs/servers/geospatial/tegola/default.nix deleted file mode 100644 index db6659172d05..000000000000 --- a/pkgs/servers/geospatial/tegola/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "tegola"; - version = "0.19.0"; - - src = fetchFromGitHub { - owner = "go-spatial"; - repo = "tegola"; - rev = "v${version}"; - sha256 = "sha256-Z72QANnkAOg0le6p0lFJUhlgE/U32Ao+M/yog00gSF4="; - }; - - vendorHash = null; - - subPackages = [ "cmd/tegola" ]; - - ldflags = [ "-s" "-w" "-X github.com/go-spatial/tegola/internal/build.Version=${version}" ]; - - meta = with lib; { - homepage = "https://www.tegola.io/"; - description = "Mapbox Vector Tile server"; - mainProgram = "tegola"; - maintainers = with maintainers; [ ingenieroariel ]; - license = licenses.mit; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6e6d9754569..d8856acaab06 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27042,8 +27042,6 @@ with pkgs; pg_tileserv = callPackage ../servers/geospatial/pg_tileserv { }; - tegola = callPackage ../servers/geospatial/tegola { }; - tile38 = callPackage ../servers/geospatial/tile38 { }; ### OS-SPECIFIC