Commit 003d9f75 authored by Florian Klink's avatar Florian Klink
Browse files

or-tools: move pybind11-protobuf package into or-tools 

or-tools is the only consumer of this library, and
1910563b is already one instance of the
toplevel build being broken.

Absorb pybind11-protobuf into or-tools, and manage the pinning there. It
will also make it much easier to do the upcoming or-tools bump, which
will also change these version bounds.

pybind11-protobuf is not actually packaged in the version that or-tools
asks for, but trying to use that version showed it wants abseil from
2023, which has been removed from nixpkgs.
parent fb236b37

pkgs/by-name/or/or-tools/package.nix

+7 −3
Original line number Diff line number Diff line 
{

  stdenv,

  lib,

  callPackage,



  abseil-cpp_202407,

  bzip2,

  cbc,
@@ -11,12 +15,10 @@ 
  gbenchmark,

  glpk,

  highs,

  lib,

  pkg-config,

  protobuf_29,

  python3,

  re2,

  stdenv,

  swig,

  unzip,

  zlib,
@@ -33,7 +35,9 @@ let 
  abseil-cpp = abseil-cpp_202407;

  protobuf = protobuf_29.override { inherit abseil-cpp; };

  python-protobuf = python3.pkgs.protobuf5.override { inherit protobuf; };

  pybind11-protobuf = python3.pkgs.pybind11-protobuf.override { protobuf_29 = protobuf; };

  pybind11-protobuf = callPackage ./pybind11-protobuf.nix {

    inherit (python3.pkgs) buildPythonPackage pybind11;

  };



  # local revert of 58daf511687f191829238fc7f571e08dc9dedf56,

  # working around https://github.com/google/or-tools/issues/4911

pkgs/development/python-modules/pybind11-protobuf/default.nix→pkgs/by-name/or/or-tools/pybind11-protobuf.nix

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
  buildPythonPackage,

  fetchFromGitHub,

  cmake,

  abseil-cpp_202407, # downgrade, same reason as toplevel protobuf_29

  abseil-cpp_202407,

  protobuf_29,

  pybind11,

  zlib,

pkgs/top-level/python-aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -310,6 +310,7 @@ mapAliases { 
  py-eth-sig-utils = throw "py-eth-sig-utils has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04

  py-scrypt = scrypt; # added 2025-08-07

  py_stringmatching = throw "'py_stringmatching' has been renamed to/replaced by 'py-stringmatching'"; # Converted to throw 2025-10-29

  pybind11-protobuf = throw "'pybind11-protobuf' was only used by or-tools, and with some overrides, so vendored in there until it's used in other places."; # Converted to throw 2025-11-06

  pycategories = throw "'pycategories' has been removed as it was broken and unmaintained"; # added 2025-11-08

  PyChromecast = throw "'PyChromecast' has been renamed to/replaced by 'pychromecast'"; # Converted to throw 2025-10-29

  pydns = throw "'pydns' has been renamed to/replaced by 'py3dns'"; # Converted to throw 2025-10-29

pkgs/top-level/python-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -12766,8 +12766,6 @@ self: super: with self; { 














  pybind11-abseil = callPackage ../development/python-modules/pybind11-abseil { };



























  pybind11-protobuf = callPackage ../development/python-modules/pybind11-protobuf { };



























  pybind11-stubgen = callPackage ../development/python-modules/pybind11-stubgen { };





























  pybindgen = callPackage ../development/python-modules/pybindgen { };