commit a1458a4941082a9466b40b14cad4a9616ea222cf
parent cbafbe3ddfcae74dc9852a46e38a466198970ef5
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sat, 27 Sep 2025 23:41:02 +0400
Up
Diffstat:
7 files changed, 63 insertions(+), 55 deletions(-)
diff --git a/.github/workflows/flakehub-publish-rolling.yml b/.github/workflows/flakehub-publish-rolling.yml
@@ -10,7 +10,7 @@ jobs:
id-token: "write"
contents: "read"
steps:
- - uses: "actions/checkout@v3"
+ - uses: "actions/checkout@v5"
- uses: "DeterminateSystems/nix-installer-action@main"
- uses: "DeterminateSystems/flakehub-push@main"
with:
diff --git a/flake.lock b/flake.lock
@@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1758701979,
- "narHash": "sha256-c7DUti3XM1aga8oVgaPnrVmEeCFtN9PaBxyNuqx8jPc=",
+ "lastModified": 1758916627,
+ "narHash": "sha256-fB2ISCc+xn+9hZ6gOsABxSBcsCgLCjbJ5bC6U9bPzQ4=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "e2642aa7d5a15eae586932a56f4294934f959c14",
+ "rev": "53614373268559d054c080d070cfc732dbe68ac4",
"type": "github"
},
"original": {
diff --git a/pkgs/data/dicts/tatoeba/default.nix b/pkgs/data/dicts/tatoeba/default.nix
@@ -45,7 +45,7 @@ let
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "tatoeba";
- version = "2025-09-20";
+ version = "2025-09-27";
srcs = lib.mapAttrsToList (name: spec: fetchurl spec) tatoeba;
diff --git a/pkgs/data/dicts/tatoeba/tatoeba.json b/pkgs/data/dicts/tatoeba/tatoeba.json
@@ -1,43 +1,43 @@
{
"bel_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/bel/bel_sentences_detailed.tsv.bz2",
- "hash": "sha256-kQEqlrjlKlIe+PHUJeCehRouXa77ZpyBWvDft3EtvrE="
+ "hash": "sha256-KrrfBg94Ian0MbBtSfb0wfXIUFXwifEnkKM+d2Javd8="
},
"deu_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu_sentences_detailed.tsv.bz2",
- "hash": "sha256-juBZIE4umysiqsjv0MBqGflTRXxIeVbiVucCV4OSelM="
+ "hash": "sha256-nJ9MzDekcEsgWAMVcI0RXZbtvOCrt7+geLwTEwJ7AUg="
},
"eng_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng_sentences_detailed.tsv.bz2",
- "hash": "sha256-aTX9olsIrvn0CR3VcYIqzwmvo5wmUjmxVqtTzloZbu4="
+ "hash": "sha256-7y69TTOUHvZTdJ+iDOO3FR34mDfpBJGqJ7NemQkjfXM="
},
"epo_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo_sentences_detailed.tsv.bz2",
- "hash": "sha256-vKWcZRl86PkbxdfvwAuGTJO0cHiJUs/f8eUucORwwKk="
+ "hash": "sha256-eVYQt94j1STJ2z2KvkaeyZ08kxMjENYxN+lMm5Rfw0M="
},
"fin_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin_sentences_detailed.tsv.bz2",
- "hash": "sha256-8KSMETrG9jVjJYRoq0IYzoUXd4cgYyZx0lNV/FvRtBU="
+ "hash": "sha256-f/QhT28mgkuR/ljcX94RPkAo606BwfpYUi3WNvVF6lM="
},
"hye_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye_sentences_detailed.tsv.bz2",
- "hash": "sha256-Ll/a//pVJiWRaX5adUOVotPWzOFrDuJT6xw6Ax+7/DU="
+ "hash": "sha256-s7csGenVWAORfAXmLxua9Y8VT1rea1BX/KrpQwg5PrA="
},
"rus_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus_sentences_detailed.tsv.bz2",
- "hash": "sha256-JLKSc2lXB8f1urrYuFKpalNIIY7gAwnvm5Aaqs0d5B0="
+ "hash": "sha256-Wv+VqLXW4TQc7G5wC7DOfwuEnyBG6CuLblxiV5ib4GI="
},
"swe_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe_sentences_detailed.tsv.bz2",
- "hash": "sha256-uBh1Ue/RyHfyHFTp728Ahg83gx8np3xtJUMuMMlvE+w="
+ "hash": "sha256-VHoO/5aqzoVmXtKd90FhzoZXBkPpiPJRHd/QBeUjRiI="
},
"ukr_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr_sentences_detailed.tsv.bz2",
- "hash": "sha256-USNMB8r2VhWT2Ew/saqGP6WWjLcO+/u5APBvKtfN3bY="
+ "hash": "sha256-3vCj793HRVigokKi7ZZxGwUvqy7Yu7Wc++7yYhvHgak="
},
"bel-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/bel/bel-eng_links.tsv.bz2",
- "hash": "sha256-wPmfne/DemAA4ejuzHv0xamrmC7bnlGy8ZkvNGHt+Kg="
+ "hash": "sha256-E/1DAn7NtdK3lygdducvNKNhYI6tdRfi/ox95+upb14="
},
"bel-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/bel/bel-rus_links.tsv.bz2",
@@ -45,55 +45,55 @@
},
"deu-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-eng_links.tsv.bz2",
- "hash": "sha256-xP/yI3FosnW5GELJO//l9dOh4JuVUHq4dGfh9GB8wi4="
+ "hash": "sha256-HvS0Cw4rfryriLwrz1XdMzA8qWPjhxYzBxfiEyl7qxE="
},
"deu-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-rus_links.tsv.bz2",
- "hash": "sha256-i/VcCyecgTEb3Drg9aQCCs+/qSxIqG7PTpIpOHJl19o="
+ "hash": "sha256-zKvvtwmjy12kVWKvhvhpco9VeJ2U6DG8JO72t6ePlks="
},
"eng-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-epo_links.tsv.bz2",
- "hash": "sha256-8wxMvP69IVdrqjKwa3j6kQw5hoIiVO84golEeVn1MGo="
+ "hash": "sha256-1teRJrW7T+JlsbVp4Oa2DF2cw7s202KjIARy8mEZgDU="
},
"eng-bel_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-bel_links.tsv.bz2",
- "hash": "sha256-W1QW0snKAT69CFMqXiVvfXDI1Z3ajHKBcv6mL85diYM="
+ "hash": "sha256-CYAJFigMcmDCUK6q8X2KG9fALLclX3wKX4T35Iu9AAA="
},
"eng-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-deu_links.tsv.bz2",
- "hash": "sha256-yzgk1siPruqBlGuOz+JCkN0QvJssJP/zK2g1NFCVynA="
+ "hash": "sha256-EIpsjmrXur37fcm92ZQjOnGrvFX1htT+vCAuCFqE6/Y="
},
"eng-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-fin_links.tsv.bz2",
- "hash": "sha256-zyYWfw7YgsnMIj3O+XRJilU1X+cmdM6QTRe4khbTd80="
+ "hash": "sha256-wiTsrLItb4KYLA58FysC5dr5zoiWyv2pPKuhq76djqs="
},
"eng-hye_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-hye_links.tsv.bz2",
- "hash": "sha256-aKdK0w5n1pczW5qj1kj+U3pE817CofXdP7BSoFjQWFg="
+ "hash": "sha256-UgTpRzaB3NsQ2QdMeu5PqZIGpuIRUwH3b4YWYmTLExg="
},
"eng-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-rus_links.tsv.bz2",
- "hash": "sha256-ielP7psTBmBxhv0k8ZNKOwy8jJpwHd8m1hHxNXbwh9Q="
+ "hash": "sha256-MtwL6EkSx/ltjDsQH6+cN4pE3/1lEoyyN+F0swAyKag="
},
"eng-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-swe_links.tsv.bz2",
- "hash": "sha256-jnBTBZtSajyxJti5ETaqniGXkrEVwlgrSs3UPVOqs/Y="
+ "hash": "sha256-zskK7S7HX4stvGZ/KR3NERq0nQGmdVa4Eeqx4xiqGk8="
},
"eng-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-ukr_links.tsv.bz2",
- "hash": "sha256-VVQwTUq7JQ6JbZdo7aoGkaezp+hrqD0OzRJn2MbUxII="
+ "hash": "sha256-CP/cFEfkfcUkww9vjgPbEiIqLi4ZUv+MHJFheUddgmg="
},
"epo-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-eng_links.tsv.bz2",
- "hash": "sha256-BiD8rWv3xzNihyVoXWj8zqdBXYJQSdVtmK+YuuOz1cs="
+ "hash": "sha256-G7z0Ur/S40JLCWW5wfC9IZJrKGw4pHhVsrEPUSkVRIM="
},
"epo-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-rus_links.tsv.bz2",
- "hash": "sha256-HBXK58u7fTig/PAQD0L7fbU9W0VW2/CmX9BoIUp7V+E="
+ "hash": "sha256-9G96DZsEMA3aQz4y7JYERPuRwwj0oQBP8p2rrY6Wvkc="
},
"fin-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-eng_links.tsv.bz2",
- "hash": "sha256-ymRaGEc5i+vY60+jtjr3Ag6aljCbSDshdmFOuQOobYI="
+ "hash": "sha256-Ei2wKu0RHl+uFaPduwhLCT5yglYZF0doCARfo1V0xvk="
},
"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-syfN1DJuDw77qLogeIkcp+CVlmS7E2m5QeEvOabPgkI="
+ "hash": "sha256-8MI+q4d0R6sj2f6Wc2fWq8df0VLvK+s4mHcRhrldbeE="
},
"hye-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye-rus_links.tsv.bz2",
- "hash": "sha256-2ledJ+tzuFimEwsbF6wr4Ed+iFoX7i4K0PDsl0UjQQg="
+ "hash": "sha256-lfK+26P2bkmfCyih7wSyd4wW8xDQsqWbrE0k8mp9lvk="
},
"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-0R+IPXQs15E76ILf79pa+ZoXKM63yrqzvq7msoivBRk="
+ "hash": "sha256-BMCUhHMu2zqHD0eS/2cvrz8tHqT17qtUCUVBbsTGDko="
},
"rus-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-eng_links.tsv.bz2",
- "hash": "sha256-T+CkgiQkk0nNuzhJGxwfdqDrpaKlQC5vOSgfUlK0n8Q="
+ "hash": "sha256-32eES++XkSXtUFDih8mSSNIsgRIPPqZo+IiPXyYipsw="
},
"rus-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-epo_links.tsv.bz2",
- "hash": "sha256-sjopWo05sWuRa8u3E3k8Dn2w248k5cYTSFkOxYjCXhQ="
+ "hash": "sha256-H78H4XocvWR5z82ebZxvZbXoOhqHe+URQlrc7Yksheo="
},
"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-zFerjRkJN7aQF0kP9r8mESzqxJqHLzjh5y05XebYYJY="
+ "hash": "sha256-6yuKZUjVkBuYPT1VgoPV6ek+SCvi6EUa5moaKN5BVak="
},
"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-Kwb/SuiYJP9AeayAl+spUiz4lLw50/6rX8idDyqNBY8="
+ "hash": "sha256-52rsU50ufXb+lZ7R8ixEZhHCuxRtDDC6e1OKcAfD18A="
},
"swe-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-eng_links.tsv.bz2",
- "hash": "sha256-ntdw3PGa4dfvR+Ocgo8bB5DLdcXbn48Hp7Jl2pGVts4="
+ "hash": "sha256-aXHaVB0zWPzoA3/pH6YRqHT42kT5naDKeicb2ld/Jcc="
},
"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-S2E2Yajk3X3Z15fNc3QFCFPb3l/oI1WsB2aqQ83BiuA="
+ "hash": "sha256-uDZOow5KspNl1ZaGzd5WmjCLm7E5afQrEhLV5mZ+VY0="
},
"ukr-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-rus_links.tsv.bz2",
- "hash": "sha256-q2B9BiE5K67RsRJnqs9ldCoyA4jdabjySnuPRhxAAHA="
+ "hash": "sha256-Cl9On/dQHd7VTaFkdVG46RPW1dZGLD0b1cc+OqDSwxc="
}
}
diff --git a/pkgs/osm/libgeodesk/default.nix b/pkgs/osm/libgeodesk/default.nix
@@ -3,43 +3,51 @@
stdenv,
fetchFromGitHub,
cmake,
+ geos,
}:
let
- boost_crc = fetchFromGitHub {
- owner = "boostorg";
- repo = "crc";
- tag = "boost-1.86.0";
- hash = "sha256-SzPDNHX9arnnZNWf/RedbSw1UwqTNuZCxVmegXHANgY=";
- };
catch2 = fetchFromGitHub {
owner = "catchorg";
repo = "Catch2";
tag = "v3.7.1";
hash = "sha256-Zt53Qtry99RAheeh7V24Csg/aMW25DT/3CN/h+BaeoM=";
};
+ gtl = fetchFromGitHub {
+ owner = "greg7mdp";
+ repo = "gtl";
+ tag = "v1.2.0";
+ hash = "sha256-kSmHgcaCZDNgNZdGqacrUa7d6iTtDm9BVazXUPnI5Zc=";
+ };
in
stdenv.mkDerivation (finalAttrs: {
pname = "libgeodesk";
- version = "0.1";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "clarisma";
repo = "libgeodesk";
tag = "v${finalAttrs.version}";
- hash = "sha256-eX10Gkgsqa+RA+PDk+jdsQly3sUg2p3cFev5qXwhlG4=";
+ hash = "sha256-OIwYudqTPWIcyh7rpcM1ThPgBfsrTu6REWdTxkC86I0=";
};
postPatch = ''
substituteInPlace CMakeLists.txt \
- --replace-fail "GIT_REPOSITORY https://github.com/boostorg/crc.git" "SOURCE_DIR ${boost_crc}" \
- --replace-fail "GIT_TAG boost-1.86.0" "" \
--replace-fail "GIT_REPOSITORY https://github.com/catchorg/Catch2.git" "SOURCE_DIR ${catch2}" \
- --replace-fail "GIT_TAG v3.7.1" ""
+ --replace-fail "GIT_TAG v3.7.1" "" \
+ --replace-fail "GIT_REPOSITORY https://github.com/greg7mdp/gtl.git" "SOURCE_DIR ${gtl}" \
+ --replace-fail "GIT_TAG v1.2.0" ""
'';
nativeBuildInputs = [ cmake ];
+ buildInputs = [ geos ];
+
+ cmakeFlags = [
+ (lib.cmakeBool "GEODESK_WITH_GEOS" true)
+ (lib.cmakeFeature "GEOS_INCLUDE_PATHS" "${geos}/include")
+ ];
+
meta = {
description = "Fast and storage-efficient spatial database engine for OpenStreetMap data";
homepage = "https://github.com/clarisma/libgeodesk";
diff --git a/pkgs/suckless/imscript/default.nix b/pkgs/suckless/imscript/default.nix
@@ -16,13 +16,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "imscript";
- version = "0-unstable-2025-05-09";
+ version = "0-unstable-2025-09-19";
src = fetchFromSourcehut {
owner = "~coco";
repo = "imscript";
- rev = "5490ad9e9746fbcabc755e453fa0ac144b9468b0";
- hash = "sha256-nSgno8Q2I0/MyLU32XuFxDpQ1X298/5Uqaqhj6X4HVU=";
+ rev = "3ef0973bb1dfc58452f4b896141d958729ca1693";
+ hash = "sha256-Y4hekufXsTLBs/EcYuBDqgpAS0P0yoDU8Oiz4N+vXFQ=";
};
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/suckless/nextvi/default.nix b/pkgs/suckless/nextvi/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "nextvi";
- version = "0-unstable-2025-07-20";
+ version = "1.3";
src = fetchFromGitHub {
owner = "kyx0r";
repo = "nextvi";
- rev = "766265f542c2f55f07194101a768526703d56275";
- hash = "sha256-mTiLQSOzPqow+4eOlx1fysvRL7g+6ZIuIZk7xdTuEdY=";
+ tag = finalAttrs.version;
+ hash = "sha256-wcn+sXJpJxvUjgKX9D1WjeCdrKPgsYBUqfa4fLOrdSE=";
};
buildPhase = ''
