Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

llvmPackages.lldb: deduplicate >10 #230387

Merged
merged 1 commit into from
Jun 20, 2023
Merged

llvmPackages.lldb: deduplicate >10 #230387

merged 1 commit into from
Jun 20, 2023

Conversation

Artturin
Copy link
Member

@Artturin Artturin commented May 6, 2023

Once reviewed the commits will be squashed

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Copy link
Member

@sternenseemann sternenseemann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another more general point I am wondering about if the common expression shouldn't be a function that returns a package function. That way we could have a distinction between overrideable inputs (e.g. monorepoSrc and arguments that just customize the common expression (like patches), but are not an interface, really.

This could also save us extreme version comparison awkwardness. An example for this could be GHC's common-hadrian.nix or the SBCL common expression.

pkgs/development/compilers/llvm/common/lldb.nix Outdated Show resolved Hide resolved
src = fetch "lldb" "0g3pj1m3chafavpr35r9fynm85y2hdyla6klj0h28khxs2613i78";
patches =
let
resourceDirPatch = callPackage ({ runCommand, libclang }: (runCommand "resource-dir.patch"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(May be nice to use substituteAll for this in the future, but can be a different PR.)

Copy link
Member Author

@Artturin Artturin May 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It'll cause a hash change

          (callPackage
            ({ substituteAll, libclang }: substituteAll
              {
                src = ./lldb/resource-dir.patch;
                clangLibDir = "${libclang.lib}/lib";
              })
            { })

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, something for a future cleanup I'd say!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pkgs/development/compilers/llvm/13/default.nix Outdated Show resolved Hide resolved
pkgs/development/compilers/llvm/common/lldb.nix Outdated Show resolved Hide resolved
pkgs/development/compilers/llvm/common/lldb.nix Outdated Show resolved Hide resolved
@Artturin Artturin force-pushed the llvmsplit1 branch 2 times, most recently from 1c94421 to 8068ccc Compare May 7, 2023 16:11
@ofborg ofborg bot requested a review from sternenseemann May 7, 2023 17:08
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin and removed 10.rebuild-darwin: 11-100 labels May 8, 2023
@Artturin Artturin merged commit 289d9cf into NixOS:master Jun 20, 2023
@Artturin Artturin deleted the llvmsplit1 branch June 20, 2023 13:43
@rrbutani rrbutani added the 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related label May 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants