From 0fe59d89000599a3856a0eb44b3c0f139a8aaecc Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Thu, 12 Sep 2024 14:24:31 +0100
Subject: [PATCH 1/9] llvmPackages_{12,13}.lldb: mark broken
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These have been failing to build on Hydra for over two months. It
looks like it might be a Python 3.12‐related thing, but the SWIG
4 patches wouldn’t apply cleanly and these old versions should
probably just be dropped anyway.
---
 pkgs/development/compilers/llvm/common/lldb.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/lldb.nix b/pkgs/development/compilers/llvm/common/lldb.nix
index 02cd334d0a70..f609ae917dbf 100644
--- a/pkgs/development/compilers/llvm/common/lldb.nix
+++ b/pkgs/development/compilers/llvm/common/lldb.nix
@@ -186,10 +186,7 @@ stdenv.mkDerivation (rec {
       larger LLVM Project, such as the Clang expression parser and LLVM
       disassembler.
     '';
-    # llvm <10 never built on aarch64-darwin since first introduction in nixpkgs
-    broken =
-      (lib.versionOlder release_version "11" && stdenv.isDarwin && stdenv.isAarch64)
-        || (((lib.versions.major release_version) == "13") && stdenv.isDarwin);
+    broken = lib.versionOlder release_version "14";
     mainProgram = "lldb";
   };
 } // lib.optionalAttrs enableManpages {

From 1e9f0328783c77480b690fd589872e43c6df20e1 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Thu, 12 Sep 2024 11:20:59 +0100
Subject: [PATCH 2/9] llvmPackages_{14,15,16,17}.lldb: use SWIG 4

The patches are already included in LLVM 16 and 17.
---
 .../compilers/llvm/common/default.nix         | 29 ++++++++++++++++++-
 .../compilers/llvm/common/lldb.nix            |  4 +--
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix
index fe5b432f8cf0..1c56e0f6f4c1 100644
--- a/pkgs/development/compilers/llvm/common/default.nix
+++ b/pkgs/development/compilers/llvm/common/default.nix
@@ -10,6 +10,7 @@
   substituteAll,
   fetchFromGitHub,
   fetchpatch,
+  fetchpatch2,
   overrideCC,
   wrapCCWith,
   wrapBintoolsWith,
@@ -606,9 +607,35 @@ let
                   (_: _: { name = "resource-dir.patch"; })
               ) { };
             in
-            lib.optional (lib.versionOlder metadata.release_version "16")
+            lib.optionals (lib.versionOlder metadata.release_version "15") [
+              # Fixes for SWIG 4
+              (fetchpatch2 {
+                url = "https://github.com/llvm/llvm-project/commit/81fc5f7909a4ef5a8d4b5da2a10f77f7cb01ba63.patch?full_index=1";
+                stripLen = 1;
+                hash = "sha256-Znw+C0uEw7lGETQLKPBZV/Ymo2UigZS+Hv/j1mUo7p0=";
+              })
+              (fetchpatch2 {
+                url = "https://github.com/llvm/llvm-project/commit/f0a25fe0b746f56295d5c02116ba28d2f965c175.patch?full_index=1";
+                stripLen = 1;
+                hash = "sha256-QzVeZzmc99xIMiO7n//b+RNAvmxghISKQD93U2zOgFI=";
+              })
+            ]
+            ++ lib.optionals (lib.versionOlder metadata.release_version "16") [
+              # Fixes for SWIG 4
+              (fetchpatch2 {
+                url = "https://github.com/llvm/llvm-project/commit/ba35c27ec9aa9807f5b4be2a0c33ca9b045accc7.patch?full_index=1";
+                stripLen = 1;
+                hash = "sha256-LXl+WbpmWZww5xMDrle3BM2Tw56v8k9LO1f1Z1/wDTs=";
+              })
+              (fetchpatch2 {
+                url = "https://github.com/llvm/llvm-project/commit/9ec115978ea2bdfc60800cd3c21264341cdc8b0a.patch?full_index=1";
+                stripLen = 1;
+                hash = "sha256-u0zSejEjfrH3ZoMFm1j+NVv2t5AP9cE5yhsrdTS1dG4=";
+              })
+
               # FIXME: do we need this after 15?
               (metadata.getVersionFile "lldb/procfs.patch")
+            ]
             ++ lib.optional (lib.versionOlder metadata.release_version "17") resourceDirPatch
             ++ lib.optional (lib.versionOlder metadata.release_version "14") (
               metadata.getVersionFile "lldb/gnu-install-dirs.patch"
diff --git a/pkgs/development/compilers/llvm/common/lldb.nix b/pkgs/development/compilers/llvm/common/lldb.nix
index f609ae917dbf..65974e757c4b 100644
--- a/pkgs/development/compilers/llvm/common/lldb.nix
+++ b/pkgs/development/compilers/llvm/common/lldb.nix
@@ -5,8 +5,7 @@
 , cmake
 , zlib
 , ncurses
-, swig3
-, swig4
+, swig
 , which
 , libedit
 , libxml2
@@ -42,7 +41,6 @@ let
     name = if lib.versionAtLeast release_version "18" then "lldb-dap" else "lldb-vscode";
     version = if lib.versionAtLeast release_version "18" then "0.2.0" else "0.1.0";
   };
