lol

treewide: unpin SWIG 4

Emily 2181ab3e e3360d74

+29 -34
+2 -2
pkgs/applications/science/electronics/kicad/base.nix
··· 39 39 , pcre2 40 40 , libdeflate 41 41 42 - , swig4 42 + , swig 43 43 , python 44 44 , wxPython 45 45 , opencascade-occt_7_6 ··· 168 168 curl 169 169 openssl 170 170 boost 171 - swig4 171 + swig 172 172 python 173 173 unixODBC 174 174 libdeflate
+2 -2
pkgs/applications/science/electronics/openroad/default.nix
··· 8 8 , flex 9 9 , git 10 10 , python3 11 - , swig4 11 + , swig 12 12 , boost179 13 13 , cbc # for clp 14 14 , cimg ··· 51 51 flex 52 52 git 53 53 pkg-config 54 - swig4 54 + swig 55 55 ]; 56 56 57 57 buildInputs = [
+2 -2
pkgs/applications/video/obs-studio/default.nix
··· 29 29 , wrapGAppsHook3 30 30 , scriptingSupport ? true 31 31 , luajit 32 - , swig4 32 + , swig 33 33 , python3 34 34 , alsaSupport ? stdenv.isLinux 35 35 , alsa-lib ··· 94 94 wrapGAppsHook3 95 95 wrapQtAppsHook 96 96 ] 97 - ++ optional scriptingSupport swig4; 97 + ++ optional scriptingSupport swig; 98 98 99 99 buildInputs = [ 100 100 curl
+2 -2
pkgs/by-name/ba/babeltrace/package.nix
··· 11 11 elfutils, 12 12 enablePython ? false, 13 13 pythonPackages ? null, 14 - swig4, 14 + swig, 15 15 }: 16 16 17 17 stdenv.mkDerivation (finalAttrs: { ··· 34 34 pkg-config 35 35 ] 36 36 ++ lib.optionals enablePython [ 37 - swig4 37 + swig 38 38 pythonPackages.setuptools 39 39 ]; 40 40 buildInputs = [
+2 -2
pkgs/by-name/ca/casadi/package.nix
··· 30 30 #sundials, 31 31 superscs, 32 32 spral, 33 - swig4, 33 + swig, 34 34 tinyxml-2, 35 35 withUnfree ? false, 36 36 }: ··· 139 139 #sundials 140 140 superscs 141 141 spral 142 - swig4 142 + swig 143 143 tinyxml-2 144 144 ] 145 145 ++ lib.optionals withUnfree [
+2 -2
pkgs/development/libraries/gdcm/default.nix
··· 10 10 , libiconv 11 11 , enablePython ? false 12 12 , python ? null 13 - , swig4 13 + , swig 14 14 , expat 15 15 , libuuid 16 16 , openjpeg ··· 64 64 ApplicationServices 65 65 Cocoa 66 66 libiconv 67 - ] ++ lib.optionals enablePython [ swig4 python ]; 67 + ] ++ lib.optionals enablePython [ swig python ]; 68 68 69 69 disabledTests = [ 70 70 # require networking:
+2 -2
pkgs/development/libraries/gpgme/default.nix
··· 15 15 buildPackages, 16 16 qtbase ? null, 17 17 pythonSupport ? false, 18 - swig4 ? null, 18 + swig ? null, 19 19 # only for passthru.tests 20 20 libsForQt5, 21 21 qt6Packages, ··· 70 70 python3.pkgs.setuptools 71 71 python3.pkgs.wheel 72 72 ncurses 73 - swig4 73 + swig 74 74 which 75 75 ]; 76 76
+2 -2
pkgs/development/libraries/science/math/or-tools/default.nix
··· 14 14 , python 15 15 , re2 16 16 , stdenv 17 - , swig4 17 + , swig 18 18 , unzip 19 19 , zlib 20 20 }: ··· 75 75 ensureNewerSourcesForZipFilesHook 76 76 pkg-config 77 77 python.pythonOnBuildForHost 78 - swig4 78 + swig 79 79 unzip 80 80 ] ++ lib.optionals stdenv.isDarwin [ 81 81 DarwinTools
+2 -2
pkgs/development/libraries/simpleitk/default.nix
··· 2 2 , stdenv 3 3 , fetchFromGitHub 4 4 , cmake 5 - , swig4 5 + , swig 6 6 , lua 7 7 , elastix 8 8 , itk ··· 21 21 22 22 nativeBuildInputs = [ 23 23 cmake 24 - swig4 24 + swig 25 25 ]; 26 26 buildInputs = [ 27 27 elastix
+2 -2
pkgs/development/python-modules/lttng/default.nix
··· 2 2 toPythonModule, 3 3 python, 4 4 lttng-tools, 5 - swig4, 5 + swig, 6 6 }: 7 7 8 8 toPythonModule ( ··· 15 15 { 16 16 pname = "lttng"; 17 17 18 - nativeBuildInputs = nativeBuildInputs ++ [ swig4 ]; 18 + nativeBuildInputs = nativeBuildInputs ++ [ swig ]; 19 19 20 20 configureFlags = configureFlags ++ [ 21 21 "--enable-python-bindings"
+2 -2
pkgs/development/python-modules/pykcs11/default.nix
··· 4 4 callPackage, 5 5 fetchPypi, 6 6 setuptools, 7 - swig4, 7 + swig, 8 8 }: 9 9 10 10 buildPythonPackage rec { ··· 19 19 20 20 build-system = [ setuptools ]; 21 21 22 - nativeBuildInputs = [ swig4 ]; 22 + nativeBuildInputs = [ swig ]; 23 23 24 24 pypaBuildFlags = [ "--skip-dependency-check" ]; 25 25
+2 -2
pkgs/development/python-modules/pythonocc-core/default.nix
··· 15 15 libXmu, 16 16 opencascade-occt, 17 17 rapidjson, 18 - swig4, 18 + swig, 19 19 }: 20 20 21 21 stdenv.mkDerivation rec { ··· 37 37 38 38 nativeBuildInputs = [ 39 39 cmake 40 - swig4 40 + swig 41 41 ]; 42 42 buildInputs = [ 43 43 python
+2 -2
pkgs/development/python-modules/simpleitk/default.nix
··· 2 2 buildPythonPackage, 3 3 pythonOlder, 4 4 cmake, 5 - swig4, 5 + swig, 6 6 elastix, 7 7 itk, 8 8 numpy, ··· 27 27 28 28 nativeBuildInputs = [ 29 29 cmake 30 - swig4 30 + swig 31 31 scikit-build 32 32 ]; 33 33 propagatedBuildInputs = [
+2 -2
pkgs/tools/security/grap/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, boost, libseccomp, flex, swig4, bison, cmake, python3 }: 1 + { lib, stdenv, fetchFromGitHub, boost, libseccomp, flex, swig, bison, cmake, python3 }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "grap"; ··· 16 16 cmake 17 17 flex 18 18 python3 19 - swig4 19 + swig 20 20 ]; 21 21 22 22 buildInputs = [
+1 -6
pkgs/top-level/all-packages.nix
··· 32022 32022 32023 32023 open-policy-agent = callPackage ../development/tools/open-policy-agent { }; 32024 32024 32025 - openmm = callPackage ../development/libraries/science/chemistry/openmm { 32026 - swig = swig4; 32027 - }; 32025 + openmm = callPackage ../development/libraries/science/chemistry/openmm { }; 32028 32026 32029 32027 openshift = callPackage ../applications/networking/cluster/openshift { }; 32030 32028 ··· 37631 37629 37632 37630 faiss = callPackage ../development/libraries/science/math/faiss { 37633 37631 pythonPackages = python3Packages; 37634 - # faiss wants the "-doxygen" option 37635 - # available only since swig4 37636 - swig = swig4; 37637 37632 }; 37638 37633 37639 37634 faissWithCuda = faiss.override {