gmni: init at 2021-03-26 v2 PROPOSED

Ben Sima: 2
 gmni: init at 2021-03-26
 gmnisrv: init at 2021-03-26

 4 files changed, 47 insertions(+), 0 deletions(-)

[PATCH v2 1/2] gmni: init at 2021-03-26 Export this patch

---
 .../networking/browsers/gmni/default.nix      | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/gmni/default.nix

diff --git a/pkgs/applications/networking/browsers/gmni/default.nix b/pkgs/applications/networking/browsers/gmni/default.nix
new file mode 100644
index 00000000000..e7b5ef6506b
--- /dev/null
+++ b/pkgs/applications/networking/browsers/gmni/default.nix
@@ -0,0 +1,21 @@
+{stdenv, lib, fetchFromSourcehut, pkg-config, bearssl, scdoc}:
+
+stdenv.mkDerivation rec {
+  name = "gmni";
+  version = "2021-03-26";
+  src = fetchFromSourcehut {
+    owner = "~sircmpwn";
+    repo = "gmni";
+    rev = "master";
+    sha256 = "1wvnzyv7vyddcd39y6q5aflpnnsdl4k4y5aj5ssb7vgkld0h1b7r";
+  };

Xinglu Chen

4 months ago

Also, the "master" branch is going to point to a different commit in the
future.  Please use the full revision,
"77b73efbcd3ea7ed9e3e4c0aa19d9247e21d3c87" in this case.

+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ bearssl scdoc ];
+  meta = {
+    description = "A Gemini client";
+    homepage = "https://git.sr.ht/~sircmpwn/gmni";
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ bsima ];
+    platforms = lib.platforms.all;
+  };

Xinglu Chen

4 months ago

Sorry, maybe it was unclear, I meant that you should replace `stdenv.lib`
with `lib`, you can still keep the `with` (`with lib;`).  Apologies for
the confusion.

+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c23ffb81235..e8265a71776 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1366,6 +1366,8 @@ in
 
   glasgow = with python3Packages; toPythonApplication glasgow;
 
+  gmni = callPackage ../applications/networking/browsers/gmni { };
+
   goimapnotify = callPackage ../tools/networking/goimapnotify { };
 
   gojsontoyaml = callPackage ../development/tools/gojsontoyaml { };
-- 
2.28.0

[PATCH v2 2/2] gmnisrv: init at 2021-03-26 Export this patch

---
 pkgs/servers/gemini/gmnisrv/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/servers/gemini/gmnisrv/default.nix

diff --git a/pkgs/servers/gemini/gmnisrv/default.nix b/pkgs/servers/gemini/gmnisrv/default.nix
new file mode 100644
index 00000000000..ed4a93a6fb0
--- /dev/null
+++ b/pkgs/servers/gemini/gmnisrv/default.nix
@@ -0,0 +1,22 @@
+{stdenv, lib, fetchFromSourcehut, pkg-config, openssl, mailcap, scdoc}:
+
+stdenv.mkDerivation rec {
+  name = "gmnvisrv";
+  version = "2021-03-26";
+  src = fetchFromSourcehut {
+    owner = "~sircmpwn";
+    repo = "gmnisrv";
+    rev = "master";
+    sha256 = "1n0iiz6gd3dmv1r7i6437zmrv0vim69fc0haqfvagd4y20hy5s8z";
+  };
+  MIMEDB = "${mailcap}/etc/mime.types";
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ openssl mailcap scdoc ];
+  meta = {
+    description = "A simple Gemini protocol server";
+    homepage = "https://git.sr.ht/~sircmpwn/gmnisrv";
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ bsima ];
+    platforms = lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8265a71776..ab700090c99 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1368,6 +1368,8 @@ in
 
   gmni = callPackage ../applications/networking/browsers/gmni { };
 
+  gmnisrv = callPackage ../servers/gemini/gmnisrv { };
+
   goimapnotify = callPackage ../tools/networking/goimapnotify { };
 
   gojsontoyaml = callPackage ../development/tools/gojsontoyaml { };
-- 
2.28.0