nur-packages

commit 5a453693fbc0075f2443b66aa945d74a1f67d13a
parent 9e70549ac66d7857705a2ba44bff6954066dea9a
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Fri, 19 Aug 2022 11:31:43 +0300

Up

Diffstat:
M
flake.lock
 | 
6
+++---
M
pkgs/default.nix
 | 
3
++-
D
pkgs/gemini/stagit-gemini/default.nix
 | 
26
--------------------------
A
pkgs/gemini/stagit-gemini/milotier.nix
 | 
24
++++++++++++++++++++++++
A
pkgs/gemini/stagit-gemini/sloum.nix
 | 
26
++++++++++++++++++++++++++

5 files changed, 55 insertions(+), 30 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -17,11 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1660494700,
-        "narHash": "sha256-OU9ceb6JvwqUVqFYvYOtpNDwJpHgC3z/dy6GRoaiGgM=",
+        "lastModified": 1660639432,
+        "narHash": "sha256-2WDiboOCfB0LhvnDVMXOAr8ZLDfm3WdO54CkoDPwN1A=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bc4b4a50c7a105c56f1b712a87818678298deef3",
+        "rev": "6c6409e965a6c883677be7b9d87a95fab6c3472e",
         "type": "github"
       },
       "original": {
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -156,7 +156,8 @@ lib.makeScope newScope (
     qute-gemini = callPackage ./gemini/qute-gemini { };
     satellite = callPackage ./gemini/satellite { };
     shavit = callPackage ./gemini/shavit { };
-    stagit-gemini = callPackage ./gemini/stagit-gemini { };
+    stagit-gemini-milotier = callPackage ./gemini/stagit-gemini/milotier.nix { };
+    stagit-gemini-sloum = callPackage ./gemini/stagit-gemini/sloum.nix { };
     stargazer = callPackage ./gemini/stargazer {
       inherit (darwin.apple_sdk.frameworks) Security;
     };
diff --git a/pkgs/gemini/stagit-gemini/default.nix b/pkgs/gemini/stagit-gemini/default.nix
@@ -1,26 +0,0 @@
-{ lib, stdenv, libgit2, fetchFromGitea }:
-
-stdenv.mkDerivation rec {
-  pname = "stagit-gemini";
-  version = "2020-01-18";
-
-  src = fetchFromGitea {
-    domain = "git.rawtext.club";
-    owner = "sloum";
-    repo = pname;
-    rev = "2710449792748ac3fefe4ba2500afce1ed193e37";
-    sha256 = "sha256-Tm9jXkGtUNeZNhtHjozWN35z8gL/KcACLvby2Z73vxU=";
-  };
-
-  makeFlags = [ "PREFIX=$(out)" ];
-
-  buildInputs = [ libgit2 ];
-
-  meta = with lib; {
-    description = "Fork of stagit-gopher that ports the output to gemini";
-    homepage = "https://git.rawtext.club/sloum/stagit-gemini";
-    license = licenses.mit;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.sikmir ];
-  };
-}
diff --git a/pkgs/gemini/stagit-gemini/milotier.nix b/pkgs/gemini/stagit-gemini/milotier.nix
@@ -0,0 +1,24 @@
+{ lib, stdenv, libgit2, fetchgit }:
+
+stdenv.mkDerivation rec {
+  pname = "stagit-gemini";
+  version = "2022-07-08";
+
+  src = fetchgit {
+    url = "https://git.milotier.net/stagit-gemini";
+    rev = "eddfa077851ffcdbdf377f7920fb481025f7ba31";
+    sha256 = "sha256-U97Ex0OtR8eXvd6vK3rbrGlK7moEvBnVWUTwPyMUgPI=";
+  };
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  buildInputs = [ libgit2 ];
+
+  meta = with lib; {
+    description = "A fork of stagit-gopher that generates gemtext";
+    homepage = "https://git.milotier.net/git/stagit-gemini/";
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.sikmir ];
+  };
+}
diff --git a/pkgs/gemini/stagit-gemini/sloum.nix b/pkgs/gemini/stagit-gemini/sloum.nix
@@ -0,0 +1,26 @@
+{ lib, stdenv, libgit2, fetchFromGitea }:
+
+stdenv.mkDerivation rec {
+  pname = "stagit-gemini";
+  version = "2020-01-18";
+
+  src = fetchFromGitea {
+    domain = "git.rawtext.club";
+    owner = "sloum";
+    repo = "stagit-gemini";
+    rev = "2710449792748ac3fefe4ba2500afce1ed193e37";
+    sha256 = "sha256-Tm9jXkGtUNeZNhtHjozWN35z8gL/KcACLvby2Z73vxU=";
+  };
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  buildInputs = [ libgit2 ];
+
+  meta = with lib; {
+    description = "Fork of stagit-gopher that ports the output to gemini";
+    inherit (src.meta) homepage;
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.sikmir ];
+  };
+}