commit 68f4eabae1f9cd4c5ccd6dac0d6a0ff0e9dd36e1
parent 81168b9a955cbf5f1fab2bcb0ec0008113e86c47
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sat, 17 Oct 2026 13:38:55 +0400
Up
Diffstat:
9 files changed, 80 insertions(+), 53 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -5,11 +5,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1731533236,
- "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+ "lastModified": 1791914995,
+ "narHash": "sha256-Zf/xfQEAasnwnmEfHqW/4hjDE/s44yn2hD4RuVIZRjA=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+ "rev": "b7a79d3fea1e214f6d668d521cecec0c01e26544",
"type": "github"
},
"original": {
@@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1791487292,
- "narHash": "sha256-tqM7xDEsaeK1p6VvRygeZ9LkQRpUUkbRT02BHv6hnTM=",
+ "lastModified": 1792116957,
+ "narHash": "sha256-EjZqHKObBfIOeHZnMRVV87HB3pPq/WBkmRJWyFxmZu8=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "8edc0c72e3a38faf5434e40d1f19431125fe4b30",
+ "rev": "f20cd90e28fe0403873f473b29e42662cd86e8c4",
"type": "github"
},
"original": {
diff --git a/modules/nixos/services/elevation-server.nix b/modules/nixos/services/elevation-server.nix
@@ -68,7 +68,7 @@ in
serviceConfig = {
DynamicUser = true;
LogsDirectory = "elevation-server";
- ExecStart = "${getBin cfg.package}/bin/elevation_server -dem ${cfg.demTiles} -host ${cfg.address} -port ${toString cfg.port} -threads ${toString cfg.threads}";
+ ExecStart = "${getExe cfg.package} -dem ${cfg.demTiles} -host ${cfg.address} -port ${toString cfg.port} -threads ${toString cfg.threads}";
Restart = "always";
};
};
diff --git a/pkgs/by-name/gp/gpxtrackposter/package.nix b/pkgs/by-name/gp/gpxtrackposter/package.nix
@@ -1,12 +1,12 @@
{
lib,
fetchFromGitHub,
- python312Packages,
+ python3Packages,
s2sphere,
unstableGitUpdater,
}:
-python312Packages.buildPythonApplication {
+python3Packages.buildPythonApplication {
pname = "gpxtrackposter";
version = "0-unstable-2024-06-02";
pyproject = true;
@@ -39,9 +39,9 @@ python312Packages.buildPythonApplication {
--subst-var out
'';
- build-system = with python312Packages; [ setuptools ];
+ build-system = with python3Packages; [ setuptools ];
- dependencies = with python312Packages; [
+ dependencies = with python3Packages; [
appdirs
colour
geopy
@@ -58,7 +58,7 @@ python312Packages.buildPythonApplication {
pythonRelaxDeps = [ "stravalib" ];
- nativeCheckInputs = with python312Packages; [
+ nativeCheckInputs = with python3Packages; [
pytestCheckHook
(pytest-mock.overrideAttrs (old: rec {
pname = "pytest-mock";
diff --git a/pkgs/by-name/py/py-staticmaps/package.nix b/pkgs/by-name/py/py-staticmaps/package.nix
@@ -1,11 +1,11 @@
{
lib,
fetchFromGitHub,
- python312Packages,
+ python3Packages,
s2sphere,
}:
-python312Packages.buildPythonApplication (finalAttrs: {
+python3Packages.buildPythonApplication (finalAttrs: {
pname = "py-staticmaps";
version = "0.5.0";
pyproject = true;
@@ -21,9 +21,9 @@ python312Packages.buildPythonApplication (finalAttrs: {
sed -i '/^slugify/d' requirements.txt
'';
- build-system = with python312Packages; [ setuptools ];
+ build-system = with python3Packages; [ setuptools ];
- dependencies = with python312Packages; [
+ dependencies = with python3Packages; [
appdirs
geographiclib
pillow
@@ -35,7 +35,7 @@ python312Packages.buildPythonApplication (finalAttrs: {
types-requests
];
- nativeCheckInputs = with python312Packages; [ pytestCheckHook ];
+ nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
meta = {
description = "A python module to create static map images with markers, geodesic lines, etc";
diff --git a/pkgs/by-name/s2/s2sphere/future.patch b/pkgs/by-name/s2/s2sphere/future.patch
@@ -0,0 +1,27 @@
+diff --git i/s2sphere/sphere.py w/s2sphere/sphere.py
+index eb80971..3f3b48e 100644
+--- i/s2sphere/sphere.py
++++ w/s2sphere/sphere.py
+@@ -1,8 +1,5 @@
+ from __future__ import print_function, unicode_literals, division
+
+-from future.builtins import int
+-from future.builtins import range
+-
+ import bisect
+ import decimal
+ import functools
+diff --git i/setup.py w/setup.py
+index ca94fd9..970343c 100644
+--- i/setup.py
++++ w/setup.py
+@@ -18,9 +18,6 @@ setup(
+ author_email='sven@sidewalklabs.com',
+ url='http://s2sphere.readthedocs.io',
+ packages=['s2sphere'],
+- install_requires=[
+- 'future>=0.15',
+- ],
+ extras_require={
+ 'tests': [
+ 'flake8>=2.5.4',
diff --git a/pkgs/by-name/s2/s2sphere/package.nix b/pkgs/by-name/s2/s2sphere/package.nix
@@ -1,10 +1,10 @@
{
lib,
fetchFromGitHub,
- python312Packages,
+ python3Packages,
}:
-python312Packages.buildPythonPackage {
+python3Packages.buildPythonPackage {
pname = "s2sphere";
version = "0.2.5";
pyproject = true;
@@ -16,9 +16,9 @@ python312Packages.buildPythonPackage {
hash = "sha256-6hNIuyLTcGcXpLflw2ajCOjel0IaZSFRlPFi81Z5LUo=";
};
- build-system = with python312Packages; [ setuptools ];
+ patches = [ ./future.patch ];
- dependencies = with python312Packages; [ future ];
+ build-system = with python3Packages; [ setuptools ];
doCheck = false;
diff --git a/pkgs/by-name/sn/snmpdigger/package.nix b/pkgs/by-name/sn/snmpdigger/package.nix
@@ -33,7 +33,7 @@ buildGo127Module (finalAttrs: {
meta = {
description = "Fancy TUI for SNMP";
- homepage = "https://github.com/umputun/snmpdigger";
+ homepage = "https://github.com/kawaiipantsu/snmpdigger";
maintainers = with lib.maintainers; [ sikmir ];
license = lib.licenses.mit;
mainProgram = "snmpdigger";
diff --git a/pkgs/by-name/ta/tatoeba/package.nix b/pkgs/by-name/ta/tatoeba/package.nix
@@ -45,7 +45,7 @@ let
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "tatoeba";
- version = "2026-10-03";
+ version = "2026-10-17";
__structuredAttrs = true;
diff --git a/pkgs/by-name/ta/tatoeba/tatoeba.json b/pkgs/by-name/ta/tatoeba/tatoeba.json
@@ -5,35 +5,35 @@
},
"deu_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu_sentences_detailed.tsv.bz2",
- "hash": "sha256-T8G5wsetoPiuvcimhTLGm3mkg2KYcvHz8KuI9cUMB3I="
+ "hash": "sha256-Ik7a75wf0jWHvKr3fYx52KM7Mt66kAYrnI4CZwbqSTQ="
},
"eng_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng_sentences_detailed.tsv.bz2",
- "hash": "sha256-0sj8Jx23CWfL9udAabNPOU7MzMpKYfyEA54PBUkBbug="
+ "hash": "sha256-JPdCFD2QeTCNjGucjLT277VOkIo30n/V5A8iq4QbPQ0="
},
"epo_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo_sentences_detailed.tsv.bz2",
- "hash": "sha256-cfJXkvOHqklCjrqUk7LHRh8YvGgt9wN+a0MM/XrF6HQ="
+ "hash": "sha256-83loGcesQfwEuAl5hGzG6HrXrz13JYdo6rW+/XU/O7s="
},
"fin_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin_sentences_detailed.tsv.bz2",
- "hash": "sha256-3iGVtwgaLmL2YsTUwXndN0IYGc8fet4BpFhLEiPeVN4="
+ "hash": "sha256-sVHAZgU0/77mCL4tRHLc3XPTGqqLDcwnK94lWnMM81c="
},
"hye_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye_sentences_detailed.tsv.bz2",
- "hash": "sha256-F2Ml9rtBw2PkkUgOuIBzmn1W3rQizZoiL/xI11o0Hr8="
+ "hash": "sha256-b8w57BmojsqiYWWgDjXxJ73p/Fhj/jFxg4KkXV/otsU="
},
"rus_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus_sentences_detailed.tsv.bz2",
- "hash": "sha256-hK/7CCn50JHuUsGS5FRF8jOicz85uT16EO0oUk42si4="
+ "hash": "sha256-MNNbP6kwRtwhz9kIdeqWClg6t6WMts0fH59/gTynNuA="
},
"swe_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe_sentences_detailed.tsv.bz2",
- "hash": "sha256-1RZqcSprQbrj2+313so0KbS9rPk3FiuEBXNqsAy9xPw="
+ "hash": "sha256-G2S6ErlUOhRcEdtDhrc714tmLm/AxH3fhcOlvkgGjhc="
},
"ukr_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr_sentences_detailed.tsv.bz2",
- "hash": "sha256-Yjt7oQ3axghGn8AJPwgzz12IgtOPluj3+WX1pL4p1OI="
+ "hash": "sha256-d8wXSEyWaX8szvfELi962yrsX0wrVE9GtXwMfL5XaVU="
},
"bel-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/bel/bel-eng_links.tsv.bz2",
@@ -45,15 +45,15 @@
},
"deu-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-eng_links.tsv.bz2",
- "hash": "sha256-nC7Eahvs6i3djudH8ZkBbKbi9aEBjSkRGQq0PVj9qT4="
+ "hash": "sha256-aEvVz7ayTvNqNwXZmLur+/7S1TH39fNDhzlAKQRq1GY="
},
"deu-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-rus_links.tsv.bz2",
- "hash": "sha256-3h16f/lz6oR50OQoi84inHfnN5xoK3CiQIQf3b3HJXs="
+ "hash": "sha256-mVDIU/JMvI8AlH8YvQeT8H28Tx4VCKxg1E0aerJ+1Go="
},
"eng-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-epo_links.tsv.bz2",
- "hash": "sha256-+o8MKoV3I4Xklz9CDlLK0TIX8N5y2U8JCFpsIKBpmPY="
+ "hash": "sha256-247GBq3ms3SQJODqX3uRX+NSvPSU/10XD3KIGZ4s/6E="
},
"eng-bel_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-bel_links.tsv.bz2",
@@ -61,39 +61,39 @@
},
"eng-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-deu_links.tsv.bz2",
- "hash": "sha256-1IswySdZs3grS0NqsV1BmbqejcFnijPDtYbR/V+zD4Q="
+ "hash": "sha256-xONy8mD1RY2MEXFdLSsupp9E8nLmiROxNy4XWjirWDM="
},
"eng-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-fin_links.tsv.bz2",
- "hash": "sha256-SGGojk4PqCf3CSUxVyoaAIrgc/fGraP6UkM/e7NKHfM="
+ "hash": "sha256-8ZvcMXaMOLJwgNO60GMNQMYuTs7va9HUgYprKAJ2hTw="
},
"eng-hye_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-hye_links.tsv.bz2",
- "hash": "sha256-erQL33RcglAFd14GOZfwDD9UAwO8KCfZM/Z2HheEOdk="
+ "hash": "sha256-sltcMSpOKS9KQO3+P+CDjaZR+lnnveLyQY6iXUFeRNc="
},
"eng-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-rus_links.tsv.bz2",
- "hash": "sha256-71aMLSq+HLvSNcXiql2dc3yxDWsYvpWpHFsgXlX1Yig="
+ "hash": "sha256-2mDMcI1j4AK5QXhcQcgO+RSvBDkqTGbyB/64y6SiQ14="
},
"eng-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-swe_links.tsv.bz2",
- "hash": "sha256-/2G2eyOr4xwArrTYHfppwpyKkkQBhvTWqrsiF4WgIgU="
+ "hash": "sha256-N6/WVgVjAHq+eN0vePBvg42IbvluGJZ0zPSq3UzxJg4="
},
"eng-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-ukr_links.tsv.bz2",
- "hash": "sha256-uSSFKfWrfMNdPjf/vg4dVSli25RNr1k3jDrkH+xWTiA="
+ "hash": "sha256-TeZsu1UX4VPPidffZjBz+7wgIbSdVh5OjLk4YrRD76o="
},
"epo-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-eng_links.tsv.bz2",
- "hash": "sha256-46K1FCQoRS7Z/kHUaaLoPZ3Jy+wAPkOCTHn0cniYcU8="
+ "hash": "sha256-oO6ZcD8dtoDFdQ7xQnHSfrkFuQBo8phYzw0XHM3cd4Y="
},
"epo-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-rus_links.tsv.bz2",
- "hash": "sha256-Zr4yLVIIFphrjyqEZdRa7Y6ac7Hh5WobDzOCwLOQBCc="
+ "hash": "sha256-CpnFkS86ApxQOSjAUSUjOwPfPmFp6bWTV9VC20FuxmM="
},
"fin-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-eng_links.tsv.bz2",
- "hash": "sha256-qvJNay0QKLyC3obwNebB8rcOhbdJ3N2mixH47BcCsc0="
+ "hash": "sha256-HXhDSqNIJmVUi7vAuI8w5jqzwGLTM+g8oMnyycdfoX0="
},
"fin-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-rus_links.tsv.bz2",
@@ -101,11 +101,11 @@
},
"hye-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye-eng_links.tsv.bz2",
- "hash": "sha256-nIxzJiZEjTT/eVUHgkxq/9d2Q6NkgV7hwQQuoAyQH3w="
+ "hash": "sha256-G7ffzY/X0kp8H+6MoPK0Y6TzLBgH5PyVjdzlbeEAyTc="
},
"hye-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye-rus_links.tsv.bz2",
- "hash": "sha256-ZuKNb4EbljY7UWph61tWWVGjSb3cAaCDD4lIIY3Yhcw="
+ "hash": "sha256-hLfyiEmTzVLmE72ORjCwPVFsbvgy6a0pUf1CM1BT4lo="
},
"rus-bel_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-bel_links.tsv.bz2",
@@ -113,15 +113,15 @@
},
"rus-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-deu_links.tsv.bz2",
- "hash": "sha256-YgWOoJqkQnFMNDu6gq2CEcFy0T7q1xx3mqF43tCUnmE="
+ "hash": "sha256-s2Y0jFVcC3Xd1+JqRQhUXjFhEl6xBP39GckWa1EYWt0="
},
"rus-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-eng_links.tsv.bz2",
- "hash": "sha256-GmXvlySTD6Ds6/ji3hq58nghlRXyE/itl+FSXM4Cyo0="
+ "hash": "sha256-7gS0r6s129NBb+kpiJWkuWNZ7cpYOh1fRHNE+iJY7P4="
},
"rus-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-epo_links.tsv.bz2",
- "hash": "sha256-1dP4fRZlYqfsRgYFya2I/pgv93K0VWiL21RtVDPVbSQ="
+ "hash": "sha256-Vs4+SUGnKpxe/08/3SYrP4TJPQenM9ATC5BfEW9am2M="
},
"rus-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-fin_links.tsv.bz2",
@@ -129,7 +129,7 @@
},
"rus-hye_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-hye_links.tsv.bz2",
- "hash": "sha256-bg+0115ZG8MUD1aUXhEBHj5Oa939HqzJW3BXw5/XRmE="
+ "hash": "sha256-3y+F2HrXfMwImer+9s+jLqPBFaJt2AYtGgyJLgwC4GQ="
},
"rus-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-swe_links.tsv.bz2",
@@ -137,11 +137,11 @@
},
"rus-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-ukr_links.tsv.bz2",
- "hash": "sha256-2W8ML4u9rB2E9Xmxw+kEEX5E2lFzKIm2ziDdfF5Ye4o="
+ "hash": "sha256-zZaWMcjZSRH0Wz75BBlXpZ3QZPSsuiLINt0qLUhDC4U="
},
"swe-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-eng_links.tsv.bz2",
- "hash": "sha256-Xwdq7M825jHn/nfmWComLb12bznwf2tEDR1UA3l8UdY="
+ "hash": "sha256-qHQmx+BwEzO+pf+VAQ/gUBZLOUWqIUy35GZKHkPUJD4="
},
"swe-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-rus_links.tsv.bz2",
@@ -149,10 +149,10 @@
},
"ukr-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-eng_links.tsv.bz2",
- "hash": "sha256-fhwKF12AcR2+aqTVi2xGwjDKIWOPRaQVnBMIMXMSo6A="
+ "hash": "sha256-+gm2mfnfXcIhYb9AX3ZWHZ7WCPiIpGTtwlQJl6AQbkc="
},
"ukr-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-rus_links.tsv.bz2",
- "hash": "sha256-fwnWlcwvs983LWPMA0sbYg6t0CMjHjHkcKFX1KaHCQ0="
+ "hash": "sha256-/nw/5hbhtliCrbtfBbOg2poroUA2JGQjvC3TqRfQtWw="
}
}
