diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index b5f721c3d772..310f9b1c6067 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -39,7 +39,7 @@ , pcre2 , libdeflate -, swig4 +, swig , python , wxPython , opencascade-occt_7_6 @@ -168,7 +168,7 @@ stdenv.mkDerivation rec { curl openssl boost - swig4 + swig python unixODBC libdeflate diff --git a/pkgs/applications/science/electronics/openroad/default.nix b/pkgs/applications/science/electronics/openroad/default.nix index 0c929fe47c18..65bf094c2a2c 100644 --- a/pkgs/applications/science/electronics/openroad/default.nix +++ b/pkgs/applications/science/electronics/openroad/default.nix @@ -8,7 +8,7 @@ , flex , git , python3 -, swig4 +, swig , boost179 , cbc # for clp , cimg @@ -51,7 +51,7 @@ mkDerivation rec { flex git pkg-config - swig4 + swig ]; buildInputs = [ diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index cff0c5560e24..5f3f68fb03f5 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -29,7 +29,7 @@ , wrapGAppsHook3 , scriptingSupport ? true , luajit -, swig4 +, swig , python3 , alsaSupport ? stdenv.isLinux , alsa-lib @@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook3 wrapQtAppsHook ] - ++ optional scriptingSupport swig4; + ++ optional scriptingSupport swig; buildInputs = [ curl diff --git a/pkgs/by-name/ba/babeltrace/package.nix b/pkgs/by-name/ba/babeltrace/package.nix index 4d651d5e700e..93673789fb8f 100644 --- a/pkgs/by-name/ba/babeltrace/package.nix +++ b/pkgs/by-name/ba/babeltrace/package.nix @@ -11,7 +11,7 @@ elfutils, enablePython ? false, pythonPackages ? null, - swig4, + swig, }: stdenv.mkDerivation (finalAttrs: { @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ] ++ lib.optionals enablePython [ - swig4 + swig pythonPackages.setuptools ]; buildInputs = [ diff --git a/pkgs/by-name/ca/casadi/package.nix b/pkgs/by-name/ca/casadi/package.nix index 9c39449704df..dda1eed048d0 100644 --- a/pkgs/by-name/ca/casadi/package.nix +++ b/pkgs/by-name/ca/casadi/package.nix @@ -30,7 +30,7 @@ #sundials, superscs, spral, - swig4, + swig, tinyxml-2, withUnfree ? false, }: @@ -139,7 +139,7 @@ stdenv.mkDerivation (finalAttrs: { #sundials superscs spral - swig4 + swig tinyxml-2 ] ++ lib.optionals withUnfree [ diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index cacfb778c7bc..33afe0ea7c54 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -10,7 +10,7 @@ , libiconv , enablePython ? false , python ? null -, swig4 +, swig , expat , libuuid , openjpeg @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ApplicationServices Cocoa libiconv - ] ++ lib.optionals enablePython [ swig4 python ]; + ] ++ lib.optionals enablePython [ swig python ]; disabledTests = [ # require networking: diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index d6c2a10edb8c..fa4bb1be6dd3 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -15,7 +15,7 @@ buildPackages, qtbase ? null, pythonSupport ? false, - swig4 ? null, + swig ? null, # only for passthru.tests libsForQt5, qt6Packages, @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { python3.pkgs.setuptools python3.pkgs.wheel ncurses - swig4 + swig which ]; diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index cb4670204d11..43ad807a9d65 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -14,7 +14,7 @@ , python , re2 , stdenv -, swig4 +, swig , unzip , zlib }: @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { ensureNewerSourcesForZipFilesHook pkg-config python.pythonOnBuildForHost - swig4 + swig unzip ] ++ lib.optionals stdenv.isDarwin [ DarwinTools diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix index fbdfd20441d9..c17064729f96 100644 --- a/pkgs/development/libraries/simpleitk/default.nix +++ b/pkgs/development/libraries/simpleitk/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , cmake -, swig4 +, swig , lua , elastix , itk @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - swig4 + swig ]; buildInputs = [ elastix diff --git a/pkgs/development/python-modules/lttng/default.nix b/pkgs/development/python-modules/lttng/default.nix index 735eb4408a32..521def0abf77 100644 --- a/pkgs/development/python-modules/lttng/default.nix +++ b/pkgs/development/python-modules/lttng/default.nix @@ -2,7 +2,7 @@ toPythonModule, python, lttng-tools, - swig4, + swig, }: toPythonModule ( @@ -15,7 +15,7 @@ toPythonModule ( { pname = "lttng"; - nativeBuildInputs = nativeBuildInputs ++ [ swig4 ]; + nativeBuildInputs = nativeBuildInputs ++ [ swig ]; configureFlags = configureFlags ++ [ "--enable-python-bindings" diff --git a/pkgs/development/python-modules/pykcs11/default.nix b/pkgs/development/python-modules/pykcs11/default.nix index 5700fd4523a6..b4fdeb938147 100644 --- a/pkgs/development/python-modules/pykcs11/default.nix +++ b/pkgs/development/python-modules/pykcs11/default.nix @@ -4,7 +4,7 @@ callPackage, fetchPypi, setuptools, - swig4, + swig, }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeBuildInputs = [ swig4 ]; + nativeBuildInputs = [ swig ]; pypaBuildFlags = [ "--skip-dependency-check" ]; diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix index 1718cf91593e..f01fb4ca467e 100644 --- a/pkgs/development/python-modules/pythonocc-core/default.nix +++ b/pkgs/development/python-modules/pythonocc-core/default.nix @@ -15,7 +15,7 @@ libXmu, opencascade-occt, rapidjson, - swig4, + swig, }: stdenv.mkDerivation rec { @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - swig4 + swig ]; buildInputs = [ python diff --git a/pkgs/development/python-modules/simpleitk/default.nix b/pkgs/development/python-modules/simpleitk/default.nix index f241cd0a2968..e15a2a7a726d 100644 --- a/pkgs/development/python-modules/simpleitk/default.nix +++ b/pkgs/development/python-modules/simpleitk/default.nix @@ -2,7 +2,7 @@ buildPythonPackage, pythonOlder, cmake, - swig4, + swig, elastix, itk, numpy, @@ -27,7 +27,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake - swig4 + swig scikit-build ]; propagatedBuildInputs = [ diff --git a/pkgs/tools/security/grap/default.nix b/pkgs/tools/security/grap/default.nix index 4d8f347e048a..7f8d931fbb6a 100644 --- a/pkgs/tools/security/grap/default.nix +++ b/pkgs/tools/security/grap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, boost, libseccomp, flex, swig4, bison, cmake, python3 }: +{ lib, stdenv, fetchFromGitHub, boost, libseccomp, flex, swig, bison, cmake, python3 }: stdenv.mkDerivation rec { pname = "grap"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmake flex python3 - swig4 + swig ]; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ec1ff406922..5388c601eaa9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32022,9 +32022,7 @@ with pkgs; open-policy-agent = callPackage ../development/tools/open-policy-agent { }; - openmm = callPackage ../development/libraries/science/chemistry/openmm { - swig = swig4; - }; + openmm = callPackage ../development/libraries/science/chemistry/openmm { }; openshift = callPackage ../applications/networking/cluster/openshift { }; @@ -37631,9 +37629,6 @@ with pkgs; faiss = callPackage ../development/libraries/science/math/faiss { pythonPackages = python3Packages; - # faiss wants the "-doxygen" option - # available only since swig4 - swig = swig4; }; faissWithCuda = faiss.override {