comaps: 2025.08.31-15 -> 2025.10.16-1 (#450131) (8255ca7b) · Commits · nix / nixpkgs

pkgs/by-name/co/comaps/package.nix

+19 −10

Original line number	Diff line number	Diff line
		@@ -15,28 +15,35 @@
		nix-update-script,
		}:
		let
		mapRev = 250822;
		# https://codeberg.org/comaps/comaps/src/branch/main/data/countries.txt
		mapRev = 250906;

		worldMap = fetchurl {
		url = "https://cdn-fi-1.comaps.app/maps/${toString mapRev}/World.mwm";
		hash = "sha256-OksUAix8yw0WQiJUwfMrjOCd/OwuRjdCOUjjGpnG2S8=";
		hash = "sha256-0LjCDVk3vShmn+yHc/SvfJzrj170pO52CqbdKWqTsI4=";
		};

		worldCoasts = fetchurl {
		url = "https://cdn-fi-1.comaps.app/maps/${toString mapRev}/WorldCoasts.mwm";
		hash = "sha256-1OvKZJ3T/YJu6t/qTYliIVkwsT8toBSqGHUpDEk9i2k=";
		hash = "sha256-2BP6ET8DM3v0KMlzYx+lS0l26WSONQpb4fCMri8Aj2o=";
		};

		pythonEnv = python3.withPackages (
		ps: with ps; [
		protobuf
		]
		);
		in
		organicmaps.overrideAttrs (oldAttrs: rec {
		pname = "comaps";
		version = "2025.08.31-15";
		version = "2025.10.16-1";

		src = fetchFromGitea {
		domain = "codeberg.org";
		owner = "comaps";
		repo = "comaps";
		tag = "v${version}";
		hash = "sha256-uRShcyMevNb/UE5+l8UabiGSr9TccVWp5xVoqI7+Oh8=";
		hash = "sha256-2pnAYc5Ru1OK7ecCN1kKryAPPdxUIGQp9x2y4MosRl8=";
		fetchSubmodules = true;
		};

		@@ -50,14 +57,16 @@ organicmaps.overrideAttrs (oldAttrs: rec {

		postPatch = (oldAttrs.postPatch or "") + ''
		rm -f 3party/boost/b2
		substituteInPlace configure.sh \
		--replace-fail "git submodule update --init --recursive --depth 1" ""

		patchShebangs tools/unix/generate_categories.sh
		substituteInPlace tools/python/categories/json_to_txt.py \
		--replace-fail "/usr/bin/env python3" "${pythonEnv.interpreter}"
		'';

		nativeBuildInputs = (builtins.filter (x: x != python3) oldAttrs.nativeBuildInputs or [ ]) ++ [
		(python3.withPackages (
		ps: with ps; [
		protobuf
		]
		))
		pythonEnv
		optipng
		];

pkgs/by-name/co/comaps/remove-lto.patch

+4 −4

Original line number	Diff line number	Diff line
		diff --git a/CMakeLists.txt b/CMakeLists.txt
		index c559bf5..42ed617 100644
		index 3ba193a9..01e696e3 100644
		--- a/CMakeLists.txt
		+++ b/CMakeLists.txt
		@@ -106,7 +106,7 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
		@@ -104,7 +104,7 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
		elseif (${CMAKE_BUILD_TYPE} MATCHES "Rel")
		add_definitions(-DRELEASE)
		if (NOT MSVC)
		@@ -11,7 +11,7 @@ index c559bf5..42ed617 100644
		endif()
		else()
		message(FATAL_ERROR "Unknown build type: " ${CMAKE_BUILD_TYPE})
		@@ -116,19 +116,6 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
		@@ -114,19 +114,6 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
		add_compile_options(-fno-omit-frame-pointer)
		endif()

		@@ -21,7 +21,7 @@ index c559bf5..42ed617 100644
		- add_compile_options(-fno-fat-lto-objects)
		- # To fix ar and ranlib "plugin needed to handle lto object".
		- string(REGEX MATCH "[0-9]+" GCC_MAJOR_VERSION ${CMAKE_CXX_COMPILER_VERSION})
		- file(GLOB_RECURSE plugin /usr/lib/gcc/*/${GCC_MAJOR_VERSION}/liblto_plugin.so)
		- file(GLOB_RECURSE plugin /usr/lib/gcc//${GCC_MAJOR_VERSION}/liblto_plugin.so)
		- set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> --plugin ${plugin} qcs <TARGET> <OBJECTS>")
		- set(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> --plugin ${plugin} <TARGET>")
		- set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> --plugin ${plugin} qcs <TARGET> <OBJECTS>")

pkgs/by-name/co/comaps/use-vendored-protobuf.patch

+32 −2

Original line number	Diff line number	Diff line
		diff --git a/3party/CMakeLists.txt b/3party/CMakeLists.txt
		index 5178ae0..abe103f 100644
		index dd851d7d..1b4e3ed3 100644
		--- a/3party/CMakeLists.txt
		+++ b/3party/CMakeLists.txt
		@@ -41,9 +41,6 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
		@@ -21,4 +21,34 @@ index 5178ae0..abe103f 100644
		+
		add_subdirectory(agg)
		add_subdirectory(bsdiff-courgette)
		add_subdirectory(minizip)
		add_subdirectory(glaze)
		diff --git a/CMakeLists.txt b/CMakeLists.txt
		index 3ba193a9..dd2df855 100644
		--- a/CMakeLists.txt
		+++ b/CMakeLists.txt
		@@ -225,25 +225,6 @@ endif()
		# Used in qt/ and shaders/
		find_package(Python3 REQUIRED COMPONENTS Interpreter)

		-execute_process(
		- COMMAND ${Python3_EXECUTABLE} -c "import google.protobuf;
		-print(google.protobuf.__version__)"
		- RESULT_VARIABLE PROTOBUF_CHECK
		- OUTPUT_VARIABLE PROTOBUF_VERSION
		- OUTPUT_STRIP_TRAILING_WHITESPACE
		- ERROR_QUIET
		-)
		-
		-if(PROTOBUF_CHECK EQUAL 0)
		- if(PROTOBUF_VERSION VERSION_LESS "4.0.0")
		- message(STATUS "Python protobuf ${PROTOBUF_VERSION} found (< 4.0)")
		- else()
		- message(FATAL_ERROR "Python protobuf ${PROTOBUF_VERSION} found, but version < 4.0 required")
		- endif()
		-else()
		- message(FATAL_ERROR "Python protobuf not found. Install version <4.0")
		-endif()
		-

		add_subdirectory(libs)

Admin message