nur-packages

commit 854bbf341edd679f2a4df0cf9ca432883005f09f
parent 7c580a8bf9400cd8156540b87726172e2ee434ac
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Sun, 11 Apr 2021 22:42:05 +0300

Up

Diffstat:
M
nix/sources.json
 | 
14
--------------
M
pkgs/gemini/gloggery/default.nix
 | 
18
++++++++++++------
M
pkgs/gemini/gmni/default.nix
 | 
10
+++++-----
M
pkgs/gemini/gmnisrv/default.nix
 | 
6
+++---
M
pkgs/suckless/hurl/default.nix
 | 
6
+++---

5 files changed, 23 insertions(+), 31 deletions(-)
diff --git a/nix/sources.json b/nix/sources.json
@@ -233,20 +233,6 @@
         "url": "https://github.com/glauth/glauth/archive/5681dc4d0236c49e549ae7804ef2f4e4455340e4.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
-    "gloggery": {
-        "branch": "main",
-        "builtin": false,
-        "date": "2020-10-11T15:09:39Z",
-        "description": "Gemtext blog static site generator",
-        "homepage": "https://github.com/kconner/gloggery",
-        "owner": "kconner",
-        "repo": "gloggery",
-        "rev": "49707b008cd6e3fb3ecb453a472051644fb319eb",
-        "sha256": "1kd3saxlzclm2n0l02za1zvs0lrxppwd3f5j249cgzv63dfwjr5m",
-        "type": "tarball",
-        "url": "https://github.com/kconner/gloggery/archive/49707b008cd6e3fb3ecb453a472051644fb319eb.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
     "go-staticmaps": {
         "branch": "master",
         "builtin": false,
diff --git a/pkgs/gemini/gloggery/default.nix b/pkgs/gemini/gloggery/default.nix
@@ -1,10 +1,15 @@
-{ lib, stdenv, go, sources }:
+{ lib, stdenv, fetchFromGitHub, go }:
 
-stdenv.mkDerivation {
-  pname = "gloggery-unstable";
-  version = lib.substring 0 10 sources.gloggery.date;
+stdenv.mkDerivation rec {
+  pname = "gloggery";
+  version = "2020-10-11";
 
-  src = sources.gloggery;
+  src = fetchFromGitHub {
+    owner = "kconner";
+    repo = pname;
+    rev = "49707b008cd6e3fb3ecb453a472051644fb319eb";
+    sha256 = "1kd3saxlzclm2n0l02za1zvs0lrxppwd3f5j249cgzv63dfwjr5m";
+  };
 
   nativeBuildInputs = [ go ];
 
@@ -15,7 +20,8 @@ stdenv.mkDerivation {
   postInstall = "mv $out/.gloggery $out/share/glogger";
 
   meta = with lib; {
-    inherit (sources.gloggery) description homepage;
+    description = "Gemtext blog static site generator";
+    homepage = "https://github.com/kconner/gloggery";
     license = licenses.free;
     maintainers = [ maintainers.sikmir ];
     platforms = platforms.unix;
diff --git a/pkgs/gemini/gmni/default.nix b/pkgs/gemini/gmni/default.nix
@@ -1,19 +1,19 @@
-{ lib, stdenv, fetchFromSourcehut, openssl, pkg-config, scdoc }:
+{ lib, stdenv, fetchFromSourcehut, bearssl, pkg-config, scdoc }:
 
 stdenv.mkDerivation rec {
   pname = "gmni";
-  version = "2021-01-07";
+  version = "2021-04-02";
 
   src = fetchFromSourcehut {
     owner = "~sircmpwn";
     repo = pname;
-    rev = "4fbc632b22172daa976d8e1c9a2db75d52ee3232";
-    sha256 = "1jasamkjy90b169hwl8p78ns92fs5vlpzr50pxcfsfgny8628sin";
+    rev = "e0993d4886e7e0b8970f7c83b6d0003e75f33348";
+    sha256 = "09gdgyz21ni707ph91fs61v61j2lladzhvbplqqc80hg17w9av4s";
   };
 
   nativeBuildInputs = [ pkg-config scdoc ];
 
-  buildInputs = [ openssl ];
+  buildInputs = [ bearssl ];
 
   meta = with lib; {
     description = "Gemini client";
diff --git a/pkgs/gemini/gmnisrv/default.nix b/pkgs/gemini/gmnisrv/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gmnisrv";
-  version = "2020-12-27";
+  version = "2021-03-23";
 
   src = fetchFromSourcehut {
     owner = "~sircmpwn";
     repo = pname;
-    rev = "fbef1d34a1abd2614f85afee415fe0f417038efe";
-    sha256 = "0y42vj5vy8pk732dkbdywgixr9bxpg11hf4w2qsa1vwqw3xbvdka";
+    rev = "8b65e303b01fc573cb1c40a365fb5db166146a37";
+    sha256 = "1n0iiz6gd3dmv1r7i6437zmrv0vim69fc0haqfvagd4y20hy5s8z";
   };
 
   nativeBuildInputs = [ pkg-config scdoc ];
diff --git a/pkgs/suckless/hurl/default.nix b/pkgs/suckless/hurl/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "hurl";
-  version = "0.4";
+  version = "0.5";
 
   src = fetchgit {
-    url = "git://git.codemadness.org/hurl";
+    url = "git://git.codemadness.org/${pname}";
     rev = version;
-    sha256 = "09a7l9dhygkvyc6v1jw960rmdvgpzp440f6n94jj71jlqi3k43hq";
+    sha256 = "06kxrl97mdhfg9hbrh69r41z7mr8fmphxyl1m16rh3imy99szv90";
   };
 
   buildInputs = [ libressl libbsd ];