llvmPackages_10: rc5 -> release #83350
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@volth This doesn't build for me, because the commit is not found ("reference is not a tree"). How can I regenerate the vendor file (./pkgs/applications/networking/browsers/chromium-git/vendor-82.0.4082.1.nix in this case)? |
ggreif
reviewed
Mar 25, 2020
| @@ -6,15 +6,14 @@ | |||
|
|
|||
| let | |||
| release_version = "10.0.0"; | |||
| candidate = "rc5"; | |||
| version = "10.0.0${candidate}"; # differentiating these is important for rc's | |||
| version = release_version; # differentiating these is important for rc's | |||
There was a problem hiding this comment.
This comment is confusing now.
There was a problem hiding this comment.
How would you write it? We need a comment to make clear, why we have two variables with the same value. I just kept it this way, because this is consistent with the other llvm versions.
There was a problem hiding this comment.
I see. Never mind then. Or take my suggestion.
Suggested change
| version = release_version; # differentiating these is important for rc's | |
| version = release_version; # differentiating these (variables) is important for rc's |
I'll look into the history when 11-rc1 comes along, anyway.
There was a problem hiding this comment.
I should have had version = "${release_version}${candidate}". Too late now :-)
There was a problem hiding this comment.
Added it into the commit, it's a lot clearer what is meant this way. Thanks!
|
I use a script to fix the hashes: $ cat fix-wanted.awk
# hash mismatch in fixed-output derivation '/nix/store/gkixca1c9jcqs0qwj0pns4gfkycjn117-Xlldb-11-init.tar.gz':
# wanted: sha256:02gb3fbz09kyw8n71218v5v77ip559x3gqbcp8y3w6n3jpbryywa
# got: sha256:1cjsvyrq759hmp4cki2l2q62pdasqmjcpqkb5rdgx0rpmnrja1i2
# invoke `awk -f fix-wanted.awk -F: <mismatch-log>` > script.sh && sh script.sh
# or build like this: `nix-build -j8 -A llvmPackages_10 |& tee /dev/tty | awk -f fix-wanted.awk -F: | sh`
/wanted: / { wanted = $3 }
/got: / { got = $3; print "git grep", wanted, "|", "awk -F: '{print $1}' | xargs perl -pi -e s/"wanted"/"got"/g" }Building with this command line: |
|
@DieGoldeneEnte can you link to http://lists.llvm.org/pipermail/llvm-dev/2020-March/140233.html from the description? |
updated hashes and url updated comment regarding version/release_version to make it clearer
|
@ggreif added it to the PR-text. |
|
Just a quick note so that we don't forget about it: After this PR is merged we should also backport LLVM 10 to And regarding |
primeos
added
the
9.needs: port to stable
|
@basvandijk @dtzWill @matthewbauer @lovek323 @7c6f434c this is a pretty boring bump, can this be merged? |
10 tasks
|
@GrahamcOfBorg build llvm |
|
@GrahamcOfBorg build llvm_10 |
DieGoldeneEnte
pushed a commit
to DieGoldeneEnte/nixpkgs
that referenced
this pull request
Apr 2, 2020
Backport of llvmPackages_10 since Chromium 83 will depend on it. See NixOS#83350 (comment) llvmPackages_10: copy llvmPackages_9 * starting with rc2 * make `lldb` compilable again on Darwin * separate out manpage creation for `lldb` into a new derivation * minor tweaks to the patching of sources, some of which are backportable to earlier versions (cherry picked from commit f111c6f) llvmPackages_10: rc2 -> rc3 http://lists.llvm.org/pipermail/llvm-dev/2020-March/139729.html Additionally cherry-picked 3 commits from `llvm-project/master`: - llvm/llvm-project@d21664c - llvm/llvm-project@3a0f6e6 - llvm/llvm-project@87dac7d such that clang can automatically pick up the polly plugin from the `llvm-polly` build. (cherry picked from commit 3a84353) llvmPackages_10: rc3 -> rc4 Only needed to update hashes and the version. Updated comment for extension handling patch (cherry picked from commit 0ec3f4e) llvmPackages_10: removed extra polly-build There is no good reason to have separate builds for polly and no-polly versions. wwwwwThe reason for the two versions was (as far as I can tell) to defer rebuilds (see ed60483). Polly is now enabled by default. (cherry picked from commit e9aa877) llvmPackges_10: rc4 -> rc5 updated versino and hashes for new rc (cherry picked from commit cdee144) llvmPackages_10: rc5 -> release updated hashes and url updated comment regarding version/release_version to make it clearer (cherry picked from commit 4665b2a)
10 tasks
|
@DieGoldeneEnte quick reality check: can you successfully start LLDB and run the On macOS all is fine: |
|
@ggreif It works for me My output for |
|
I get Maybe we can track this down? |
|
Looks like the on my machine. After doing So I guess we should specify a |
|
I guess this should work in a derivation recipe: and strangely, the following derivation builds just fine in my stdenv.mkDerivation {
name = "lldb-scriptable";
buildInputs = [ coreutils lldb_10 ];
installPhase = "export PATH=$coreutils/bin; printf 'script\nexit\n' | ${lldb_10}/bin/lldb > $out";
phases = [ "installPhase" ];
} |
You can try out this commit, it should set the python path explicitly during building, in case it finds a different version fist. |
stigok
pushed a commit
to stigok/nixpkgs
that referenced
this pull request
Jun 12, 2020
Backport of llvmPackages_10 since Chromium 83 will depend on it. See NixOS#83350 (comment) llvmPackages_10: copy llvmPackages_9 * starting with rc2 * make `lldb` compilable again on Darwin * separate out manpage creation for `lldb` into a new derivation * minor tweaks to the patching of sources, some of which are backportable to earlier versions (cherry picked from commit f111c6f) llvmPackages_10: rc2 -> rc3 http://lists.llvm.org/pipermail/llvm-dev/2020-March/139729.html Additionally cherry-picked 3 commits from `llvm-project/master`: - llvm/llvm-project@d21664c - llvm/llvm-project@3a0f6e6 - llvm/llvm-project@87dac7d such that clang can automatically pick up the polly plugin from the `llvm-polly` build. (cherry picked from commit 3a84353) llvmPackages_10: rc3 -> rc4 Only needed to update hashes and the version. Updated comment for extension handling patch (cherry picked from commit 0ec3f4e) llvmPackages_10: removed extra polly-build There is no good reason to have separate builds for polly and no-polly versions. wwwwwThe reason for the two versions was (as far as I can tell) to defer rebuilds (see ed60483). Polly is now enabled by default. (cherry picked from commit e9aa877) llvmPackges_10: rc4 -> rc5 updated versino and hashes for new rc (cherry picked from commit cdee144) llvmPackages_10: rc5 -> release updated hashes and url updated comment regarding version/release_version to make it clearer (cherry picked from commit 4665b2a)
rrbutani
added
the
6.topic: llvm/clang
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
LLVM 10.0.0 was released (http://lists.llvm.org/pipermail/llvm-dev/2020-March/140233.html)
@ggreif I fixed the hashes, hopefully you haven't already :)
Things done
updated hashes and url for release code
I checked with nix-review, only chromiumDev depends on this, but it doesn't build even without this commit, because of patches.
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)