~andir/nixpkgs-dev

gmni: init at 77b73efb v1 PROPOSED

Ben Sima: 2
 gmni: init at 77b73efb
 gmnisrv: init at f23ec10a

 4 files changed, 45 insertions(+), 0 deletions(-)
Matthias Beyer <mail@beyermatthias.de> writes:
> use the full git hash as rev, please.
Sourcehut does not publish tarball archives for individual commits, so I
have to use 'rev = "master"` if I want to uese 'fetchFromSourcehut'.
Ben Sima <ben@bsima.me> writes:
Next
Export patchset (mbox)
How do I use this?

Copy & paste the following snippet into your terminal to import this patchset into git:

curl -s https://lists.sr.ht/~andir/nixpkgs-dev/patches/21497/mbox | git am -3
Learn more about email & git
View this thread in the archives

[PATCH 1/2] gmni: init at 77b73efb Export this patch

---
 .../networking/browsers/gmni/default.nix      | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 22 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..14c88b9bc7f
--- /dev/null
+++ b/pkgs/applications/networking/browsers/gmni/default.nix
@@ -0,0 +1,20 @@
{stdenv, fetchgit, pkg-config, bearssl, scdoc}:

stdenv.mkDerivation rec {
  name = "gmni";
  version = "77b73efb";
  src = fetchgit {
    url = "https://git.sr.ht/~sircmpwn/gmni";
    rev = version;
    sha256 = "1wvnzyv7vyddcd39y6q5aflpnnsdl4k4y5aj5ssb7vgkld0h1b7r";
  };
  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ bearssl scdoc ];
  meta = with stdenv.lib; {
    description = "A Gemini client";
    homepage = "https://git.sr.ht/~sircmpwn/gmni";
    license = licenses.gpl3;
    maintainers = with maintainers; [ bsima ];
    platforms = platforms.all;
  };
}
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 2/2] gmnisrv: init at f23ec10a Export this patch

---
 pkgs/servers/gemini/gmnisrv/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 23 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..8c587a63aff
--- /dev/null
+++ b/pkgs/servers/gemini/gmnisrv/default.nix
@@ -0,0 +1,21 @@
{stdenv, fetchgit, pkg-config, openssl, mailcap, scdoc}:

stdenv.mkDerivation rec {
  name = "gmnvisrv";
  version = "f23ec10a";
  src = fetchgit {
    url = "https://git.sr.ht/~sircmpwn/gmnisrv";
    rev = version;
    sha256 = "1d9rjx0s092yfzjxd2yvzixhqgg883nlnmsysgp21w75n2as354n";
  };
  MIMEDB = "${mailcap}/etc/mime.types";
  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ openssl mailcap scdoc ];
  meta = with stdenv.lib; {
    description = "A simple Gemini protocol server";
    homepage = "https://git.sr.ht/~sircmpwn/gmnisrv";
    license = licenses.gpl3;
    maintainers = with maintainers; [ bsima ];
    platforms = 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