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

catfs: unstable-2020-03-21 -> 0.9.0 #205379

Merged
merged 2 commits into from
Dec 17, 2022
Merged

catfs: unstable-2020-03-21 -> 0.9.0 #205379

merged 2 commits into from
Dec 17, 2022

Conversation

tjni
Copy link
Contributor

@tjni tjni commented Dec 9, 2022

Description of changes

https://github.com/kahing/catfs/releases/tag/v0.9.0

This broke when Rust upgraded in #199664. Rust has added a new default lint in rust-lang/rust#97739 that requires code changes upstream.

I've added a patch that keeps the current behavior and fixes the lint warning. Not upstreaming because it's not obvious to me that it's the proper upstream fix, but the current behavior doesn't look harmful. We can monitor kahing/catfs#71 for a full resolution.

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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested a review from jonringer December 9, 2022 22:44
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Dec 9, 2022
@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/1564

Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

LGTM

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

1 package built:
  • catfs

@jonringer jonringer merged commit 59aec36 into NixOS:master Dec 17, 2022
@tjni tjni deleted the catfs branch December 17, 2022 18:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants