commit 5cd1238be91a203f1a8bfb87feda95a5fd37472c · pyrox.dev/nixpkgs

+16

pkgs/by-name/co/comaps/fix-editor-tests.patch

···

       1
       1
       +
       diff --git a/libs/editor/CMakeLists.txt b/libs/editor/CMakeLists.txt

     

       2
       2
       +
       index c96cf4c6..9fc2a210 100644

     

       3
       3
       +
       --- a/libs/editor/CMakeLists.txt

     

       4
       4
       +
       +++ b/libs/editor/CMakeLists.txt

     

       5
       5
       +
       @@ -35,6 +35,11 @@ set(SRC

     

       6
       6
       +
          yes_no_unknown.hpp

     

       7
       7
       +
        )

     

       8
       8
       +
       

     

       9
       9
       +
       +if (NOT (SKIP_TOOLS AND SKIP_TESTS))

     

       10
       10
       +
       +  # Used in both tests and some tools.

     

       11
       11
       +
       +  add_subdirectory(editor_tests_support)

     

       12
       12
       +
       +endif()

     

       13
       13
       +
       +

     

       14
       14
       +
        omim_add_library(${PROJECT_NAME} ${SRC})

     

       15
       15
       +
       

     

       16
       16
       +
        target_link_libraries(${PROJECT_NAME}

+8 -5

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

···

       15
       15
        
         nix-update-script,

     

       16
       16
        
       }:

     

       17
       17
        
       let

     

       18
       18
       -
         mapRev = 250804;

     

       18
       18
       +
         mapRev = 250822;

     

       19
       19
        
       

     

       20
       20
        
         worldMap = fetchurl {

     

       21
       21
        
           url = "https://cdn-fi-1.comaps.app/maps/${toString mapRev}/World.mwm";

     

       22
       22
       -
           hash = "sha256-xYMH3y0Y6sSXYUTpy+A5YCyb+n5YChOXhyDvUFqXxZ0=";

     

       22
       22
       +
           hash = "sha256-OksUAix8yw0WQiJUwfMrjOCd/OwuRjdCOUjjGpnG2S8=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         worldCoasts = fetchurl {

     

       26
       26
        
           url = "https://cdn-fi-1.comaps.app/maps/${toString mapRev}/WorldCoasts.mwm";

     

       27
       27
       -
           hash = "sha256-2vc4kkNX9bRTqXYlALfwVwOlvr122kvUk7pUyM91vjc=";

     

       27
       27
       +
           hash = "sha256-1OvKZJ3T/YJu6t/qTYliIVkwsT8toBSqGHUpDEk9i2k=";

     

       28
       28
        
         };

     

       29
       29
        
       in

     

       30
       30
        
       organicmaps.overrideAttrs (oldAttrs: rec {

     

       31
       31
        
         pname = "comaps";

     

       32
       32
       -
         version = "2025.08.13-8";

     

       32
       32
       +
         version = "2025.08.31-15";

     

       33
       33
        
       

     

       34
       34
        
         src = fetchFromGitea {

     

       35
       35
        
           domain = "codeberg.org";

     

       36
       36
        
           owner = "comaps";

     

       37
       37
        
           repo = "comaps";

     

       38
       38
        
           tag = "v${version}";

     

       39
       39
       -
           hash = "sha256-kvE3H+siV/8v4WgsG1Ifd4gMMwGLqz28oXf1hB9gQ2Q=";

     

       39
       39
       +
           hash = "sha256-uRShcyMevNb/UE5+l8UabiGSr9TccVWp5xVoqI7+Oh8=";

     

       40
       40
        
           fetchSubmodules = true;

     

       41
       41
        
         };

     

       42
       42
        
       

     

       43
       43
        
         patches = [

     

       44
       44
        
           ./remove-lto.patch

     

       45
       45
        
           ./use-vendored-protobuf.patch

     

       46
       46
       +
       

     

       47
       47
       +
           # Include missing editor_tests_support.

     

       48
       48
       +
           ./fix-editor-tests.patch

     

       46
       49
        
         ];

     

       47
       50
        
       

     

       48
       51
        
         postPatch = (oldAttrs.postPatch or "") + ''