nur-packages

commit 8d1a8ca6bd3a64e57ccebc3490172c2bffd6dc6f
parent 52404f383ed6e993ca9b62bfa329b3e915127020
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Mon, 15 Aug 2022 08:26:00 +0300

Up

Diffstat:
M
flake.lock
 | 
12
++++++------
M
pkgs/data/misc/routinodb/default.nix
 | 
4
++--
M
pkgs/gemini/astronaut/default.nix
 | 
20
+++++++++++++-------
M
pkgs/gemini/gplaces/default.nix
 | 
8
++++----
M
pkgs/gemini/stargazer/default.nix
 | 
8
++++----

5 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "flake-utils": {
       "locked": {
-        "lastModified": 1656928814,
-        "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
         "type": "github"
       },
       "original": {
@@ -17,11 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1658937758,
-        "narHash": "sha256-FxQB/tWX15Faq3GBM+qTfVzd9qJqy/3CEgBp2zpHeNc=",
+        "lastModified": 1660494700,
+        "narHash": "sha256-OU9ceb6JvwqUVqFYvYOtpNDwJpHgC3z/dy6GRoaiGgM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8f73de28e63988da02426ebb17209e3ae07f103b",
+        "rev": "bc4b4a50c7a105c56f1b712a87818678298deef3",
         "type": "github"
       },
       "original": {
diff --git a/pkgs/data/misc/routinodb/default.nix b/pkgs/data/misc/routinodb/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "routinodb";
-  version = "220728";
+  version = "220814";
 
   srcs = [
     (fetchurl {
       url = "https://download.geofabrik.de/russia/northwestern-fed-district-${version}.osm.pbf";
-      hash = "sha256-1TdnM3OFkzIeHOgxXv7/iKmbtCZ/AKY5qT6ph1yt6C4=";
+      hash = "sha256-G3WylejNaEmCUXfbPAf/4c2E9+0+RehpECwKwJfeGIs=";
     })
   ];
 
diff --git a/pkgs/gemini/astronaut/default.nix b/pkgs/gemini/astronaut/default.nix
@@ -2,23 +2,29 @@
 
 buildGoModule rec {
   pname = "astronaut";
-  version = "0.1.0";
+  version = "0.1.1";
 
   src = fetchFromSourcehut {
     owner = "~adnano";
-    repo = pname;
+    repo = "astronaut";
     rev = version;
-    hash = "sha256-42n7XB7hJcuB7vvWB2chUUWFyZQkRTsdUnqEloU22GU=";
+    hash = "sha256-eiUStCM9rJB4O+LVWxih6untjTPynj9cHX2b8Gz9/nQ=";
   };
 
   nativeBuildInputs = [ scdoc ];
 
   vendorSha256 = "sha256-7SyawlfJ9toNVuFehGr5GQF6mNmS9E4kkNcqWllp8No=";
 
-  installPhase = ''
-    runHook preInstall
-    make PREFIX=$out install
-    runHook postInstall
+  ldflags = [ "-X main.ShareDir=${placeholder "out"}/share/astronaut" ];
+
+  postBuild = ''
+    scdoc < docs/astronaut.1.scd > docs/astronaut.1
+  '';
+
+  postInstall = ''
+	install -Dm644 docs/astronaut.1 $out/share/man/man1/astronaut.1
+	install -Dm644 config/astronaut.conf $out/share/astronaut/astronaut.conf
+	install -Dm644 config/style.conf $out/share/astronaut/style.conf
   '';
 
   meta = with lib; {
diff --git a/pkgs/gemini/gplaces/default.nix b/pkgs/gemini/gplaces/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gplaces";
-  version = "2022-04-14";
+  version = "0.16.27";
 
   src = fetchFromGitHub {
     owner = "dimkr";
-    repo = pname;
-    rev = "439f5e856c7aa6d1664e4d381623e5ec3d845980";
-    hash = "sha256-1ckdpG1VwI7kmbc36NePDsBOPe6scNZY6QTHbgqQBFA=";
+    repo = "gplaces";
+    rev = "v${version}";
+    hash = "sha256-mC45OsDb1+qE8cYhuNsSwLEvOXjui33ENC3eYviyLyk=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/gemini/stargazer/default.nix b/pkgs/gemini/stargazer/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "stargazer";
-  version = "1.0.2";
+  version = "1.0.3";
 
   src = fetchFromSourcehut {
     owner = "~zethra";
-    repo = pname;
+    repo = "stargazer";
     rev = version;
-    hash = "sha256-uTGLqgf0BLeZXf6msn7teZEmhgvtvzcjmcHDU1mlSjo=";
+    hash = "sha256-Xf3nclb+qYNADzPv878DLut1PeDIAZPaiTi1yFeSz2k=";
   };
 
-  cargoHash = "sha256-6VPvrGfcBRFGmUMMLPQXbCKqQmGjGbyG4Ogh0ZuEti0=";
+  cargoHash = "sha256-iHh5s046sZI3/KGUgvIVADzA6AceOVfe9d5RJPWy8o0=";
 
   nativeBuildInputs = [ scdoc ];