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

ccache: 3.4.1 -> 3.7.10 #91589

Merged
merged 1 commit into from Jul 2, 2020
Merged

ccache: 3.4.1 -> 3.7.10 #91589

merged 1 commit into from Jul 2, 2020

Conversation

@waldheinz
Copy link
Contributor

waldheinz commented Jun 26, 2020

Motivation for this change

We're using Nix - provided ccache and were bitten by

ccache/ccache#599

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
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Copy link
Member

danieldk left a comment

Thank you for contributing to nixpkgs! I have added one requested change.

pkgs/development/tools/misc/ccache/default.nix Outdated Show resolved Hide resolved
@waldheinz
Copy link
Contributor Author

waldheinz commented Jun 28, 2020

@waldheinz waldheinz force-pushed the waldheinz:master branch from 27d3e5b to c52d37c Jul 1, 2020
@waldheinz waldheinz requested a review from danieldk Jul 1, 2020
Copy link
Member

danieldk left a comment

Thanks for documenting the patches. One more small suggested change.

@@ -1,29 +1,23 @@
{ stdenv, fetchurl, perl, zlib, makeWrapper }:
{ stdenv, fetchFromGitHub, asciidoc-full, gperf, perl, autoconf, zlib, makeWrapper }:

This comment has been minimized.

@danieldk

danieldk Jul 1, 2020 Member

Suggested change
{ stdenv, fetchFromGitHub, asciidoc-full, gperf, perl, autoconf, zlib, makeWrapper }:
{ stdenv, fetchFromGitHub, asciidoc-full, gperf, perl, autoreconfHook, zlib, makeWrapper }:
pkgs/development/tools/misc/ccache/default.nix Outdated Show resolved Hide resolved
pkgs/development/tools/misc/ccache/default.nix Outdated Show resolved Hide resolved
@waldheinz waldheinz force-pushed the waldheinz:master branch from c52d37c to 6cf2fee Jul 1, 2020
@waldheinz waldheinz requested a review from danieldk Jul 1, 2020
@danieldk danieldk requested a review from nh2 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
@danieldk danieldk force-pushed the waldheinz:master branch from 6cf2fee to 4ec1545 Jul 2, 2020
@danieldk
Copy link
Member

danieldk commented Jul 2, 2020

Result of nixpkgs-review pr 91589 1

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.

@danieldk danieldk merged commit 805ab8c into NixOS:master Jul 2, 2020
16 checks passed
16 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
ccache, ccache.passthru.tests on aarch64-linux Success
Details
ccache, ccache.passthru.tests on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="4ec1545"; rev="4ec15456b333c87a2ccfffeb6d2c9b96ba579a4a"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="4ec1545"; rev="4ec15456b333c87a2ccfffeb6d2c9b96ba579a4a"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="4ec1545"; rev="4ec15456b333c87a2ccfffeb6d2c9b96ba579a4a"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="4ec1545"; rev="4ec15456b333c87a2ccfffeb6d2c9b96ba579a4a"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="4ec1545"; rev="4ec15456b333c87a2ccfffeb6d2c9b96ba579a4a"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="4ec1545"; rev="4ec15456b333c87a2ccfffeb6d2c9b96ba579a4a"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="4ec1545"; rev="4ec15456b333c87a2ccfffeb6d2c9b96ba579a4a"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.