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: 4.9.1 -> 4.10 #315714

Merged
merged 2 commits into from
May 31, 2024
Merged

ccache: 4.9.1 -> 4.10 #315714

merged 2 commits into from
May 31, 2024

Conversation

Nanotwerp
Copy link
Contributor

@Nanotwerp Nanotwerp commented May 29, 2024

Description of changes

Updates ccache from version 4.9.1 to version 4.10. The package.nix was formatted with nixfmt-rfc-style. Dependencies now necessary to compile ccache added: doctest, fmt, hiredis, xxHash.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 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.

Add a 👍 reaction to pull requests you find important.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/4004

pkgs/by-name/cc/ccache/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/cc/ccache/package.nix Outdated Show resolved Hide resolved
@Nanotwerp Nanotwerp force-pushed the ccache-up branch 2 times, most recently from ece541b to 8a20018 Compare May 31, 2024 10:12
@Nanotwerp Nanotwerp requested a review from mjoerg May 31, 2024 10:15
@Nanotwerp Nanotwerp force-pushed the ccache-up branch 2 times, most recently from cab2eb8 to ca839dd Compare May 31, 2024 10:58
@Nanotwerp Nanotwerp requested a review from mjoerg May 31, 2024 11:00
Copy link
Contributor

@mjoerg mjoerg left a comment

Choose a reason for hiding this comment

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

Result of nixpkgs-review pr 315714 run on x86_64-linux 1

1 package marked as broken and skipped:
  • redpanda-server
9 packages built:
  • ccache
  • ccache.man
  • ccacheStdenv
  • ccacheWrapper
  • monophony
  • python311Packages.nuitka
  • python311Packages.nuitka.dist
  • python312Packages.nuitka
  • python312Packages.nuitka.dist

Result of nixpkgs-review pr 315714 run on x86_64-darwin 1

8 packages built:
  • ccache
  • ccache.man
  • ccacheStdenv
  • ccacheWrapper
  • python311Packages.nuitka
  • python311Packages.nuitka.dist
  • python312Packages.nuitka
  • python312Packages.nuitka.dist

Dependencies now necessary to compile `ccache` added: `doctest`, `fmt`, `hiredis`, `xxHash`.
@kira-bruneau
Copy link
Contributor

Oh oops - my bad. Looking at this again today, I was wrong about using nativeCheckInputs for doctest. We should be using checkInputs. Then we can enable strictDeps = true to enforce strict separation between each type of input.

I'll just push those changes myself to avoid another back and forth on the code review. Then this should be good to merge once all the checks are green!

@kira-bruneau kira-bruneau merged commit 484882f into NixOS:master May 31, 2024
24 checks passed
@n8henrie
Copy link
Contributor

n8henrie commented Jun 1, 2024

@Nanotwerp @kira-bruneau I'm now getting a ccache build failure on aarch64-darwin, complaining about the hash from this PR:

$ nix build github:NixOS/nixpkgs#ccache
error: hash mismatch in fixed-output derivation '/nix/store/slqin5zn20zdhsciqw33bp7g4yhk27m0-source.drv':
         specified: sha256-0T9iJXnDX8LffhB/5hsfBNyZQ211f0lL/7dvTrjmiE0=
            got:    sha256-YHSr2pnk17QEdrIHInXX2eBFN9OGjdleaB41VLaqlnA=
error: 1 dependencies of derivation '/nix/store/gp3rhhflvqj9gsiwnpj1r46zxq0zy0sr-ccache-4.10.drv' failed to build

@n8henrie
Copy link
Contributor

n8henrie commented Jun 1, 2024

Opened #316520

@Nanotwerp Nanotwerp deleted the ccache-up branch June 1, 2024 22:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants