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

rapidcheck: Simplify installation, update, pkg-config #274297

Merged
merged 3 commits into from
Dec 17, 2023

Conversation

Ericson2314
Copy link
Member

@Ericson2314 Ericson2314 commented Dec 14, 2023

Description of changes

Simplify installation

We had neglected to nice RC_INSTALL_ALL_EXTRAS, which will take care of installing the extras for us.

Now that they are in a standard directory, we don't need to smuggle in the extra -I for Nix's tests either.

Update

unstable-2023-04-16 -> unstable-2023-08-15

Add meta.pkgConfigModules and test

The last update added pkg-config support, from emil-e/rapidcheck#319

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.05 Release Notes (or backporting 23.05 and 23.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@Ericson2314 Ericson2314 changed the title rapidcheck: Use stock isntallation, multiple outputs rapidcheck: Use stock installation, multiple outputs Dec 14, 2023
We had neglected to nice `RC_INSTALL_ALL_EXTRAS`, which will take care
of installing the "extras" for us.

Now that they are in a standard directory, we don't need to smuggle in
the extra `-I` for Nix's tests either.
@Ericson2314 Ericson2314 force-pushed the rapidcheck-simplify-install branch from 9def8c5 to 2b8c88f Compare December 14, 2023 21:55
@Ericson2314 Ericson2314 changed the title rapidcheck: Use stock installation, multiple outputs rapidcheck: Simplify installation, update, pkg-config Dec 14, 2023
@Ericson2314 Ericson2314 force-pushed the rapidcheck-simplify-install branch from 2b8c88f to ffefc11 Compare December 14, 2023 22:32
The last update added pkg-config support.

Co-authored-by: Robert Hensing <[email protected]>
@Ericson2314 Ericson2314 force-pushed the rapidcheck-simplify-install branch from 59900dc to a7447f9 Compare December 15, 2023 18:02
Copy link
Member

@roberth roberth left a comment

Choose a reason for hiding this comment

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

Lovely

@roberth roberth merged commit fbe9ea8 into NixOS:master Dec 17, 2023
22 checks passed
Copy link
Contributor

Backport failed for release-23.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-23.05
git worktree add -d .worktree/backport-274297-to-release-23.05 origin/release-23.05
cd .worktree/backport-274297-to-release-23.05
git switch --create backport-274297-to-release-23.05
git cherry-pick -x ab8cf01579ce0eba0202b0c84a71fd54ccfe4fc2 789df4b46d8c43e30999f8d41f52ab9149427b5b a7447f9e338fbaa12aeda5849041a39e04dd4b11

Copy link
Contributor

Successfully created backport PR for release-23.11:

@Ericson2314 Ericson2314 deleted the rapidcheck-simplify-install branch January 11, 2024 18:37
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.

2 participants