diff --git a/flake.lock b/flake.lock
index bb79f8fa3194d638f49dc38323b95811878845eb..8fca5bd706cc406fff4a271851c4e3e09ba8104c 100644
--- 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
index fe6f7c9bdcddcbb546d2a672030bb1031ce93635..9d6f48e0b9fec1735e24b32ff40eb52e7418e88c 100644
--- a/pkgs/data/osm/osm-extracts/default.nix
+++ b/pkgs/data/osm/osm-extracts/default.nix
@@ -2,11 +2,11 @@ { lib, stdenv, fetchurl, osmium-tool }:
stdenv.mkDerivation rec {
pname = "osm-extracts";
src = fetchurl {
url = "https://download.geofabrik.de/russia/northwestern-fed-district-${version}.osm.pbf";
};
dontUnpack = true;
diff --git a/pkgs/default.nix b/pkgs/default.nix
index b06dfa326dc34b4167c5d4b4d9d55530d610e397..f267ff0f198032825c8943c51fc83153b3d82f84 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -132,7 +132,10 @@
### GEMINI
agunua = callPackage ./gemini/agunua { };
# 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
index 8dba5f7670da1a8ab355ec86d0e3af1cd1fdc463..1677706926180fbaee512fda3a12fc8bf96f8fd7 100644
--- a/pkgs/geospatial/arcgis2geojson/default.nix
+++ b/pkgs/geospatial/arcgis2geojson/default.nix
@@ -2,14 +2,14 @@ { lib, python3Packages, fetchFromGitHub, poetry }:
python3Packages.buildPythonApplication rec {
pname = "arcgis2geojson";
format = "pyproject";
src = fetchFromGitHub {
owner = "chris48s";
repo = "arcgis2geojson";
rev = version;
};
nativeBuildInputs = [ poetry ];
diff --git a/pkgs/geospatial/c2cwsgiutils/default.nix b/pkgs/geospatial/c2cwsgiutils/default.nix
index d1282ac6729f954c929c4ba6ca09369a6fba2cc4..8988140f715c07bcf68dd4c936ba1233d63a6a3e 100644
--- a/pkgs/geospatial/c2cwsgiutils/default.nix
+++ b/pkgs/geospatial/c2cwsgiutils/default.nix
@@ -2,13 +2,14 @@ { lib, fetchFromGitHub, python3Packages, pipfile }:
python3Packages.buildPythonPackage rec {
pname = "c2cwsgiutils";
src = fetchFromGitHub {
owner = "camptocamp";
repo = "c2cwsgiutils";
rev = version;
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/osm/pyrobuf/default.nix b/pkgs/osm/pyrobuf/default.nix
index 6b17964a23e685dbc5518e3912308ac5842a7a1d..66c841eb537795dbef5c6e3ac79674a7ddd803b5 100644
--- a/pkgs/osm/pyrobuf/default.nix
+++ b/pkgs/osm/pyrobuf/default.nix
@@ -13,9 +13,7 @@ };
nativeBuildInputs = with python3Packages; [ cython pytest-runner ];
checkInputs = with python3Packages; [ pytestCheckHook ];
diff --git a/pkgs/radio/aprsc/default.nix b/pkgs/radio/aprsc/default.nix
index fb5a010e6a319459561c7fbb62759bd9b5a8d22e..56fd81afcb648b462820b5eda824e7e1958d92eb 100644
--- 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";
hash = "sha256-lPVhGYdd80XCXgOD8m09LvudbC6poNhSRS2ILcapMwE=";
};
url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/54cc4cc6eaed14e3d495ca3a3b6f86f3f429b991/net/aprsc/files/patch-Makefile.in";
hash = "sha256-lxnE/9fgnxZxIcb9bNcq4PoOIBntIdyVYJa5rPIx26s=";
patchFlags = [ "-p0" ];
--replace "(DESTDIR)\$(MANDIR)" "(DESTDIR)\$(PREFIX)\$(MANDIR)" \
--replace "SRCVERSION:=\$(GITVERSION)" "SRCVERSION:=gd72a17c"
nativeBuildInputs = [ perl ];
buildInputs = [ libevent openssl ];
preConfigure = "LD=$CC";
installFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = "A core APRS-IS server";
homepage = "http://he.fi/aprsc/";
@@ -43,4 +55,4 @@ maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = stdenv.isDarwin;
};
-}
+})
application/octet-stream
This content has been proxied by September (3851b).