From 5e30039235470289bad73826db24f2d43bcfc460 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Fri, 3 Nov 2023 11:37:04 +0100
Subject: [PATCH 1/5] wiremock: migrate to by-name

---
 .../wiremock/default.nix => by-name/wi/wiremock/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/networking/wiremock/default.nix => by-name/wi/wiremock/package.nix} (100%)

diff --git a/pkgs/tools/networking/wiremock/default.nix b/pkgs/by-name/wi/wiremock/package.nix
similarity index 100%
rename from pkgs/tools/networking/wiremock/default.nix
rename to pkgs/by-name/wi/wiremock/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b77a2a73ceec..e80636256813 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -41790,8 +41790,6 @@ with pkgs;
 
   wire-desktop = callPackage ../applications/networking/instant-messengers/wire-desktop { };
 
-  wiremock = callPackage ../tools/networking/wiremock { };
-
   wireworld = callPackage ../games/wireworld { };
 
 

From f24ea67184330c8269bb1b39f47fe070967ad668 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Fri, 3 Nov 2023 11:39:52 +0100
Subject: [PATCH 2/5] wiremock: add anthonyroussel to maintainers

---
 pkgs/by-name/wi/wiremock/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/wi/wiremock/package.nix b/pkgs/by-name/wi/wiremock/package.nix
index bfa0f9adf248..d06679276379 100644
--- a/pkgs/by-name/wi/wiremock/package.nix
+++ b/pkgs/by-name/wi/wiremock/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A flexible tool for building mock APIs";
     homepage = "https://wiremock.org/";
-    maintainers = with lib.maintainers; [ bobvanderlinden ];
+    maintainers = with lib.maintainers; [ bobvanderlinden anthonyroussel ];
     platforms = jre.meta.platforms;
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
     license = lib.licenses.asl20;

From 384f17bfad3fd9cd7e410b371f8739ee67d31371 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Fri, 3 Nov 2023 11:40:01 +0100
Subject: [PATCH 3/5] wiremock: add meta.{changelog,mainProgram}

---
 pkgs/by-name/wi/wiremock/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/wi/wiremock/package.nix b/pkgs/by-name/wi/wiremock/package.nix
index d06679276379..abe517c8f6d3 100644
--- a/pkgs/by-name/wi/wiremock/package.nix
+++ b/pkgs/by-name/wi/wiremock/package.nix
@@ -23,7 +23,9 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A flexible tool for building mock APIs";
     homepage = "https://wiremock.org/";
+    changelog = "https://github.com/wiremock/wiremock/releases/tag/${version}";
     maintainers = with lib.maintainers; [ bobvanderlinden anthonyroussel ];
+    mainProgram = "wiremock";
     platforms = jre.meta.platforms;
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
     license = lib.licenses.asl20;

From c4d3c3cc1a4fc86e816b27433711fed76e04e5d4 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Fri, 3 Nov 2023 11:47:41 +0100
Subject: [PATCH 4/5] wiremock: 2.35.0 -> 3.2.0

https://github.com/wiremock/wiremock/releases/tag/3.2.0
https://github.com/wiremock/wiremock/compare/2.35.0...3.2.0
---
 pkgs/by-name/wi/wiremock/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wi/wiremock/package.nix b/pkgs/by-name/wi/wiremock/package.nix
index abe517c8f6d3..225e5b953bc2 100644
--- a/pkgs/by-name/wi/wiremock/package.nix
+++ b/pkgs/by-name/wi/wiremock/package.nix
@@ -2,10 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "wiremock";
-  version = "2.35.0";
+  version = "3.2.0";
+
   src = fetchurl {
-    url = "mirror://maven/com/github/tomakehurst/wiremock-jre8-standalone/${version}/wiremock-jre8-standalone-${version}.jar";
-    hash = "sha256-rhVq4oEuPPpHDEftBzEA707HeSc3Kk4gPw471THz61c=";
+    url = "mirror://maven/org/wiremock/wiremock-standalone/${version}/wiremock-standalone-${version}.jar";
+    hash = "sha256-voO9UAxhxQlWWs4jMji93TBUCcFWht/4Cea+UpBmL3Q=";
   };
 
   dontUnpack = true;

From 1f15c08dc995e1bf0e4687b484c69a13c11a5b6e Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Fri, 3 Nov 2023 11:48:21 +0100
Subject: [PATCH 5/5] wiremock: add passthru.updateScript

---
 pkgs/by-name/wi/wiremock/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/wi/wiremock/package.nix b/pkgs/by-name/wi/wiremock/package.nix
index 225e5b953bc2..380f3f1caa9d 100644
--- a/pkgs/by-name/wi/wiremock/package.nix
+++ b/pkgs/by-name/wi/wiremock/package.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, jre, makeWrapper }:
+{ lib, stdenv, fetchurl, jre, makeWrapper, gitUpdater }:
 
 stdenv.mkDerivation rec {
   pname = "wiremock";
@@ -21,6 +21,11 @@ stdenv.mkDerivation rec {
       --add-flags "-jar $out/share/wiremock/wiremock.jar"
   '';
 
+  passthru.updateScript = gitUpdater {
+    url = "https://github.com/wiremock/wiremock.git";
+    ignoredVersions = "(alpha|beta|rc).*";
+  };
+
   meta = {
     description = "A flexible tool for building mock APIs";
     homepage = "https://wiremock.org/";