ccache: 3.4.1 -> 3.7.10 #91589
Merged
ccache: 3.4.1 -> 3.7.10 #91589
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
danieldk
suggested changes
Jun 27, 2020
nh2
reviewed
Jun 28, 2020
|
Thanks for the feedback, I’ll update the PR.
…--
For a successful technology, reality must take precedence over public relations, for nature cannot be fooled. (R. P. Feynman)
Am 27.06.2020 um 20:56 schrieb Daniël de Kok ***@***.***>:
@danieldk requested changes on this pull request.
Thank you for contributing to nixpkgs! I have added one requested change.
In pkgs/development/tools/misc/ccache/default.nix:
> src = fetchurl {
- sha256 = "1pppi4jbkkj641cdynmc35jaj40jjicw7gj75ran5qs5886jcblc";
- url = "mirror://samba/ccache/${pname}-${version}.tar.xz";
+ sha256 = "0a7dajdpnh14nmd10ji897rzqn6847lr36hdbig2rv7sxbc6d58c";
+ url = "https://github.com/ccache/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz";
};
Since the source is on GitHub now, we can use fetchFromGitHub:
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "0v6pvj50y18fxh2f6cx6xyg545xcpxfmrcg9bzbc6lc5acrvvjm7";
};
fetchFromGitHub should also be added as an argument to the derivation at the top. fetchurl can be removed, since it is then not used anymore.
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub, or unsubscribe.
|
danieldk
suggested changes
Jul 1, 2020
| @@ -1,29 +1,23 @@ | |||
| { stdenv, fetchurl, perl, zlib, makeWrapper }: | |||
| { stdenv, fetchFromGitHub, asciidoc-full, gperf, perl, autoconf, zlib, makeWrapper }: | |||
There was a problem hiding this comment.
Suggested change
| { stdenv, fetchFromGitHub, asciidoc-full, gperf, perl, autoconf, zlib, makeWrapper }: | |
| { stdenv, fetchFromGitHub, asciidoc-full, gperf, perl, autoreconfHook, zlib, makeWrapper }: |
danieldk
approved these changes
Jul 1, 2020
The fix-debug-prefix-map-suite patch became obsolete with upstream commit: ccache/ccache@82010e0 The skip-fs-dependent-test patch with PR: ccache/ccache#444
|
Result of 3 packages built:- baresip - ccache - ccacheStdenv (webbrowser was too large a dependency to test.) I also updated the commit message a bit to have links to the changes that deprecate the patches. Will merge when ofborg is happy. |
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
We're using Nix - provided ccache and were bitten by
This is the first release fixing this problem. The patches for disabling blocksize-dependent tests were dropped (the tests run without problems at least on ext4 and zfs).
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)