From 7b8f5c0136e7bd10bc694dfb3d1f28966157659b Mon Sep 17 00:00:00 2001 From: Christoph Jabs Date: Mon, 25 Aug 2025 13:49:43 +0300 Subject: [PATCH 1/2] python3Packages.python-sat: 0.1.8.dev17 -> 0.1.8.dev20 --- .../python-modules/python-sat/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-sat/default.nix b/pkgs/development/python-modules/python-sat/default.nix index 940dbfe3273d..e4e451d1855d 100644 --- a/pkgs/development/python-modules/python-sat/default.nix +++ b/pkgs/development/python-modules/python-sat/default.nix @@ -8,16 +8,22 @@ }: buildPythonPackage rec { pname = "python-sat"; - version = "0.1.8.dev17"; + version = "0.1.8.dev20"; format = "setuptools"; src = fetchFromGitHub { owner = "pysathq"; repo = "pysat"; - rev = "a04763de6dafb8d3a0d7f1b231fc0d30be1de4c0"; # upstream does not tag releases - hash = "sha256-FG6oAAI8XKXumj6Ys2QjjYcRp1TpwkUZzyfpkdq5V6E="; + rev = "d94f51e5eff2feef35abbc25480659eafa615cc0"; # upstream does not tag releases + hash = "sha256-fKZcdEVuqpv8jWnK8Cr1UJ7szJqXivK6x3YPYHH5ccI="; }; + # Build SAT solver backends in parallel + postPatch = '' + substituteInPlace solvers/prepare.py \ + --replace-fail "&& make &&" "&& make -j$NIX_BUILD_CORES &&" + ''; + propagatedBuildInputs = [ six pypblib From 2679dd50205dcb639c4bebea0d3571ebd255ca0c Mon Sep 17 00:00:00 2001 From: Christoph Jabs Date: Tue, 26 Aug 2025 14:17:23 +0300 Subject: [PATCH 2/2] python3Package.python-sat: unbreak darwin --- pkgs/development/python-modules/python-sat/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-sat/default.nix b/pkgs/development/python-modules/python-sat/default.nix index e4e451d1855d..a64ab34d2cd1 100644 --- a/pkgs/development/python-modules/python-sat/default.nix +++ b/pkgs/development/python-modules/python-sat/default.nix @@ -18,10 +18,13 @@ buildPythonPackage rec { hash = "sha256-fKZcdEVuqpv8jWnK8Cr1UJ7szJqXivK6x3YPYHH5ccI="; }; - # Build SAT solver backends in parallel + # Build SAT solver backends in parallel and fix hard-coded g++ reference for + # darwin, where stdenv uses clang postPatch = '' substituteInPlace solvers/prepare.py \ --replace-fail "&& make &&" "&& make -j$NIX_BUILD_CORES &&" + substituteInPlace solvers/patches/glucose421.patch \ + --replace-fail "+CXX := g++" "+CXX := c++" ''; propagatedBuildInputs = [ @@ -43,6 +46,5 @@ buildPythonPackage rec { maintainers.chrjabs ]; platforms = lib.platforms.all; - badPlatforms = lib.platforms.darwin ++ [ "i686-linux" ]; }; }