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

or-tools: 9.4 -> 9.7 #272425

Merged
merged 1 commit into from
Jul 16, 2024
Merged

or-tools: 9.4 -> 9.7 #272425

merged 1 commit into from
Jul 16, 2024

Conversation

wegank
Copy link
Member

@wegank wegank commented Dec 6, 2023

Description of changes

Not to 9.8 as it requires absl-py 2.0 and #264902.

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.

@wegank wegank force-pushed the or-tools-bump branch 2 times, most recently from 81b51bf to 1ac6b73 Compare December 6, 2023 11:10
@wegank
Copy link
Member Author

wegank commented Dec 6, 2023

@ofborg build or-tools or-tools.passthru.tests

@ofborg ofborg bot requested a review from andersk December 6, 2023 11:11
@wegank wegank marked this pull request as ready for review December 7, 2023 11:21
@wegank wegank marked this pull request as draft January 22, 2024 00:30
@wegank wegank marked this pull request as ready for review January 26, 2024 10:09
@wegank wegank marked this pull request as draft January 26, 2024 10:09
@wegank wegank marked this pull request as ready for review January 30, 2024 08:15
@wegank
Copy link
Member Author

wegank commented Feb 5, 2024

@ofborg eval

pybind11_protobuf = fetchFromGitHub {
owner = "pybind";
repo = "pybind11_protobuf";
rev = "b713501f1da56d9b76c42f89efd00b97c26c9eac";
Copy link
Contributor

Choose a reason for hiding this comment

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

According to https://github.com/google/or-tools/blob/v9.7/WORKSPACE#L228, this should be 5baa2dc9d93e3b608cde86dfa4b8c63aeab4ac78.

Copy link
Member Author

Choose a reason for hiding this comment

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

I had to use b713501f1da56d9b76c42f89efd00b97c26c9eac for the build to succeed, probably due to some mismatches as in google/or-tools#4027.

pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved
@wegank
Copy link
Member Author

wegank commented Feb 9, 2024

This should also drop or-tools from the list of failures in #277049, I think.

@wegank wegank marked this pull request as draft March 20, 2024 15:06
@wegank wegank mentioned this pull request Jun 7, 2024
13 tasks
@afh afh mentioned this pull request Jun 7, 2024
13 tasks
@wegank wegank marked this pull request as ready for review July 15, 2024 23:07
@wegank
Copy link
Member Author

wegank commented Jul 15, 2024

Reopening the PR as or-tools is failing on master. I'll do the next bump to 9.9 in other PR, whose diff is way more significant.

@wegank wegank mentioned this pull request Jul 15, 2024
13 tasks
@wegank wegank merged commit 6c09edc into NixOS:master Jul 16, 2024
24 of 26 checks passed
@wegank wegank deleted the or-tools-bump branch July 16, 2024 10:39
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