From f1189d812e5042de9571ce1e0e0f6fca5380ad6e Mon Sep 17 00:00:00 2001
From: Sandro Jäckel <sandro.jaeckel@gmail.com>
Date: Sat, 16 Apr 2022 22:46:45 +0200
Subject: fast-downward: substitute version, fix buildInputs, minor cleanup

---
 pkgs/applications/science/logic/fast-downward/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/science/logic/fast-downward/default.nix b/pkgs/applications/science/logic/fast-downward/default.nix
index cfde7031570..1fe770a599d 100644
--- a/pkgs/applications/science/logic/fast-downward/default.nix
+++ b/pkgs/applications/science/logic/fast-downward/default.nix
@@ -7,22 +7,21 @@
 , cplex
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "fast-downward";
   version = "21.12.0";
 
   src = fetchFromGitHub {
     owner = "aibasel";
     repo = "downward";
-    rev = "release-21.12.0";
+    rev = "release-${version}";
     sha256 = "sha256-qc+SaUpIYm7bnOZlHH2mdvUaMBB+VRyOCQM/BOoOaPE=";
   };
 
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [ python3 python3.pkgs.wrapPython osi ];
+  nativeBuildInputs = [ cmake python3.pkgs.wrapPython ];
+  buildInputs = [ python3 osi ];
 
-  cmakeFlags =
-    lib.optional osi.withCplex [ "-DDOWNWARD_CPLEX_ROOT=${cplex}/cplex" ];
+  cmakeFlags = lib.optional osi.withCplex [ "-DDOWNWARD_CPLEX_ROOT=${cplex}/cplex" ];
 
   configurePhase = ''
     python build.py release
@@ -62,7 +61,7 @@ stdenv.mkDerivation {
     description = "A domain-independent planning system";
     homepage = "https://www.fast-downward.org/";
     license = licenses.gpl3Plus;
-    platforms = with platforms; (linux ++ darwin);
+    platforms = platforms.unix;
     maintainers = with maintainers; [ abbradar ];
   };
 }
-- 
cgit 1.4.1


From 11b544c084934389a89fc9b8d0a0ddb78cb6b366 Mon Sep 17 00:00:00 2001
From: Sandro Jäckel <sandro.jaeckel@gmail.com>
Date: Sat, 16 Apr 2022 22:47:30 +0200
Subject: python310Packages.symengine: move patching to right phase

---
 pkgs/development/python-modules/symengine/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/symengine/default.nix b/pkgs/development/python-modules/symengine/default.nix
index ea85fc23008..ee2a0873845 100644
--- a/pkgs/development/python-modules/symengine/default.nix
+++ b/pkgs/development/python-modules/symengine/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     })
   ];
 
-  postConfigure = ''
+  postPatch = ''
     substituteInPlace setup.py \
       --replace "\"cmake\"" "\"${cmake}/bin/cmake\"" \
       --replace "'cython>=0.29.24'" "'cython'"
-- 
cgit 1.4.1