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] 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 {