Skip to content

Comments

cdparanoiaIII: Cleanup#171046

Merged
Ericson2314 merged 1 commit intoNixOS:stagingfrom
Ericson2314:cleanup-cdparanoia
May 1, 2022
Merged

cdparanoiaIII: Cleanup#171046
Ericson2314 merged 1 commit intoNixOS:stagingfrom
Ericson2314:cleanup-cdparanoia

Conversation

@Ericson2314
Copy link
Member

Description of changes

Handle CC the normal way, unset CC was from quite old
28b6fb6 during early macOS experiments
and no longer needed.

Regenerate autoconf stuff unconditionally because it is so old, and
unconditional is just simpler.

Put conditional patches after unconditional ones as is more idiomatic.

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/)
  • 22.05 Release Notes (or backporting 21.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 added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. labels Apr 30, 2022
@Mindavi
Copy link
Contributor

Mindavi commented Apr 30, 2022

Should target staging. Diff LGTM.

@Mindavi
Copy link
Contributor

Mindavi commented Apr 30, 2022

@ofborg build cdparanoia

Handle CC the normal way, `unset CC` was from quite old
28b6fb6 during early macOS experiments
and no longer needed.

Regenerate autoconf stuff unconditionally because it is so old, and
unconditional is just simpler.

Put conditional patches after unconditional ones as is more idiomatic.
@Ericson2314 Ericson2314 changed the base branch from master to staging April 30, 2022 20:18
@Ericson2314 Ericson2314 merged commit 388df8d into NixOS:staging May 1, 2022
@Ericson2314 Ericson2314 deleted the cleanup-cdparanoia branch May 1, 2022 14:46
@vcunat
Copy link
Member

vcunat commented May 7, 2022

The .isDarwin part of patches won't even apply anymore:
https://hydra.nixos.org/build/175468127

@Ericson2314
Copy link
Member Author

I'm sorry. I'll go fix that right away.

Ericson2314 added a commit to Ericson2314/nixpkgs that referenced this pull request May 7, 2022
I shouldn't have been so hasty rearranging things, and also should have
tested Darwin before merging!

Sorry @vcunat!
@Ericson2314
Copy link
Member Author

OK see #171997

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants