From 1f4d19e2860c5d961245229f413521d0f45c3a1c Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Sat, 27 Sep 2025 19:51:33 +0200 Subject: [PATCH] dcw-gmt: 2.1.2 -> 2.2.0 and switch to github --- pkgs/by-name/dc/dcw-gmt/package.nix | 33 +++++++++++++++++------------ 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/dc/dcw-gmt/package.nix b/pkgs/by-name/dc/dcw-gmt/package.nix index c99acb2d29ef..c0b17fd92bf0 100644 --- a/pkgs/by-name/dc/dcw-gmt/package.nix +++ b/pkgs/by-name/dc/dcw-gmt/package.nix @@ -1,15 +1,18 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, }: stdenv.mkDerivation (finalAttrs: { pname = "dcw-gmt"; - version = "2.1.2"; - src = fetchurl { - url = "ftp://ftp.soest.hawaii.edu/gmt/dcw-gmt-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-S7hA0HXIuj4UrrQc8XwkI2v/eHVmMU+f91irmXd0XZk="; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "GenericMappingTools"; + repo = "dcw-gmt"; + tag = finalAttrs.version; + hash = "sha256-OgFonNbhvzRfQZksnwIbgASbMGnL0bmD4wkXZBl3kIU="; }; installPhase = '' @@ -18,16 +21,20 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = with lib; { - homepage = "https://www.soest.hawaii.edu/pwessel/dcw/"; + homepage = "https://github.com/GenericMappingTools/dcw-gmt"; description = "Vector basemap of the world, for use with GMT"; longDescription = '' - DCW-GMT is an enhancement to the original 1:1,000,000 scale vector basemap - of the world, available from the Princeton University Digital Map and - Geospatial Information Center. It contains more state boundaries (the - largest 8 countries are now represented) than the original data - source. Information about DCW can be found on Wikipedia - (https://en.wikipedia.org/wiki/Digital_Chart_of_the_World). This data is - for use by GMT, the Generic Mapping Tools. + The Digital Chart of the World is a comprehensive 1:1,000,000 scale vector + basemap of the world. The charts were designed to meet the needs of pilots + and air crews in medium- and low-altitude en route navigation and to + support military operational planning, intelligence briefings, and other + needs. For basic background information about DCW, see the [Wikipedia + entry](http://en.wikipedia.org/wiki/Digital_Chart_of_the_World). + + DCW-GMT is an enhancement to DCW in a few ways: + + - It contains more state boundaries (the largest 8 countries, Great Britain and Norway are now represented). + - The data have been reformatted to save space and are distributed as a single deflated netCDF-4 file. ''; license = licenses.lgpl3Plus; maintainers = with lib.maintainers; [ tviti ];