Skip to content

Commit a95f58c

Browse files
RossComputerGuyalyssais
authored andcommitted
llvmPackages_19: 19.1.0-rc3 -> 19.1.0
1 parent 6710d0d commit a95f58c

File tree

5 files changed

+6
-82
lines changed

5 files changed

+6
-82
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ index 3aca22c0b..3115353e3 100644
4646
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/${lib})
4747
list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/${lib})
4848
install(FILES lib/libscanbuild/${lib}
49-
- DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild
49+
- DESTINATION lib/libscanbuild
5050
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild"
5151
COMPONENT scan-build-py)
5252
endforeach()
@@ -55,7 +55,7 @@ index 3aca22c0b..3115353e3 100644
5555
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/resources/${resource})
5656
list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/resources/${resource})
5757
install(FILES lib/libscanbuild/resources/${resource}
58-
- DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild/resources
58+
- DESTINATION lib/libscanbuild/resources
5959
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild/resources"
6060
COMPONENT scan-build-py)
6161
endforeach()
@@ -64,7 +64,7 @@ index 3aca22c0b..3115353e3 100644
6464
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libear/${lib})
6565
list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libear/${lib})
6666
install(FILES lib/libear/${lib}
67-
- DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libear
67+
- DESTINATION lib/libear
6868
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libear"
6969
COMPONENT scan-build-py)
7070
endforeach()

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,8 @@ let
8888
}
8989
{
9090
after = "19";
91-
before = "20";
9291
path = ../19;
9392
}
94-
{
95-
after = "20";
96-
path = ../git;
97-
}
9893
];
9994
"clang/purity.patch" = [
10095
{

pkgs/development/compilers/llvm/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ let
2828
"16.0.6".officialRelease.sha256 = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs=";
2929
"17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag=";
3030
"18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";
31-
"19.1.0-rc3".officialRelease.sha256 = "sha256-SRonSpXt1pH6Xk+rQZk9mrfMdvYIvOImwUfMUu3sBgs=";
31+
"19.1.0".officialRelease.sha256 = "sha256-/Ano8LwpGmW3C1ovJyvY3WIfliVkQi130f70WazwzGc=";
3232
"20.0.0-git".gitRelease = {
3333
rev = "81c3499531c3fe03827bd8bc890e3a16db9e4c3c";
3434
rev-version = "20.0.0-unstable-2024-09-22";

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

Lines changed: 0 additions & 71 deletions
This file was deleted.

pkgs/top-level/aliases.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,7 @@ mapAliases {
813813
libbpf_1 = libbpf; # Added 2022-12-06
814814
libbson = mongoc; # Added 2024-03-11
815815
libcap_pam = throw "'libcap_pam' has been replaced with 'libcap'"; # Converted to throw 2023-09-10
816-
libclc = llvmPackages_latest.libclc; # Added 2023-10-28
816+
libclc = llvmPackages_18.libclc; # Added 2023-10-28
817817
libcxxabi = throw "'libcxxabi' was merged into 'libcxx'"; # Converted to throw 2024-03-08
818818
libdwarf_20210528 = throw "'libdwarf_20210528' has been removed because it is not used in nixpkgs, move to libdwarf"; # Added 2024-03-23
819819
libgme = game-music-emu; # Added 2022-07-20
@@ -1752,7 +1752,7 @@ mapAliases {
17521752
openbsdCross = openbsd; # Added 2024-09-06
17531753

17541754
# LLVM packages for (integration) testing that should not be used inside Nixpkgs:
1755-
llvmPackages_latest = llvmPackages_18;
1755+
llvmPackages_latest = llvmPackages_19;
17561756

17571757
/* If these are in the scope of all-packages.nix, they cause collisions
17581758
between mixed versions of qt. See:

0 commit comments

Comments
 (0)