nur-packages

commit 5768f6212da0bca7ee6a00deb82f6e6541499549
parent e9d1e1adf3191b3ce10602514c846f436f4982bc
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Sun, 16 Jan 2022 23:33:46 +0300

Up

Diffstat:
M
pkgs/default.nix
 | 
2
+-
M
pkgs/gemini/gemserv/default.nix
 | 
6
+++---
A
pkgs/osm/osm-3s/default.nix
 | 
26
++++++++++++++++++++++++++
D
pkgs/osm/overpass-api/default.nix
 | 
26
--------------------------

4 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -316,11 +316,11 @@ lib.makeScope newScope (
     map-machine = callPackage ./osm/map-machine { };
     map-stylizer = callPackage ./osm/map-stylizer { };
     maperitive-bin = callPackage ./osm/maperitive/bin.nix { };
+    osm-3s = callPackage ./osm/osm-3s { };
     osm-area-tools = callPackage ./osm/osm-area-tools { };
     osm-python-tools = callPackage ./osm/osm-python-tools { };
     osmcoastline = callPackage ./osm/osmcoastline { };
     osmosis = callPackage ./osm/osmosis { };
-    overpass-api = callPackage ./osm/overpass-api { };
     osmwalkthrough = callPackage ./osm/osmwalkthrough { };
     phyghtmap = callPackage ./osm/phyghtmap { };
     sdlmap = callPackage ./osm/sdlmap { };
diff --git a/pkgs/gemini/gemserv/default.nix b/pkgs/gemini/gemserv/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "gemserv";
-  version = "0.4.5";
+  version = "0.6.3";
 
   src = fetchFromSourcehut {
     owner = "~int80h";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-9O4kzNpc4alnjJ3ioCv1kKfNDxIu5IA8PX0EUb6S2RY=";
+    hash = "sha256-JA+mxljfYPWP5RcsknP+5gBSczKNSa5/BuDiY7mS3TY=";
   };
 
-  cargoHash = "sha256-if9rWZffXVL9nijtdaisgaabyKkEpJkDeYKv2L4/4co=";
+  cargoHash = "sha256-anPHujCUkoIybg8wltDkf3jpHEsPS6GTNJiUPLXAI9k=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/osm/osm-3s/default.nix b/pkgs/osm/osm-3s/default.nix
@@ -0,0 +1,26 @@
+{ lib, stdenv, fetchurl, expat, lz4, zlib }:
+
+stdenv.mkDerivation rec {
+  pname = "osm-3s";
+  version = "0.7.57.1";
+
+  src = fetchurl {
+    url = "http://dev.overpass-api.de/releases/osm-3s_v${version}.tar.gz";
+    hash = "sha256-M5W/cCnPr4Ct4KKo+xs+21zEy86x+iBs1LqiQ8JVRhA=";
+  };
+
+  buildInputs = [ expat lz4 zlib ];
+
+  configureFlags = [ "--enable-lz4" ];
+
+  enableParallelBuilding = true;
+
+  meta = with lib; {
+    description = "A database engine to query the OpenStreetMap data";
+    homepage = "http://overpass-api.de/";
+    license = licenses.agpl3Only;
+    maintainers = [ maintainers.sikmir ];
+    platforms = platforms.linux;
+    skip.ci = stdenv.isDarwin;
+  };
+}
diff --git a/pkgs/osm/overpass-api/default.nix b/pkgs/osm/overpass-api/default.nix
@@ -1,26 +0,0 @@
-{ lib, stdenv, fetchurl, expat, lz4, zlib }:
-
-stdenv.mkDerivation rec {
-  pname = "overpass-api";
-  version = "0.7.57.1";
-
-  src = fetchurl {
-    url = "http://dev.overpass-api.de/releases/osm-3s_v${version}.tar.gz";
-    hash = "sha256-M5W/cCnPr4Ct4KKo+xs+21zEy86x+iBs1LqiQ8JVRhA=";
-  };
-
-  buildInputs = [ expat lz4 zlib ];
-
-  configureFlags = [ "--enable-lz4" ];
-
-  enableParallelBuilding = true;
-
-  meta = with lib; {
-    description = "A database engine to query the OpenStreetMap data";
-    homepage = "http://overpass-api.de/";
-    license = licenses.agpl3Only;
-    maintainers = [ maintainers.sikmir ];
-    platforms = platforms.linux;
-    skip.ci = stdenv.isDarwin;
-  };
-}