From feff9ac4b434b8d6bbc47deb79c5fd1204f64157 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Oct 2024 03:32:00 +0000 Subject: [PATCH] geoserver: 2.25.3 -> 2.26.0 --- pkgs/by-name/ge/geoserver/extensions.nix | 204 +++++++++++------------ pkgs/by-name/ge/geoserver/package.nix | 4 +- 2 files changed, 104 insertions(+), 104 deletions(-) diff --git a/pkgs/by-name/ge/geoserver/extensions.nix b/pkgs/by-name/ge/geoserver/extensions.nix index 5fbecd9da070..1cc81f0f137c 100644 --- a/pkgs/by-name/ge/geoserver/extensions.nix +++ b/pkgs/by-name/ge/geoserver/extensions.nix @@ -29,325 +29,325 @@ in { app-schema = mkGeoserverExtension { name = "app-schema"; - version = "2.25.3"; # app-schema - hash = "sha256-IvcJAu62wXAh5OQkG3cTUB/X7dc/2q6Le7GSwfJL/sA="; # app-schema + version = "2.26.0"; # app-schema + hash = "sha256-HOjhM9WI7lsqUNrozLB2oI6szqm+Cb7VqC0Hy9NlNMU="; # app-schema }; authkey = mkGeoserverExtension { name = "authkey"; - version = "2.25.3"; # authkey - hash = "sha256-4tEu9JOomMN/ntDHLqEwrn9lPrJ4LjTM/VuMsjARbF0="; # authkey + version = "2.26.0"; # authkey + hash = "sha256-34U3zq/SKm21fZV80+04N/0ygqShdYVMeQNuqtMSXgQ="; # authkey }; cas = mkGeoserverExtension { name = "cas"; - version = "2.25.3"; # cas - hash = "sha256-Am8tgF5APKuTa7XI7aI9Oq9jAiDPfJhGCXErtyPpDS8="; # cas + version = "2.26.0"; # cas + hash = "sha256-mosawsZkCKOm03CFg9poJ+XwbbGhvNt8AsxnegW59H4="; # cas }; charts = mkGeoserverExtension { name = "charts"; - version = "2.25.3"; # charts - hash = "sha256-0Vu9ldBYWe4vFQ6ftEO/WsmNz3Sf3W8iPS7t9W/+5fY="; # charts + version = "2.26.0"; # charts + hash = "sha256-rPnY9zYgdRoud2I2hcxnODDE/2gsBTMgTPrGAwDdrbM="; # charts }; control-flow = mkGeoserverExtension { name = "control-flow"; - version = "2.25.3"; # control-flow - hash = "sha256-zH+Hz7SySKRdrrmMBukXkaCziszIwOqzSmGYXWZGxs4="; # control-flow + version = "2.26.0"; # control-flow + hash = "sha256-4Kl0SgKW8MifMVY1+Aa9Ve0WufjHFQejobhQfnwGwbw="; # control-flow }; css = mkGeoserverExtension { name = "css"; - version = "2.25.3"; # css - hash = "sha256-c3VDxTGZebGCPfYhwUyENoGiDmVa1zttJEi/879RPsc="; # css + version = "2.26.0"; # css + hash = "sha256-CUG5cBxW/PyP/M2I5/1wC1UndzWSIg8aKeETtUnrH5A="; # css }; csw = mkGeoserverExtension { name = "csw"; - version = "2.25.3"; # csw - hash = "sha256-8G7GY5n0bV/xvwUkTijHLnsXBD4MczIastdeGmFcfSc="; # csw + version = "2.26.0"; # csw + hash = "sha256-ABNFf6grpU97nd81H/s8Gfd1G9mxMwVdUduubLWrsRE="; # csw }; csw-iso = mkGeoserverExtension { name = "csw-iso"; - version = "2.25.3"; # csw-iso - hash = "sha256-cSY981K9QiY3YJJR1zBCQArJESZO+80oIa/uj+qTsTM="; # csw-iso + version = "2.26.0"; # csw-iso + hash = "sha256-dKyVP5FuJ0Tl2z4veMeIJO66dBucfZo6qH+WvSBQ1Es="; # csw-iso }; db2 = mkGeoserverExtension { name = "db2"; - version = "2.25.3"; # db2 - hash = "sha256-0eRiLoPIWv5Bddi9RxRkxAVMSolZCpv1kKEK7FkQrXs="; # db2 + version = "2.26.0"; # db2 + hash = "sha256-L0Xrc0MuSiezKk7l4P4lm3phRou79neQds4Yu2VG5DY="; # db2 }; # Needs wps extension. dxf = mkGeoserverExtension { name = "dxf"; - version = "2.25.3"; # dxf - hash = "sha256-0i2F9343IhN6LZMdTj/dSP5k5QXd7Si/8ZWbxmkcdD4="; # dxf + version = "2.26.0"; # dxf + hash = "sha256-OtpYej/MxqeoMBw17Ltr9l5iOGUa91L30hgBz6ZbD+Y="; # dxf }; excel = mkGeoserverExtension { name = "excel"; - version = "2.25.3"; # excel - hash = "sha256-N7OCXq1HRwV1poPImct7T9ZWdbWWYprSBMarGXx33OI="; # excel + version = "2.26.0"; # excel + hash = "sha256-UHIVJnUJnzPDJWsrQw9YasUedpLujKr9s3VJtSgESHY="; # excel }; feature-pregeneralized = mkGeoserverExtension { name = "feature-pregeneralized"; - version = "2.25.3"; # feature-pregeneralized - hash = "sha256-R1jv7GPT3f7D18gQoWcLXqhtULtUvA3wEeXC2Q0+eQg="; # feature-pregeneralized + version = "2.26.0"; # feature-pregeneralized + hash = "sha256-WT1TsHcYoxJK0LWsF4h8VdUGxIecx9SuIqWoA9JjZfA="; # feature-pregeneralized }; # Note: The extension name ("gdal") clashes with pkgs.gdal. gdal = mkGeoserverExtension { name = "gdal"; - version = "2.25.3"; # gdal + version = "2.26.0"; # gdal buildInputs = [ pkgs.gdal ]; - hash = "sha256-n6B/FHpul29MTYuBsg0XNfTTANBXw/cSEolzIabhHA8="; # gdal + hash = "sha256-lGyBxRCz5DvDQUNQmsk1+DfArwx3kcMoSgQq+O/DqZc="; # gdal }; # Throws "java.io.FileNotFoundException: URL [jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties] cannot be resolved to absolute file path because it does not reside in the file system: jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties" but seems to work out of the box. #geofence = mkGeoserverExtension { # name = "geofence"; - # version = "2.25.3"; # geofence - # hash = "sha256-298rEz0JmFhXxfv0tpdsDOrFLyS7GcuFwp/tX/m+SyI="; # geofence + # version = "2.26.0"; # geofence + # hash = "sha256-Io71mNpUu15klMWFHCaFfRmxPUGGTASZE7MZWyv2TDQ="; # geofence #}; #geofence-server = mkGeoserverExtension { # name = "geofence-server"; - # version = "2.25.3"; # geofence-server - # hash = "sha256-PHP6OmulBbUJ1Q7qliYXX6fAA2C8q4h4i7qCXJpVUCQ="; # geofence-server + # version = "2.26.0"; # geofence-server + # hash = "sha256-UPRupgj9La/JWAneGeM+UdCvnkcW3ZTe7c1bYZRURGI="; # geofence-server #}; #geofence-wps = mkGeoserverExtension { # name = "geofence-wps"; - # version = "2.25.3"; # geofence-wps - # hash = "sha256-vH7gQsjfAEcpcM+JVRfbw5sH4eJz+051FBrmoS7MyYo="; # geofence-wps + # version = "2.26.0"; # geofence-wps + # hash = "sha256-SA7nWTyawzDZVsOATRLW/MQQfyXWhHQif3/4MdVogBM="; # geofence-wps #}; geopkg-output = mkGeoserverExtension { name = "geopkg-output"; - version = "2.25.3"; # geopkg-output - hash = "sha256-frcNjS+phsyuRo4PlmcSUu2Ylp3kHA8OYm+WCBAU/UI="; # geopkg-output + version = "2.26.0"; # geopkg-output + hash = "sha256-SKIInEC9TI2FBtduGHi3apZip5ubA4/ip58+w0O1a38="; # geopkg-output }; grib = mkGeoserverExtension { name = "grib"; - version = "2.25.3"; # grib - hash = "sha256-uQ7xe3sokrE89QTfTLynHSHE0W6LmiICO3XKkWKEJBU="; # grib + version = "2.26.0"; # grib + hash = "sha256-5Hn6LUxsCP5YvVsMgh6m/oMBJuIo2Y9XdbSRQAJm+vI="; # grib buildInputs = [ netcdf ]; }; gwc-s3 = mkGeoserverExtension { name = "gwc-s3"; - version = "2.25.3"; # gwc-s3 - hash = "sha256-1cc3JywXaCCQUojnTVYmkq9Gz5Y1atBJmd0GDhyGAIE="; # gwc-s3 + version = "2.26.0"; # gwc-s3 + hash = "sha256-www+MTFlkmJ6GeGd3v8uGTYV7PYVg5pIS9/2s1D6YeU="; # gwc-s3 }; h2 = mkGeoserverExtension { name = "h2"; - version = "2.25.3"; # h2 - hash = "sha256-Cp/3qrjNSKztAaMrxPoZo2YfGBEezLQp6/ZGOehkixM="; # h2 + version = "2.26.0"; # h2 + hash = "sha256-+Y7pILmnz51c5eO+OdqHGLD05fEqaM3vkFU7s0UiA2g="; # h2 }; iau = mkGeoserverExtension { name = "iau"; - version = "2.25.3"; # iau - hash = "sha256-MV/XYF61rQjuOJSU6n0ADauFYJGF0cZk4lMSoHs9drg="; # iau + version = "2.26.0"; # iau + hash = "sha256-5oM3JxD6HKVhq1/IxXWck1MtQ8KwsLtf+LQACpvdKMA="; # iau }; importer = mkGeoserverExtension { name = "importer"; - version = "2.25.3"; # importer - hash = "sha256-T6PGv3zfiwA8DE2XZ2CusaQ0vRGZ75mO4nxONsCQU+g="; # importer + version = "2.26.0"; # importer + hash = "sha256-HFBIEB8pgVaCMF34Z0Clp3+nk2h4Va0xV2ptSZUSx9I="; # importer }; inspire = mkGeoserverExtension { name = "inspire"; - version = "2.25.3"; # inspire - hash = "sha256-A4BBd0Q8NVjPLI6e8HTCg5zd4QOLQ6Ho3/2hnRXCeTM="; # inspire + version = "2.26.0"; # inspire + hash = "sha256-uIryr4WQbWdAMjqATGf0txp1sZWWABSMv8o2xiKaWiI="; # inspire }; # Needs Kakadu plugin from # https://github.com/geosolutions-it/imageio-ext #jp2k = mkGeoserverExtension { # name = "jp2k"; - # version = "2.25.3"; # jp2k - # hash = "sha256-0df5vPLYqxPAxqINwdWZ5RRJQVm/79sUcj8fB4RwMKY="; # jp2k + # version = "2.26.0"; # jp2k + # hash = "sha256-gPipm6hnkIyEU3a8NbSCm5QUSF+IKNHgt5DNFsvC++c="; # jp2k #}; libjpeg-turbo = mkGeoserverExtension { name = "libjpeg-turbo"; - version = "2.25.3"; # libjpeg-turbo - hash = "sha256-vQjeYuB6JY+bMlxRXZ7HqgS2hEtmEJJvowfwhWmYkY4="; # libjpeg-turbo + version = "2.26.0"; # libjpeg-turbo + hash = "sha256-I1Ojsgd+gRjSJJkx9wSfzJfVq5z3vgxA4zynZvVd4jU="; # libjpeg-turbo buildInputs = [ libjpeg.out ]; }; mapml = mkGeoserverExtension { name = "mapml"; - version = "2.25.3"; # mapml - hash = "sha256-3BMCWeAFn52Uiob53eer5OqBLOgQaMTmHPFTLs51mEg="; # mapml + version = "2.26.0"; # mapml + hash = "sha256-VGg/3cB+KUwZtbKQUoU4NURDjcANzQpPv4ZWeCzwkq0="; # mapml }; mbstyle = mkGeoserverExtension { name = "mbstyle"; - version = "2.25.3"; # mbstyle - hash = "sha256-SJAI4ssMZZL75gx1h7gwf+4YwXP/CNEm9BTtA/JNRW4="; # mbstyle + version = "2.26.0"; # mbstyle + hash = "sha256-Z5CNKP2fqMcw6prP/b84tOAPYwlLiFsbV26VdVnqFns="; # mbstyle }; metadata = mkGeoserverExtension { name = "metadata"; - version = "2.25.3"; # metadata - hash = "sha256-Gst1cctv/oKTS+jD0y8fHFrEBJyn77fEafV+QzspQVc="; # metadata + version = "2.26.0"; # metadata + hash = "sha256-6E9Z6WqCQxlDL3w1FiI+gOzjQ4ZyS5oucj1/02W4k4Y="; # metadata }; mongodb = mkGeoserverExtension { name = "mongodb"; - version = "2.25.3"; # mongodb - hash = "sha256-LVejtipIRZy3g5GKs8RkOqKHNRskf8YSD11fiFvBF3w="; # mongodb + version = "2.26.0"; # mongodb + hash = "sha256-thfgMeDrDb2rPh9h9R2AgYYWPBHcEG/sI4UhNBb/DfQ="; # mongodb }; monitor = mkGeoserverExtension { name = "monitor"; - version = "2.25.3"; # monitor - hash = "sha256-+FlKgoESE0j6JXM0yozYMyz6U2TshYNd6WHsKg9frAs="; # monitor + version = "2.26.0"; # monitor + hash = "sha256-vgeqZXzb8nz7daAeur1JMLS0Rospgyx+v9n687000EE="; # monitor }; mysql = mkGeoserverExtension { name = "mysql"; - version = "2.25.3"; # mysql - hash = "sha256-gfU67lID2YSNbi1aB8m1b+zGqtVnChi56HrtcBE6Aqw="; # mysql + version = "2.26.0"; # mysql + hash = "sha256-PCNCyqJwOK6P6sDWVMdV6gGXgHJOPw97cqkjaixZxwQ="; # mysql }; netcdf = mkGeoserverExtension { name = "netcdf"; - version = "2.25.3"; # netcdf - hash = "sha256-aMykYIBMwH46apDudKnApNba454Yep5HZeYPqEXoqcI="; # netcdf + version = "2.26.0"; # netcdf + hash = "sha256-0i/zmiIE+xjec6dOd237MdIBrCspZEL+8h1c/g0h7oU="; # netcdf buildInputs = [ netcdf ]; }; netcdf-out = mkGeoserverExtension { name = "netcdf-out"; - version = "2.25.3"; # netcdf-out - hash = "sha256-3gGzgC7IbwpettwSf4+b8HeJRuvkUfDu0xre9wyVap4="; # netcdf-out + version = "2.26.0"; # netcdf-out + hash = "sha256-xl2mY9QYSVeC2k43H2GFz2D56rajCT9FlpP47Q8aOe8="; # netcdf-out buildInputs = [ netcdf ]; }; ogr-wfs = mkGeoserverExtension { name = "ogr-wfs"; - version = "2.25.3"; # ogr-wfs + version = "2.26.0"; # ogr-wfs buildInputs = [ pkgs.gdal ]; - hash = "sha256-4rcUvN1py62JMQy51rxvNfV2AQIptXuRen7tvbrno6s="; # ogr-wfs + hash = "sha256-LiB+BE2Q3a2US7HJkBWT0Z9AMZ3A3M584qbEV1uhhEM="; # ogr-wfs }; # Needs ogr-wfs extension. ogr-wps = mkGeoserverExtension { name = "ogr-wps"; - version = "2.25.3"; # ogr-wps + version = "2.26.0"; # ogr-wps # buildInputs = [ pkgs.gdal ]; - hash = "sha256-RA1dxzjhOt7lQCu6SVSM8HiXYwtFbUfj0hdk831QE5g="; # ogr-wps + hash = "sha256-0o4cD8wv1Km5pljxAlokVRVEfMbklXgkYhxFZqPdROk="; # ogr-wps }; oracle = mkGeoserverExtension { name = "oracle"; - version = "2.25.3"; # oracle - hash = "sha256-fKJwLh4T445da1AWPzFpp++LGWiiKhN339VWt1N0s5Q="; # oracle + version = "2.26.0"; # oracle + hash = "sha256-mxc46ctIh7imjQgTI2zZ9gwtgDF6GkE/b5IogUktF9Y="; # oracle }; params-extractor = mkGeoserverExtension { name = "params-extractor"; - version = "2.25.3"; # params-extractor - hash = "sha256-zO9OwH7NCUILnxRqz1z/QJdfgsx9gfpf2R7rIsgTIr8="; # params-extractor + version = "2.26.0"; # params-extractor + hash = "sha256-dLzEdnNy+Nrxkc4aBCGTESuReW6mkgXEpXDo9rDzsBU="; # params-extractor }; printing = mkGeoserverExtension { name = "printing"; - version = "2.25.3"; # printing - hash = "sha256-QAy53/p+/mjCTXreKsVSRcpYgfAs7W9f+ZwE4Z6Gnx8="; # printing + version = "2.26.0"; # printing + hash = "sha256-31T/tizxkmzYbxR1eLiY3DanwlFVdeZvFOESgBnuG1A="; # printing }; pyramid = mkGeoserverExtension { name = "pyramid"; - version = "2.25.3"; # pyramid - hash = "sha256-kFTNQrxibatVZzPSC6Rv/SzU3FUJYQJ3dHZ5AfR3kD8="; # pyramid + version = "2.26.0"; # pyramid + hash = "sha256-lpDexw5nd1jm9cDFsQ/qXdwbX5vTD0RXKIAOg6dKQqE="; # pyramid }; querylayer = mkGeoserverExtension { name = "querylayer"; - version = "2.25.3"; # querylayer - hash = "sha256-TgQiroYcnVCe5QVIcEa8gsgYELqM2jS7RveGyetWokU="; # querylayer + version = "2.26.0"; # querylayer + hash = "sha256-ajrNJ0eG0pp+v/f4N5kxcUzYOyXuLhMRzvdfdiJh0Vk="; # querylayer }; sldservice = mkGeoserverExtension { name = "sldservice"; - version = "2.25.3"; # sldservice - hash = "sha256-5E410iNaZVEBKzRGSBcW3JNISap2NrcFtXAuP1+cVt0="; # sldservice + version = "2.26.0"; # sldservice + hash = "sha256-xxpKSDghK+Xz8buPU5lzEa7eiG5A0rPgzCaIO9GKCMY="; # sldservice }; sqlserver = mkGeoserverExtension { name = "sqlserver"; - version = "2.25.3"; # sqlserver - hash = "sha256-TNeyegWOz/a7uFsn1hBhOgpV0vnFncwQ+U9VqyY62+g="; # sqlserver + version = "2.26.0"; # sqlserver + hash = "sha256-UwZ4ho+HG+ocwri+N4ebTATGcT4tukAxwvx84rP0VWk="; # sqlserver }; vectortiles = mkGeoserverExtension { name = "vectortiles"; - version = "2.25.3"; # vectortiles - hash = "sha256-RQGeGhfixKrwRuzgmkZ/JDWaPZyDy8fAfGe0iXZfKdY="; # vectortiles + version = "2.26.0"; # vectortiles + hash = "sha256-rlQcWLEPvaKDT6JZ0RuZtaHz1bgtsblFOybKOVqDSVM="; # vectortiles }; wcs2_0-eo = mkGeoserverExtension { name = "wcs2_0-eo"; - version = "2.25.3"; # wcs2_0-eo - hash = "sha256-+li0zBzyHaq0an7qHAdSXKDpvpOZProHnCoHXjyVY7Y="; # wcs2_0-eo + version = "2.26.0"; # wcs2_0-eo + hash = "sha256-Ky+unKH+WBMvo/rlNPv2Uca3X610yXZvCy0/5KEN6wk="; # wcs2_0-eo }; web-resource = mkGeoserverExtension { name = "web-resource"; - version = "2.25.3"; # web-resource - hash = "sha256-m9+t3Q2yD+xqvuBvkc5jYWwtGqJit00xiHyDSLX8euE="; # web-resource + version = "2.26.0"; # web-resource + hash = "sha256-S7Wu4wGo2j8PcBC8VS7EECBlr7NN1hALC1VOM5b6Wk0="; # web-resource }; wmts-multi-dimensional = mkGeoserverExtension { name = "wmts-multi-dimensional"; - version = "2.25.3"; # wmts-multi-dimensional - hash = "sha256-b/16463iotuADA/bIwTutYCiRZYusMf/yB1xEMPZe9U="; # wmts-multi-dimensional + version = "2.26.0"; # wmts-multi-dimensional + hash = "sha256-BNigZB16d1BKRTl/UJs1oWYFKn/cFk5WX1fBwvC046I="; # wmts-multi-dimensional }; wps = mkGeoserverExtension { name = "wps"; - version = "2.25.3"; # wps - hash = "sha256-4WqZqfc80Qy3AACOb3MhDjocM02vKUEk9x8YfX5onyg="; # wps + version = "2.26.0"; # wps + hash = "sha256-HVTDMqG23Ign7qottKRo1PtQNr6606nV34SRopAMO1Q="; # wps }; # Needs hazelcast (https://github.com/hazelcast/hazelcast (?)) which is not # available in nixpgs as of 2024/01. #wps-cluster-hazelcast = mkGeoserverExtension { # name = "wps-cluster-hazelcast"; - # version = "2.25.3"; # wps-cluster-hazelcast - # hash = "sha256-EDSSNVCZdcmv8ZfB3Gj80xm/ghlWNZwpTYhEwIoegM0="; # wps-cluster-hazelcast + # version = "2.26.0"; # wps-cluster-hazelcast + # hash = "sha256-R0Btbf6BNwGKC2TQ6BmSte612Sel7NspOX9KU+zsHBc="; # wps-cluster-hazelcast #}; wps-download = mkGeoserverExtension { name = "wps-download"; - version = "2.25.3"; # wps-download - hash = "sha256-70vw5PHh1hLLAocFKlzPKDZWMjQmwUbv/L4yCJGrDQ4="; # wps-download + version = "2.26.0"; # wps-download + hash = "sha256-sVbAi0y8n2shox6TX0Y4Hg5GhYakv5+tgloMix6Wbfg="; # wps-download }; # Needs Postrgres configuration or similar. # See https://docs.geoserver.org/main/en/user/extensions/wps-jdbc/index.html wps-jdbc = mkGeoserverExtension { name = "wps-jdbc"; - version = "2.25.3"; # wps-jdbc - hash = "sha256-5d+txy1gw36G7hXfOf5qH+bSPIRw3XeLeMCTw6yHp/M="; # wps-jdbc + version = "2.26.0"; # wps-jdbc + hash = "sha256-iJk24m4UDwK1PrU0PiCDPGj0eK7EEQajUFyl+9aIGpE="; # wps-jdbc }; ysld = mkGeoserverExtension { name = "ysld"; - version = "2.25.3"; # ysld - hash = "sha256-lbjfJPv9v4HUV31Hp5ZAEOe7IceRCxN7xtUxvOi2CYU="; # ysld + version = "2.26.0"; # ysld + hash = "sha256-/qbtfaIE/4haGeS6U+FML1JI/AyXWFyKOd8tGaYFCmw="; # ysld }; } diff --git a/pkgs/by-name/ge/geoserver/package.nix b/pkgs/by-name/ge/geoserver/package.nix index 76a68eea8c3a..15567ea5ca4e 100644 --- a/pkgs/by-name/ge/geoserver/package.nix +++ b/pkgs/by-name/ge/geoserver/package.nix @@ -9,11 +9,11 @@ }: stdenv.mkDerivation (finalAttrs: rec { pname = "geoserver"; - version = "2.25.3"; + version = "2.26.0"; src = fetchurl { url = "mirror://sourceforge/geoserver/GeoServer/${version}/geoserver-${version}-bin.zip"; - hash = "sha256-EmW3i0qi7P48AftCz7tqI2Wtvdy3cpyR57+s42dYwt8="; + hash = "sha256-WeItL0j50xWYXIFmH4EFhHjxv9Xr6rG0YO8re1jUnNM="; }; patches = [