From d658bf38b434a434b34692e86c4fe9f28ca83d2e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Apr 2024 10:13:18 +0000
Subject: gmid: 1.8.6 -> 2.0.2

---
 pkgs/servers/gemini/gmid/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/servers/gemini/gmid/default.nix b/pkgs/servers/gemini/gmid/default.nix
index 95e76aafd9fe..b7682b2b6221 100644
--- a/pkgs/servers/gemini/gmid/default.nix
+++ b/pkgs/servers/gemini/gmid/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gmid";
-  version = "1.8.6";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = "omar-polo";
     repo = pname;
     rev = version;
-    hash = "sha256-ds5k5VHwc7/sq4PUe/WvxAx7gJkU4phKZk0KunPLNE0=";
+    hash = "sha256-5K6+CVX0/m6SBcTvwy4GD0x9R/yQjd+2tTJiA4OagcI=";
   };
 
   nativeBuildInputs = [ bison ];
-- 
cgit v1.2.3


From eaf5fc1813adefeea57a3312e7009c6784ddd50e Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Wed, 10 Apr 2024 19:47:15 +0400
Subject: gmid: migrate to by-name

---
 pkgs/by-name/gm/gmid/package.nix     | 29 +++++++++++++++++++++++++++++
 pkgs/servers/gemini/gmid/default.nix | 29 -----------------------------
 pkgs/top-level/all-packages.nix      |  2 --
 3 files changed, 29 insertions(+), 31 deletions(-)
 create mode 100644 pkgs/by-name/gm/gmid/package.nix
 delete mode 100644 pkgs/servers/gemini/gmid/default.nix

(limited to 'pkgs')

diff --git a/pkgs/by-name/gm/gmid/package.nix b/pkgs/by-name/gm/gmid/package.nix
new file mode 100644
index 000000000000..b7682b2b6221
--- /dev/null
+++ b/pkgs/by-name/gm/gmid/package.nix
@@ -0,0 +1,29 @@
+{ lib, stdenv, fetchFromGitHub, bison, libressl, libevent }:
+
+stdenv.mkDerivation rec {
+  pname = "gmid";
+  version = "2.0.2";
+
+  src = fetchFromGitHub {
+    owner = "omar-polo";
+    repo = pname;
+    rev = version;
+    hash = "sha256-5K6+CVX0/m6SBcTvwy4GD0x9R/yQjd+2tTJiA4OagcI=";
+  };
+
+  nativeBuildInputs = [ bison ];
+
+  buildInputs = [ libressl libevent ];
+
+  configureFlags = [
+    "PREFIX=${placeholder "out"}"
+  ];
+
+  meta = with lib; {
+    description = "Simple and secure Gemini server";
+    homepage = "https://gmid.omarpolo.com/";
+    license = licenses.isc;
+    maintainers = with maintainers; [ sikmir ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/servers/gemini/gmid/default.nix b/pkgs/servers/gemini/gmid/default.nix
deleted file mode 100644
index b7682b2b6221..000000000000
--- a/pkgs/servers/gemini/gmid/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, bison, libressl, libevent }:
-
-stdenv.mkDerivation rec {
-  pname = "gmid";
-  version = "2.0.2";
-
-  src = fetchFromGitHub {
-    owner = "omar-polo";
-    repo = pname;
-    rev = version;
-    hash = "sha256-5K6+CVX0/m6SBcTvwy4GD0x9R/yQjd+2tTJiA4OagcI=";
-  };
-
-  nativeBuildInputs = [ bison ];
-
-  buildInputs = [ libressl libevent ];
-
-  configureFlags = [
-    "PREFIX=${placeholder "out"}"
-  ];
-
-  meta = with lib; {
-    description = "Simple and secure Gemini server";
-    homepage = "https://gmid.omarpolo.com/";
-    license = licenses.isc;
-    maintainers = with maintainers; [ sikmir ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e3efd2ecff4..ef4427717ebc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3847,8 +3847,6 @@ with pkgs;
 
   gluesql = callPackage ../servers/sql/gluesql { };
 
-  gmid = callPackage ../servers/gemini/gmid { };
-
   gmni = callPackage ../applications/networking/browsers/gmni { };
 
   gmnisrv = callPackage ../servers/gemini/gmnisrv { };
-- 
cgit v1.2.3