From d2636f9978302a5aaa8b7adcc8bb45257b649f32 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 6 Feb 2025 15:18:45 +0100 Subject: [PATCH 1/2] spatialite_tools: adopt package under geospatial team --- pkgs/by-name/sp/spatialite_tools/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sp/spatialite_tools/package.nix b/pkgs/by-name/sp/spatialite_tools/package.nix index 03deae8f639cf..958c5f845ac53 100644 --- a/pkgs/by-name/sp/spatialite_tools/package.nix +++ b/pkgs/by-name/sp/spatialite_tools/package.nix @@ -58,16 +58,16 @@ stdenv.mkDerivation rec { version = "${libspatialite.version}"; }; - meta = with lib; { + meta = { description = "Complete sqlite3-compatible CLI front-end for libspatialite"; homepage = "https://www.gaia-gis.it/fossil/spatialite-tools"; - license = with licenses; [ + license = with lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ]; - platforms = platforms.unix; - maintainers = with maintainers; [ dotlambda ]; + platforms = lib.platforms.unix; + maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ dotlambda ]); mainProgram = "spatialite_tool"; }; } From c59f85e660f352570910c4d1ae31c164a9a63c60 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 6 Feb 2025 15:31:09 +0100 Subject: [PATCH 2/2] spatialite_tools: rename package to spatialite-tools --- .../sp/{spatialite_tools => spatialite-tools}/package.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) rename pkgs/by-name/sp/{spatialite_tools => spatialite-tools}/package.nix (96%) diff --git a/pkgs/by-name/sp/spatialite_tools/package.nix b/pkgs/by-name/sp/spatialite-tools/package.nix similarity index 96% rename from pkgs/by-name/sp/spatialite_tools/package.nix rename to pkgs/by-name/sp/spatialite-tools/package.nix index 958c5f845ac53..b19c2f08a648d 100644 --- a/pkgs/by-name/sp/spatialite_tools/package.nix +++ b/pkgs/by-name/sp/spatialite-tools/package.nix @@ -15,7 +15,7 @@ readosm, sqlite, testers, - spatialite_tools, + spatialite-tools, }: stdenv.mkDerivation rec { @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru.tests.version = testers.testVersion { - package = spatialite_tools; + package = spatialite-tools; command = "! spatialite_tool --version"; version = "${libspatialite.version}"; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c60b89cd46490..68e65cd3d3087 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1287,6 +1287,7 @@ mapAliases { SPAdes = spades; # Added 2024-06-12 spark2014 = gnatprove; # Added 2024-02-25 spatialite_gui = throw "spatialite_gui has been renamed to spatialite-gui"; # Added 2025-01-12 + spatialite_tools = throw "spatialite_tools has been renamed to spatialite-tools"; # Added 2025-02-06 # Added 2020-02-10 sourceHanSansPackages = {