boost: Split python module into separate derivation

pkgs/applications/science/misc/gplates/default.nix

@@ -28,13 +28,6 @@ let
       numpy
     ]
   );
-  boost' = boost.override {
-    enablePython = true;
-    inherit python;
-  };
-  cgal' = cgal.override {
-    boost = boost';
-  };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gplates";
@@ -63,8 +56,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    boost'
-    cgal'
+    (boost.withPython python3)
+    cgal
     gdal
     glew
     gmp

pkgs/by-name/an/antimony/package.nix

@@ -47,7 +47,7 @@ stdenv.mkDerivation {
   buildInputs = [
     libpng
     python3
-    python3.pkgs.boost
+    python3.pkgs.boost-python
     libGLU
     libGL
     libsForQt5.qtbase

pkgs/by-name/ba/banana-vera/package.nix

@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  python310,
+  python311,
   tcl,
 }:
 
@@ -20,8 +20,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [
-    python310
-    python310.pkgs.boost
+    python311
+    python311.pkgs.boost-python
     tcl
   ];
 

pkgs/by-name/co/coal/package.nix

@@ -41,17 +41,15 @@ stdenv.mkDerivation (finalAttrs: {
   propagatedBuildInputs =
     [
       assimp
+      boost
+      eigen
       jrl-cmakemodules
       octomap
       qhull
       zlib
     ]
-    ++ lib.optionals (!pythonSupport) [
-      boost
-      eigen
-    ]
     ++ lib.optionals pythonSupport [
-      python3Packages.boost
+      python3Packages.boost-python
       python3Packages.eigenpy
     ];
 

pkgs/by-name/fr/freecad/package.nix

@@ -35,7 +35,7 @@
 }:
 let
   pythonDeps = with python3Packages; [
-    boost
+    boost-python
     gitpython # for addon manager
     ifcopenshell
     matplotlib

pkgs/by-name/fr/freeorion/package.nix

@@ -37,11 +37,8 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    (boost.override {
-      enablePython = true;
-      python = python3;
-    })
     (python3.withPackages (p: with p; [ pycodestyle ]))
+    (boost.withPython python3)
     SDL2
     freetype
     glew

pkgs/by-name/ge/geant4/package.nix

@@ -3,7 +3,6 @@
   stdenv,
   fetchurl,
   callPackage,
-  boost,
   clhep,
   cmake,
   coin3d,
@@ -26,17 +25,10 @@
   enableQt ? false,
   enableXM ? false,
   enableOpenGLX11 ? !stdenv.hostPlatform.isDarwin,
-  enablePython ? false,
+  enablePython ? true,
   enableRaytracerX11 ? false,
 }:
 
-let
-  boost_python = boost.override {
-    enablePython = true;
-    python = python3;
-  };
-in
-
 stdenv.mkDerivation rec {
   version = "11.3.2";
   pname = "geant4";
@@ -98,8 +90,8 @@ stdenv.mkDerivation rec {
       motif
     ]
     ++ lib.optionals enablePython [
-      boost_python
       python3
+      python3.pkgs.boost-python
     ];
 
   propagatedBuildInputs =

pkgs/by-name/ge/gepetto-viewer-corba/package.nix

@@ -1,10 +1,8 @@
 {
-  boost,
   cmake,
   doxygen,
   fetchFromGitHub,
   fontconfig,
-  gepetto-viewer,
   lib,
   pkg-config,
   python3Packages,
@@ -39,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   propagatedBuildInputs = [
-    python3Packages.boost
+    python3Packages.boost-python
     python3Packages.gepetto-viewer
     python3Packages.omniorbpy
   ];

pkgs/by-name/ge/gepetto-viewer/package.nix

@@ -1,5 +1,4 @@
 {
-  boost,
   cmake,
   darwin,
   doxygen,
@@ -42,7 +41,7 @@ let
     ];
 
     buildInputs = [
-      python3Packages.boost
+      python3Packages.boost-python
       python3Packages.python-qt
       libsForQt5.qtbase
     ];

pkgs/by-name/gl/glom/package.nix

@@ -13,14 +13,12 @@
   graphviz,
   makeFontsConf,
   freefont_ttf,
-  boost,
   libxmlxx3,
   libxslt,
   libgdamm,
   libarchive,
   libepc,
   python311,
-  python3,
   ncurses,
   glibmm,
   gtk3,
@@ -66,8 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
     ]
   );
 
-  python_boost = python311.withPackages (pkgs: with pkgs; [ pygobject3 ]);
-
   sphinx-build = python311.pkgs.sphinx.overrideAttrs (super: {
     postFixup =
       super.postFixup or ""
@@ -77,11 +73,6 @@ stdenv.mkDerivation (finalAttrs: {
       '';
   });
 
-  boost_python = boost.override {
-    enablePython = true;
-    python = finalAttrs.python_boost;
-  };
-
   nativeBuildInputs = [
     pkg-config
     autoconf
@@ -101,12 +92,12 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    finalAttrs.boost_python
     glibmm
     gtk3
     openssl
     libxmlxx3
     libxslt
+    python311.pkgs.boost-python
     python311.pkgs.pygobject3
     finalAttrs.gda
     libarchive

pkgs/by-name/le/ledger/package.nix

@@ -58,6 +58,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [
+      boost
       gmp
       mpfr
       libedit
@@ -66,18 +67,10 @@ stdenv.mkDerivation rec {
     ++ lib.optionals gpgmeSupport [
       gpgme
     ]
-    ++ (
-      if usePython then
-        [
-          python3
-          (boost.override {
-            enablePython = true;
-            python = python3;
-          })
-        ]
-      else
-        [ boost ]
-    );
+    ++ lib.optionals usePython [
+      python3
+      python3.pkgs.boost-python
+    ];
 
   nativeBuildInputs = [
     cmake

pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix

@@ -16,20 +16,6 @@
 let
   version = "1.2.19";
 
-  # Make sure we override python, so the correct version is chosen
-  # for the bindings, if overridden
-  boostPython = boost186.override (_: {
-    enablePython = true;
-    python = python311;
-    enableStatic = true;
-    enableShared = false;
-    enableSingleThreaded = false;
-    enableMultiThreaded = true;
-    # So that libraries will be named like 'libboost_system.a' instead
-    # of 'libboost_system-x64.a'.
-    taggedLayout = false;
-  });
-
   opensslStatic = openssl.override (_: {
     static = true;
   });
@@ -43,7 +29,7 @@ stdenv.mkDerivation {
     owner = "arvidn";
     repo = "libtorrent";
     rev = "v${version}";
-    hash = "sha256-HkpaOCBL+0Kc7M9DmnW2dUGC+b60a7n5n3i1SyRfkb4=";
+    hash = "sha256-KxyJmG7PdOjGPe18Dd3nzKI5X7B0MovWN8vq7llFFRc=";
   };
 
   enableParallelBuilding = true;
@@ -56,7 +42,7 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    boostPython
+    (boost186.withPython python311)
     opensslStatic
     zlib
     python311
@@ -87,8 +73,8 @@ stdenv.mkDerivation {
   configureFlags = [
     "--enable-python-binding"
     "--with-libiconv=yes"
-    "--with-boost=${boostPython.dev}"
-    "--with-boost-libdir=${boostPython.out}/lib"
+    "--with-boost=${lib.getDev boost186}"
+    "--with-boost-libdir=${boost186.withPython python311}/lib"
   ];
 
   meta = with lib; {

pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix

@@ -10,24 +10,14 @@
   ncurses,
 }:
 
-let
-  version = "2.0.11";
-
-  # Make sure we override python, so the correct version is chosen
-  boostPython = boost.override {
-    enablePython = true;
-    python = python3;
-  };
-
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libtorrent-rasterbar";
-  inherit version;
+  version = "2.0.11";
 
   src = fetchFromGitHub {
     owner = "arvidn";
     repo = "libtorrent";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-iph42iFEwP+lCWNPiOJJOejISFF6iwkGLY9Qg8J4tyo=";
     fetchSubmodules = true;
   };
@@ -38,7 +28,7 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    boostPython
+    (boost.withPython python3)
     openssl
   ];
 
@@ -86,4 +76,4 @@ stdenv.mkDerivation {
     maintainers = [ ];
     platforms = platforms.unix;
   };
-}
+})

pkgs/by-name/ne/nextpnr/package.nix

@@ -6,7 +6,6 @@
   boost,
   python3,
   eigen,
-  python3Packages,
   icestorm,
   trellis,
   llvmPackages,
@@ -17,11 +16,6 @@
 }:
 
 let
-  boostPython = boost.override {
-    python = python3;
-    enablePython = true;
-  };
-
   pname = "nextpnr";
   version = "0.8";
 
@@ -57,9 +51,9 @@ stdenv.mkDerivation rec {
   ] ++ (lib.optional enableGui wrapQtAppsHook);
   buildInputs =
     [
-      boostPython
+      boost
       eigen
-      python3Packages.apycula
+      python3.pkgs.apycula
     ]
     ++ (lib.optional enableGui qtbase)
     ++ (lib.optional stdenv.cc.isClang llvmPackages.openmp);
@@ -78,7 +72,7 @@ stdenv.mkDerivation rec {
       "-DICESTORM_INSTALL_PREFIX=${icestorm}"
       "-DTRELLIS_INSTALL_PREFIX=${trellis}"
       "-DTRELLIS_LIBDIR=${trellis}/lib/trellis"
-      "-DGOWIN_BBA_EXECUTABLE=${python3Packages.apycula}/bin/gowin_bba"
+      "-DGOWIN_BBA_EXECUTABLE=${python3.pkgs.apycula}/bin/gowin_bba"
       "-DUSE_OPENMP=ON"
       "-DHIMBAECHEL_UARCH=all"
       "-DHIMBAECHEL_GOWIN_DEVICES=all"