Unverified Commit a429051f authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

python3Packages.qpsolvers: add proxsuite, python3Packages.piqp: fix on darwin (#374657)

parents c6488c08 20e53fbc
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -40,7 +40,10 @@ buildPythonPackage rec {
        "${major python.pythonVersion}${minor python.pythonVersion}";

      # E.g. "linux-aarch64"
      platform = with stdenv.hostPlatform.parsed; "${kernel.name}-${cpu.name}";
      platform =
        with stdenv.hostPlatform;
        (lib.optionalString (!isDarwin) "${parsed.kernel.name}-${parsed.cpu.name}")
        + (lib.optionalString isDarwin "macosx-${darwinMinVersion}-${darwinArch}");
    in
    ''
      build="build/temp.${platform}-cpython-${pythonVersionMajorMinor}/${pname}.${pname}"
+5 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@
  scs,
  highspy,
  piqp,
  proxsuite,
}:
buildPythonPackage rec {
  pname = "qpsolvers";
@@ -51,7 +52,7 @@ buildPythonPackage rec {
    # mosek = [ cvxopt mosek ];
    osqp = [ osqp ];
    piqp = [ piqp ];
    # proxqp = [ proxsuite ];
    proxqp = [ proxsuite ];
    # qpalm = [ qpalm ];
    quadprog = [ quadprog ];
    scs = [ scs ];
@@ -64,7 +65,9 @@ buildPythonPackage rec {
        ecos
        highs
        osqp
        piqp # proxqp qpalm
        piqp
        proxqp
        # qpalm
        quadprog
        scs
      ];