rarias/bscpkgs
rarias/bscpkgs
Archived
2
0
Fork 3
Code Issues 2 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Fix llvm on newest nixpkgs #1

Closed
arocanon wants to merge 0 commits from arocanon:for-next into master
pull from: arocanon:for-next
merge into: rarias:master
Conversation 4 Commits - Files Changed -
arocanon commented 2025-05-26 11:19:48 +02:00
Collaborator
Copy Link

Using bscpkgs with a newer nixpkg version makes LLVM fail to link any application and fails to build openmpv. This patchset fixes both issues and should keep compatibility with old nixpkgs as well. I have tested the patches against the current nixpkgs version in flakes.

Using bscpkgs with a newer nixpkg version makes LLVM fail to link any application and fails to build openmpv. This patchset fixes both issues and should keep compatibility with old nixpkgs as well. I have tested the patches against the current nixpkgs version in flakes.
arocanon added 2 commits 2025-05-26 11:19:48 +02:00 
Some gcc versions append an extension to the patch version number, but
this exetension is not part of the installation path. This patch removes
the extension to the patch version.
arocanon requested review from rarias 2025-05-26 11:28:21 +02:00
rarias requested changes 2025-05-28 13:33:32 +02:00
Dismissed
rarias left a comment
Owner

Thanks, we should upgrade nixpkgs soon.

There is a typo in the commit message "this exetension". Also, we don't use prefixes in the commit line, despite nixpkgs doing so.

Thanks, we should upgrade nixpkgs soon. There is a typo in the commit message "this exetension". Also, we don't use prefixes in the commit line, despite nixpkgs doing so.
pkgs/llvm-ompss2/default.nix Outdated
@ -34,14 +34,15 @@ let
targetConfig = stdenv.targetPlatform.config;
inherit gcc;
cc = clangOmpss2Unwrapped;
gccVersion = lib.strings.concatStringsSep "." [(lib.versions.major gcc.version) (lib.versions.minor gcc.version) (lib.versions.patch gcc.version)];
rarias commented 2025-05-28 13:28:31 +02:00
Owner

Sorter?

gccVersion = with lib; with versions; let v = gcc.version; in concatStringsSep "." [(major v) (minor v) (patch v)]

We may also safely move with lib; to the beginning of the file.

Sorter? ```nix gccVersion = with lib; with versions; let v = gcc.version; in concatStringsSep "." [(major v) (minor v) (patch v)] ``` We may also safely move `with lib;` to the beginning of the file.
rarias marked this conversation as resolved
arocanon force-pushed for-next from 93d9c770e8 to 169ec60e71 2025-05-28 15:39:31 +02:00 Compare
arocanon commented 2025-05-28 15:39:53 +02:00
Author
Collaborator
Copy Link

All fixed, thanks!

All fixed, thanks!
rarias approved these changes 2025-06-02 08:57:08 +02:00
rarias force-pushed for-next from 169ec60e71 to 8e5b2dc5cc 2025-06-02 09:00:54 +02:00 Compare
rarias commented 2025-06-02 09:04:38 +02:00
Owner
Copy Link

Gitea failed to see that this was merged via git (8e5b2dc5cc). Closing.

Gitea failed to see that this was merged via git (https://jungle.bsc.es/git/rarias/bscpkgs/commit/8e5b2dc5ccee0bad68d738cca7db2ffffc44c8fd). Closing.
rarias closed this pull request 2025-06-02 09:04:38 +02:00
This repo is archived. You cannot comment on pull requests.
Reviewers
No Reviewers
rarias
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
abonerib arocanon rarias
No Assignees
2 Participants
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: rarias/bscpkgs#1
No description provided.
Delete Branch "arocanon:for-next"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?