-  swig = if lib.versionAtLeast release_version "18" then swig4 else swig3;
 in
 
 stdenv.mkDerivation (rec {

From 6bbe65701d19e5c3e3fc0d1ae00c5c5ea6a48168 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Thu, 12 Sep 2024 17:50:03 +0100
Subject: [PATCH 3/9] swift: add LLVM patches for SWIG 4

---
 .../compilers/swift/compiler/default.nix      | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix
index 31cbd298603a..e4a15321fb09 100644
--- a/pkgs/development/compilers/swift/compiler/default.nix
+++ b/pkgs/development/compilers/swift/compiler/default.nix
@@ -13,6 +13,7 @@
 , python3Packages
 , git
 , fetchpatch
+, fetchpatch2
 , makeWrapper
 , gnumake
 , file
@@ -302,6 +303,32 @@ in stdenv.mkDerivation {
 
     patch -p1 -d llvm-project/llvm -i ${./patches/llvm-module-cache.patch}
 
+    for lldbPatch in ${lib.escapeShellArgs [
+      # Fixes for SWIG 4
+      (fetchpatch2 {
+        url = "https://github.com/llvm/llvm-project/commit/81fc5f7909a4ef5a8d4b5da2a10f77f7cb01ba63.patch?full_index=1";
+        stripLen = 1;
+        hash = "sha256-Znw+C0uEw7lGETQLKPBZV/Ymo2UigZS+Hv/j1mUo7p0=";
+      })
+      (fetchpatch2 {
+        url = "https://github.com/llvm/llvm-project/commit/f0a25fe0b746f56295d5c02116ba28d2f965c175.patch?full_index=1";
+        stripLen = 1;
+        hash = "sha256-QzVeZzmc99xIMiO7n//b+RNAvmxghISKQD93U2zOgFI=";
+      })
+      (fetchpatch2 {
+        url = "https://github.com/llvm/llvm-project/commit/ba35c27ec9aa9807f5b4be2a0c33ca9b045accc7.patch?full_index=1";
+        stripLen = 1;
+        hash = "sha256-LXl+WbpmWZww5xMDrle3BM2Tw56v8k9LO1f1Z1/wDTs=";
+      })
+      (fetchpatch2 {
+        url = "https://github.com/llvm/llvm-project/commit/9ec115978ea2bdfc60800cd3c21264341cdc8b0a.patch?full_index=1";
+        stripLen = 1;
+        hash = "sha256-u0zSejEjfrH3ZoMFm1j+NVv2t5AP9cE5yhsrdTS1dG4=";
+      })
+    ]}; do
+      patch -p1 -d llvm-project/lldb -i $lldbPatch
+    done
+
     patch -p1 -d llvm-project/clang -i ${./patches/clang-toolchain-dir.patch}
     patch -p1 -d llvm-project/clang -i ${./patches/clang-wrap.patch}
     patch -p1 -d llvm-project/clang -i ${../../llvm/12/clang/purity.patch}

From b4bfb990484c0abda144d4f113a8287110408725 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Thu, 12 Sep 2024 18:37:08 +0100
Subject: [PATCH 4/9] swift: disable `zerocallusedregs` on all AArch64

---
 pkgs/development/compilers/swift/compiler/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix
index e4a15321fb09..d3e2017958fd 100644
--- a/pkgs/development/compilers/swift/compiler/default.nix
+++ b/pkgs/development/compilers/swift/compiler/default.nix
@@ -392,7 +392,7 @@ in stdenv.mkDerivation {
   '';
 
   # > clang-15-unwrapped: error: unsupported option '-fzero-call-used-regs=used-gpr' for target 'arm64-apple-macosx10.9.0'
-  hardeningDisable = lib.optional stdenv.isDarwin "zerocallusedregs";
+  hardeningDisable = lib.optional stdenv.isAarch64 "zerocallusedregs";
 
   configurePhase = ''
     export SWIFT_SOURCE_ROOT="$PWD"

From bfab6b0f83860193ff1873a3f15449f9427e11bf Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Thu, 12 Sep 2024 11:25:58 +0100
Subject: [PATCH 5/9] swig3: drop

This version is no longer used for anything in the tree.
---
 pkgs/development/tools/misc/swig/3.x.nix | 36 ------------------------
 pkgs/top-level/aliases.nix               |  1 +
 pkgs/top-level/all-packages.nix          |  1 -
 3 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/swig/3.x.nix

diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix
deleted file mode 100644
index 4b266044ff84..000000000000
--- a/pkgs/development/tools/misc/swig/3.x.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
-
-stdenv.mkDerivation rec {
-  pname = "swig";
-  version = "3.0.12";
-
-  src = fetchFromGitHub {
-    owner = "swig";
-    repo = "swig";
-    rev = "rel-${version}";
-    sha256 = "1wyffskbkzj5zyhjnnpip80xzsjcr3p0q5486z3wdwabnysnhn8n";
-  };
-
-  PCRE_CONFIG = "${pcre.dev}/bin/pcre-config";
-  nativeBuildInputs = [ autoconf automake libtool bison ];
-  buildInputs = [ pcre ];
-
-  configureFlags = [ "--without-tcl" ];
-
-  # Disable ccache documentation as it needs yodl
-  postPatch = ''
-    sed -i '/man1/d' CCache/Makefile.in
-  '';
-
-  preConfigure = ''
-    ./autogen.sh
-  '';
-
-  meta = with lib; {
-    description = "Interface compiler that connects C/C++ code to higher-level languages";
-    homepage = "https://swig.org/";
-    # Different types of licenses available: http://www.swig.org/Release/LICENSE .
-    license = licenses.gpl3Plus;
-    platforms = with platforms; linux ++ darwin;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 9c7df2a52020..c196c223b895 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1482,6 +1482,7 @@ mapAliases ({
   swift-im = throw "swift-im has been removed as it is unmaintained and depends on deprecated Python 2 / Qt WebKit"; # Added 2023-01-06
   swig1 = throw "swig1 has been removed as it is obsolete"; # Added 2024-08-23
   swig2 = throw "swig2 has been removed as it is obsolete"; # Added 2024-08-23
+  swig3 = throw "swig3 has been removed as it is obsolete"; # Added 2024-09-12
   swtpm-tpm2 = swtpm; # Added 2021-02-26
   Sylk = sylk; # Added 2024-06-12
   symbiyosys = sby; # Added 2024-08-18
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c12c64eac07b..525e8ff5e2fe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18955,7 +18955,6 @@ with pkgs;
 
   systemfd = callPackage ../development/tools/systemfd { };
 
-  swig3 = callPackage ../development/tools/misc/swig/3.x.nix { };
   swig4 = callPackage ../development/tools/misc/swig/4.nix { };
   swig = swig4;
   swigWithJava = swig;

From 44e6a1456fc05325fa00e641fb8d0f900874098a Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Thu, 12 Sep 2024 11:33:58 +0100
Subject: [PATCH 6/9] swig: move to `pkgs/by-name`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Let’s see if we can’t keep only one version of this going forward.

`swigWithJava` has been an alias since 2009(!), so let’s just drop it.
---
 .../tools/misc/swig/4.nix => by-name/sw/swig/package.nix}     | 0
 pkgs/top-level/aliases.nix                                    | 2 ++
 pkgs/top-level/all-packages.nix                               | 4 ----
 3 files changed, 2 insertions(+), 4 deletions(-)
 rename pkgs/{development/tools/misc/swig/4.nix => by-name/sw/swig/package.nix} (100%)

diff --git a/pkgs/development/tools/misc/swig/4.nix b/pkgs/by-name/sw/swig/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/swig/4.nix
rename to pkgs/by-name/sw/swig/package.nix
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index c196c223b895..cd191e12b83d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1483,6 +1483,8 @@ mapAliases ({
   swig1 = throw "swig1 has been removed as it is obsolete"; # Added 2024-08-23
   swig2 = throw "swig2 has been removed as it is obsolete"; # Added 2024-08-23
   swig3 = throw "swig3 has been removed as it is obsolete"; # Added 2024-09-12
+  swig4 = swig; # Added 2024-09-12
+  swigWithJava = throw "swigWithJava has been removed as the main swig package has supported Java since 2009"; # Added 2024-09-12
   swtpm-tpm2 = swtpm; # Added 2021-02-26
   Sylk = sylk; # Added 2024-06-12
   symbiyosys = sby; # Added 2024-08-18
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 525e8ff5e2fe..4ec1ff406922 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18955,10 +18955,6 @@ with pkgs;
 
   systemfd = callPackage ../development/tools/systemfd { };
 
-  swig4 = callPackage ../development/tools/misc/swig/4.nix { };
-  swig = swig4;
-  swigWithJava = swig;
-
   c2ffi = callPackage ../development/tools/misc/c2ffi { };
 
   c0 = callPackage ../development/compilers/c0 {

From e3360d745c36caed0b868e0447e57fb30b1fb9d9 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Thu, 12 Sep 2024 11:34:43 +0100
Subject: [PATCH 7/9] swig: format with `nixfmt-rfc-style`

---
 pkgs/by-name/sw/swig/package.nix | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sw/swig/package.nix b/pkgs/by-name/sw/swig/package.nix
index bae53ad42f9d..1ccaf4fb13fe 100644
--- a/pkgs/by-name/sw/swig/package.nix
+++ b/pkgs/by-name/sw/swig/package.nix
@@ -1,4 +1,13 @@
-{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre2 }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoconf,
+  automake,
+  libtool,
+  bison,
+  pcre2,
+}:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "swig";
@@ -12,7 +21,12 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   PCRE_CONFIG = "${pcre2.dev}/bin/pcre-config";
-  nativeBuildInputs = [ autoconf automake libtool bison ];
+  nativeBuildInputs = [
+    autoconf
+    automake
+    libtool
+    bison
+  ];
   buildInputs = [ pcre2 ];
 
   configureFlags = [ "--without-tcl" ];

From 2181ab3e2290410c80e83ccda4496439b11d871c Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Thu, 12 Sep 2024 11:37:35 +0100
Subject: [PATCH 8/9] treewide: unpin SWIG 4

---
 pkgs/applications/science/electronics/kicad/base.nix       | 4 ++--
 pkgs/applications/science/electronics/openroad/default.nix | 4 ++--
 pkgs/applications/video/obs-studio/default.nix             | 4 ++--
 pkgs/by-name/ba/babeltrace/package.nix                     | 4 ++--
 pkgs/by-name/ca/casadi/package.nix                         | 4 ++--
 pkgs/development/libraries/gdcm/default.nix                | 4 ++--
 pkgs/development/libraries/gpgme/default.nix               | 4 ++--
 .../libraries/science/math/or-tools/default.nix            | 4 ++--
 pkgs/development/libraries/simpleitk/default.nix           | 4 ++--
 pkgs/development/python-modules/lttng/default.nix          | 4 ++--
 pkgs/development/python-modules/pykcs11/default.nix        | 4 ++--
 pkgs/development/python-modules/pythonocc-core/default.nix | 4 ++--
 pkgs/development/python-modules/simpleitk/default.nix      | 4 ++--
 pkgs/tools/security/grap/default.nix                       | 4 ++--
 pkgs/top-level/all-packages.nix                            | 7 +------
 15 files changed, 29 insertions(+), 34 deletions(-)

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 {

From db5f130b432c501ea758f79ff1dd23cfc4a24cb0 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Thu, 12 Sep 2024 11:37:35 +0100
Subject: [PATCH 9/9] gforth: adjust comment

This no longer uses the `swig3` package.
---
 pkgs/development/compilers/gforth/swig.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gforth/swig.nix b/pkgs/development/compilers/gforth/swig.nix
index 92d4c2dcc97f..84cdaee6a36a 100644
--- a/pkgs/development/compilers/gforth/swig.nix
+++ b/pkgs/development/compilers/gforth/swig.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 }:
 
-## for updating to swig4, see
+## for updating to SWIG 4, see
 ## https://github.com/GeraldWodni/swig/pull/6
 (swig.overrideAttrs (old: {
   version = "3.0.9-forth";