diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-04-17 00:35:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-17 00:35:09 +0200 |
| commit | f37f0ad4e19c32b5f7222a505081278d3c6db790 (patch) | |
| tree | 3554d7308008964520240f2299bd9971178c23f0 | |
| parent | fa1bb283d889c21e14c20c1b7841c6c388ff1a49 (diff) | |
| parent | 11b544c084934389a89fc9b8d0a0ddb78cb6b366 (diff) | |
| download | nixpkgs-f37f0ad4e19c32b5f7222a505081278d3c6db790.tar nixpkgs-f37f0ad4e19c32b5f7222a505081278d3c6db790.tar.gz nixpkgs-f37f0ad4e19c32b5f7222a505081278d3c6db790.tar.bz2 nixpkgs-f37f0ad4e19c32b5f7222a505081278d3c6db790.tar.lz nixpkgs-f37f0ad4e19c32b5f7222a505081278d3c6db790.tar.xz nixpkgs-f37f0ad4e19c32b5f7222a505081278d3c6db790.tar.zst nixpkgs-f37f0ad4e19c32b5f7222a505081278d3c6db790.zip | |
Merge pull request #168969 from SuperSandro2000/staging-next-sandro
Staging next fixes
| -rw-r--r-- | pkgs/applications/science/logic/fast-downward/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/development/python-modules/symengine/default.nix | 2 |
2 files changed, 7 insertions, 8 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 ]; }; } 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'" |