From da3200b7b67aa53f549123b279e61ece80f65ce4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 16 Nov 2022 00:28:45 +0100 Subject: [PATCH] Revert "gplates: fix failing build" This reverts commit 8a236e246ab1aceea6e5b181f0d566be6bb3a614. --- pkgs/applications/science/misc/gplates/default.nix | 6 ++---- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix index 835c66c3251f..7cbf37fcaf8a 100644 --- a/pkgs/applications/science/misc/gplates/default.nix +++ b/pkgs/applications/science/misc/gplates/default.nix @@ -14,15 +14,13 @@ , libGLU , mpfr , proj -# build with Python 3.10 fails, because boost <= 1.78 can't find -# pythons with double digits in minor versions, like X.YZ -, python39 +, python3 , qtxmlpatterns , qwt }: let - python = python39.withPackages (ps: with ps; [ + python = python3.withPackages (ps: with ps; [ numpy ]); boost' = boost.override { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 501816e95cf3..e26973346237 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36228,6 +36228,8 @@ with pkgs; gplates = libsForQt5.callPackage ../applications/science/misc/gplates { boost = boost175; + # build with Python 3.10 fails, because boost <= 1.78 can't find + # pythons with double digits in minor versions, like X.YZ python3 = python39; };