commit 9ebbd6592cda2684d45ec99265188770dc5f2bb4
parent 4c40a3f3f0c3a10c99d5becb29ee5e1adae233a2
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Thu, 15 Sep 2022 13:25:42 +0300
Up
Diffstat:
7 files changed, 44 insertions(+), 30 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -17,11 +17,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1661336769,
- "narHash": "sha256-5Sf9tMd1Jdm+lTBGspbQ4kEoYCDKpUhEVAZHRcm6mGU=",
+ "lastModified": 1663202367,
+ "narHash": "sha256-62sI03nVTWKMULPnjUC+Ig952PqPDnkCSJ56MLoFvDI=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "03428dbaaa23d6bf458770907b0927b377c873a8",
+ "rev": "e731e6638c7726241c352c74bc7f860872e4cbd2",
"type": "github"
},
"original": {
diff --git a/pkgs/data/osm/osm-extracts/default.nix b/pkgs/data/osm/osm-extracts/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "osm-extracts";
- version = "220911";
+ version = "220914";
src = fetchurl {
url = "https://download.geofabrik.de/russia/northwestern-fed-district-${version}.osm.pbf";
- hash = "sha256-wZ7POH5A6wIjHKeaPUB2r9gY1ou+J7sgiKHYaVKbgyY=";
+ hash = "sha256-zzipPRzQG5iKmVG373wHBjG/tPD8DimOB3Ylzle5RAk=";
};
dontUnpack = true;
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -132,7 +132,10 @@ lib.makeScope newScope (
### GEMINI
agunua = callPackage ./gemini/agunua { };
- astronaut = callPackage ./gemini/astronaut { };
+ astronaut = callPackage ./gemini/astronaut {
+ # Go 1.18 build error on darwin, caused by an old version of golang.org/x/sys
+ buildGoModule = pkgs.buildGo117Module;
+ };
comitium = callPackage ./gemini/comitium { };
gemcert = callPackage ./gemini/gemcert { };
gemgen = callPackage ./gemini/gemgen { };
diff --git a/pkgs/geospatial/arcgis2geojson/default.nix b/pkgs/geospatial/arcgis2geojson/default.nix
@@ -2,14 +2,14 @@
python3Packages.buildPythonApplication rec {
pname = "arcgis2geojson";
- version = "2.0.1";
+ version = "3.0.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "chris48s";
repo = "arcgis2geojson";
rev = version;
- hash = "sha256-NA1yNNZbx7ATFhgo2Be38liHQ5DWr66FDd24FaYur3M=";
+ hash = "sha256-6lXfQoazBABryyuch1PJF/7yPq7cOBuvGWCqBUVPdts=";
};
nativeBuildInputs = [ poetry ];
diff --git a/pkgs/geospatial/c2cwsgiutils/default.nix b/pkgs/geospatial/c2cwsgiutils/default.nix
@@ -2,13 +2,14 @@
python3Packages.buildPythonPackage rec {
pname = "c2cwsgiutils";
- version = "5.0.0";
+ version = "5.1.5";
+ format = "pyproject";
src = fetchFromGitHub {
owner = "camptocamp";
repo = "c2cwsgiutils";
rev = version;
- hash = "sha256-O+uh+9NurjnohCbpxJxrpvUUkb1gPHsqvG7+F4WNjQg=";
+ hash = "sha256-lPE21SLMgfnNu0qiM3e2qz6zJJ7u5YaNkqOSNTF1FVg=";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/osm/pyrobuf/default.nix b/pkgs/osm/pyrobuf/default.nix
@@ -13,9 +13,7 @@ python3Packages.buildPythonPackage rec {
nativeBuildInputs = with python3Packages; [ cython pytest-runner ];
- propagatedBuildInputs = with python3Packages; [
- jinja2
- ];
+ propagatedBuildInputs = with python3Packages; [ jinja2 ];
checkInputs = with python3Packages; [ pytestCheckHook ];
diff --git a/pkgs/radio/aprsc/default.nix b/pkgs/radio/aprsc/default.nix
@@ -1,40 +1,52 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, perl, libevent, openssl }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, perl, libevent, openssl, testers }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "aprsc";
version = "2.1.11";
src = fetchFromGitHub {
owner = "hessu";
repo = "aprsc";
- rev = "release/${version}";
+ rev = "release/${finalAttrs.version}";
hash = "sha256-lPVhGYdd80XCXgOD8m09LvudbC6poNhSRS2ILcapMwE=";
};
- patches = (fetchpatch {
- url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/54cc4cc6eaed14e3d495ca3a3b6f86f3f429b991/net/aprsc/files/patch-Makefile.in";
- hash = "sha256-lxnE/9fgnxZxIcb9bNcq4PoOIBntIdyVYJa5rPIx26s=";
- });
-
+ patches = [
+ (fetchpatch {
+ url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/54cc4cc6eaed14e3d495ca3a3b6f86f3f429b991/net/aprsc/files/patch-Makefile.in";
+ hash = "sha256-lxnE/9fgnxZxIcb9bNcq4PoOIBntIdyVYJa5rPIx26s=";
+ })
+ ];
patchFlags = [ "-p0" ];
- postPatch = ''
- substituteInPlace Makefile.in \
- --replace "(DESTDIR)\$(MANDIR)" "(DESTDIR)\$(PREFIX)\$(MANDIR)" \
- --replace "SRCVERSION:=\$(GITVERSION)" "SRCVERSION:=gd72a17c"
- '';
-
- sourceRoot = "${src.name}/src";
+ sourceRoot = "${finalAttrs.src.name}/src";
nativeBuildInputs = [ perl ];
buildInputs = [ libevent openssl ];
preConfigure = "LD=$CC";
- configureFlags = [ "--sbindir=/bin" "--with-openssl" ];
+ configureFlags = [
+ "--with-openssl"
+ "--mandir=$(out)/share/man"
+ ];
+
+ makeFlags = [
+ "GIT_CMD:="
+ "GITVERSION:=release"
+ "DATE:=1970-01-01T00:00:00+0000"
+ "BUILD_TIME:=1970-01-01T00:00:00+0000"
+ "BUILD_USER:=nixbld"
+ ];
installFlags = [ "PREFIX=$(out)" ];
+ passthru.tests.version = testers.testVersion {
+ package = finalAttrs.finalPackage;
+ command = "! aprsc -h";
+ version = "${finalAttrs.version}-release";
+ };
+
meta = with lib; {
description = "A core APRS-IS server";
homepage = "http://he.fi/aprsc/";
@@ -43,4 +55,4 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
skip.ci = stdenv.isDarwin;
};
-}
+})
