commit a95f58cca4fa5d4ef2032d16e65f1be8ed7dfbe3 · pyrox.dev/nixpkgs

+3 -3

pkgs/development/compilers/llvm/19/clang/gnu-install-dirs.patch

···

       46
       46
        
                             DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/${lib})

     

       47
       47
        
          list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/${lib})

     

       48
       48
        
          install(FILES lib/libscanbuild/${lib}

     

       49
       49
       -
       -          DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild

     

       49
       49
       +
       -          DESTINATION lib/libscanbuild

     

       50
       50
        
       +          DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild"

     

       51
       51
        
                  COMPONENT scan-build-py)

     

       52
       52
        
        endforeach()

     
···

       55
       55
        
                             DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/resources/${resource})

     

       56
       56
        
          list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/resources/${resource})

     

       57
       57
        
          install(FILES lib/libscanbuild/resources/${resource}

     

       58
       58
       -
       -          DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild/resources

     

       58
       58
       +
       -          DESTINATION lib/libscanbuild/resources

     

       59
       59
        
       +          DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild/resources"

     

       60
       60
        
                  COMPONENT scan-build-py)

     

       61
       61
        
        endforeach()

     
···

       64
       64
        
                             DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libear/${lib})

     

       65
       65
        
          list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libear/${lib})

     

       66
       66
        
          install(FILES lib/libear/${lib}

     

       67
       67
       -
       -          DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libear

     

       67
       67
       +
       -          DESTINATION lib/libear

     

       68
       68
        
       +          DESTINATION "${CMAKE_INSTALL_LIBDIR}/libear"

     

       69
       69
        
                  COMPONENT scan-build-py)

     

       70
       70
        
        endforeach()

-5

pkgs/development/compilers/llvm/common/default.nix

