Commit 2181ab3e authored by Emily's avatar Emily
Browse files

treewide: unpin SWIG 4

parent e3360d74
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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
+2 −2
Original line number Diff line number Diff line
@@ -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 = [
+2 −2
Original line number Diff line number Diff line
@@ -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
+2 −2
Original line number Diff line number Diff line
@@ -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 = [
+2 −2
Original line number Diff line number Diff line
@@ -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 [
Loading