···

       88
       88
        
                       }

     

       89
       89
        
                       {

     

       90
       90
        
                         after = "19";

     

       91
       91
       -
                         before = "20";

     

       92
       91
        
                         path = ../19;

     

       93
       93
       -
                       }

     

       94
       94
       -
                       {

     

       95
       95
       -
                         after = "20";

     

       96
       96
       -
                         path = ../git;

     

       97
       92
        
                       }

     

       98
       93
        
                     ];

     

       99
       94
        
                     "clang/purity.patch" = [

+1 -1

pkgs/development/compilers/llvm/default.nix

···

       28
       28
        
           "16.0.6".officialRelease.sha256 = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs=";

     

       29
       29
        
           "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag=";

     

       30
       30
        
           "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";

     

       31
       31
       -
           "19.1.0-rc3".officialRelease.sha256 = "sha256-SRonSpXt1pH6Xk+rQZk9mrfMdvYIvOImwUfMUu3sBgs=";

     

       31
       31
       +
           "19.1.0".officialRelease.sha256 = "sha256-/Ano8LwpGmW3C1ovJyvY3WIfliVkQi130f70WazwzGc=";

     

       32
       32
        
           "20.0.0-git".gitRelease = {

     

       33
       33
        
             rev = "81c3499531c3fe03827bd8bc890e3a16db9e4c3c";

     

       34
       34
        
             rev-version = "20.0.0-unstable-2024-09-22";

-71

pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch

···

       1
       1
       -
       diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake

     

       2
       2
       -
       index 75b0080f6..c895b884c 100644

     

       3
       3
       -
       --- a/cmake/modules/AddClang.cmake

     

       4
       4
       -
       +++ b/cmake/modules/AddClang.cmake

     

       5
       5
       -
       @@ -119,8 +119,8 @@ macro(add_clang_library name)

     

       6
       6
       -
                install(TARGETS ${lib}

     

       7
       7
       -
                  COMPONENT ${lib}

     

       8
       8
       -
                  ${export_to_clangtargets}

     

       9
       9
       -
       -          LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}

     

       10
       10
       -
       -          ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}

     

       11
       11
       -
       +          LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}"

     

       12
       12
       -
       +          ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}"

     

       13
       13
       -
                  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")

     

       14
       14
       -
        

     

       15
       15
       -
                if (NOT LLVM_ENABLE_IDE)

     

       16
       16
       -
       diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt

     

       17
       17
       -
       index e6ae4e19e..5ef01aea2 100644

     

       18
       18
       -
       --- a/lib/Headers/CMakeLists.txt

     

       19
       19
       -
       +++ b/lib/Headers/CMakeLists.txt

     

       20
       20
       -
       @@ -337,6 +337,7 @@ set(llvm_libc_wrapper_files

     

       21
       21
       -
        

     

       22
       22
       -
        include(GetClangResourceDir)

     

       23
       23
       -
        get_clang_resource_dir(output_dir PREFIX ${LLVM_LIBRARY_OUTPUT_INTDIR}/.. SUBDIR include)

     

       24
       24
       -
       +set(header_install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION_MAJOR}/include)

     

       25
       25
       -
        set(out_files)

     

       26
       26
       -
        set(generated_files)

     

       27
       27
       -
        

     

       28
       28
       -
       diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt

     

       29
       29
       -
       index b5b6d2807..6b592d255 100644

     

       30
       30
       -
       --- a/tools/libclang/CMakeLists.txt

     

       31
       31
       -
       +++ b/tools/libclang/CMakeLists.txt

     

       32
       32
       -
       @@ -246,7 +246,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS})

     

       33
       33
       -
                  COMPONENT

     

       34
       34
       -
                    libclang-python-bindings

     

       35
       35
       -
                  DESTINATION

     

       36
       36
       -
       -            "lib${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages")

     

       37
       37
       -
       +            "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages")

     

       38
       38
       -
        endforeach()

     

       39
       39
       -
        if(NOT LLVM_ENABLE_IDE)

     

       40
       40
       -
          add_custom_target(libclang-python-bindings)

     

       41
       41
       -
       diff --git a/tools/scan-build-py/CMakeLists.txt b/tools/scan-build-py/CMakeLists.txt

     

       42
       42
       -
       index 3aca22c0b..3115353e3 100644

     

       43
       43
       -
       --- a/tools/scan-build-py/CMakeLists.txt

     

       44
       44
       -
       +++ b/tools/scan-build-py/CMakeLists.txt

     

       45
       45
       -
       @@ -88,7 +88,7 @@ foreach(lib ${LibScanbuild})

     

       46
       46
       -
                             DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/${lib})

     

       47
       47
       -
          list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/${lib})

     

       48
       48
       -
          install(FILES lib/libscanbuild/${lib}

     

       49
       49
       -
       -          DESTINATION lib/libscanbuild

     

       50
       50
       -
       +          DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild"

     

       51
       51
       -
                  COMPONENT scan-build-py)

     

       52
       52
       -
        endforeach()

     

       53
       53
       -
        

     

       54
       54
       -
       @@ -106,7 +106,7 @@ foreach(resource ${LibScanbuildResources})

     

       55
       55
       -
                             DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/resources/${resource})

     

       56
       56
       -
          list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/resources/${resource})

     

       57
       57
       -
          install(FILES lib/libscanbuild/resources/${resource}

     

       58
       58
       -
       -          DESTINATION lib/libscanbuild/resources

     

       59
       59
       -
       +          DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild/resources"

     

       60
       60
       -
                  COMPONENT scan-build-py)

     

       61
       61
       -
        endforeach()

     

       62
       62
       -
        

     

       63
       63
       -
       @@ -122,7 +122,7 @@ foreach(lib ${LibEar})

     

       64
       64
       -
                             DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libear/${lib})

     

       65
       65
       -
          list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libear/${lib})

     

       66
       66
       -
          install(FILES lib/libear/${lib}

     

       67
       67
       -
       -          DESTINATION lib/libear

     

       68
       68
       -
       +          DESTINATION "${CMAKE_INSTALL_LIBDIR}/libear"

     

       69
       69
       -
                  COMPONENT scan-build-py)

     

       70
       70
       -
        endforeach()

     

       71
       71
       -

+2 -2

pkgs/top-level/aliases.nix

···

       813
       813
        
         libbpf_1 = libbpf; # Added 2022-12-06

     

       814
       814
        
         libbson = mongoc; # Added 2024-03-11

     

       815
       815
        
         libcap_pam = throw "'libcap_pam' has been replaced with 'libcap'"; # Converted to throw 2023-09-10

     

       816
       816
       -
         libclc = llvmPackages_latest.libclc; # Added 2023-10-28

     

       816
       816
       +
         libclc = llvmPackages_18.libclc; # Added 2023-10-28

     

       817
       817
        
         libcxxabi = throw "'libcxxabi' was merged into 'libcxx'"; # Converted to throw 2024-03-08

     

       818
       818
        
         libdwarf_20210528 = throw "'libdwarf_20210528' has been removed because it is not used in nixpkgs, move to libdwarf"; # Added 2024-03-23

     

       819
       819
        
         libgme = game-music-emu; # Added 2022-07-20

     
···

       1752
       1752
        
         openbsdCross = openbsd; # Added 2024-09-06

     

       1753
       1753
        
       

     

       1754
       1754
        
         # LLVM packages for (integration) testing that should not be used inside Nixpkgs:

     

       1755
       1755
       -
         llvmPackages_latest = llvmPackages_18;

     

       1755
       1755
       +
         llvmPackages_latest = llvmPackages_19;

     

       1756
       1756
        
       

     

       1757
       1757
        
         /* If these are in the scope of all-packages.nix, they cause collisions

     

       1758
       1758
        
           between mixed versions of qt. See: